client: add Bacon_wrapper, use instead of Bacon; forced loading of jquery before Bacon

9 files changed, 20 insertions, 14 deletions

diff --git a/src/client/Bacon_wrapper.js b/src/client/Bacon_wrapper.js
new file mode 100644
index 00000000..1a45379e
--- /dev/null
+++ b/src/client/Bacon_wrapper.js
@@ -0,0 +1,4 @@
+/* Force jquery to load before Bacon */
+define(['jquery', 'Bacon'], function($, Bacon) {
+    return Bacon;
+});
diff --git a/src/client/model/graph.js b/src/client/model/graph.js
index 4feb8a52..5d1647e2 100644
--- a/src/client/model/graph.js
+++ b/src/client/model/graph.js
@@ -1,7 +1,7 @@
 "use strict"
 
-define(['underscore', 'Bacon', 'consts', 'util', 'model/core', 'model/util', 'model/diff', 'rz_api_backend', 'rz_api_mesh', 'history'],
-function (_,           Bacon,   consts,   util,   model_core,   model_util,   model_diff,   rz_api_backend,   rz_api_mesh,   history) {
+define(['underscore', 'Bacon_wrapper', 'consts', 'util', 'model/core', 'model/util', 'model/diff', 'rz_api_backend', 'rz_api_mesh', 'history'],
+function (_,           Bacon,           consts,   util,   model_core,   model_util,   model_diff,   rz_api_backend,   rz_api_mesh,   history) {
 
 var debug = false;
 
diff --git a/src/client/rz_bus.js b/src/client/rz_bus.js
index 444573a4..4ff82d9d 100644
--- a/src/client/rz_bus.js
+++ b/src/client/rz_bus.js
@@ -1,6 +1,6 @@
 "use strict"
 
-define(['consts', 'Bacon'],
+define(['consts', 'Bacon_wrapper'],
 function(consts,   Bacon)
 {
     var ui_key_bus = new Bacon.Bus(),
diff --git a/src/client/textanalysis.ui.js b/src/client/textanalysis.ui.js
index 943c4a0f..be84398e 100644
--- a/src/client/textanalysis.ui.js
+++ b/src/client/textanalysis.ui.js
@@ -1,7 +1,7 @@
 "use strict"
 
-define(['jquery', 'Bacon', 'consts', 'rz_bus', 'rz_core', 'textanalysis', 'view/completer', 'util'],
-function($,        Bacon,   consts,   rz_bus,   rz_core,   textanalysis,        completer,   util) {
+define(['jquery', 'Bacon_wrapper', 'consts', 'rz_bus', 'rz_core', 'textanalysis', 'view/completer', 'util'],
+function($,        Bacon         ,  consts ,  rz_bus ,  rz_core ,  textanalysis ,       completer ,  util) {
 
 var text = "", // Last text of sentence
     element_name = '#textanalyser',
diff --git a/src/client/view/bubble.js b/src/client/view/bubble.js
index 02f5a73a..17998694 100644
--- a/src/client/view/bubble.js
+++ b/src/client/view/bubble.js
@@ -1,4 +1,6 @@
-define(["jquery", "Bacon"], function ($, Bacon) {
+define(["jquery", "Bacon_wrapper"],
+function ($,       Bacon)
+{
 function Bubble(raw_parent, radius) {
     var xmlns = "http://www.w3.org/2000/svg";
     var g = document.createElementNS(xmlns, 'g');
diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js
index 52952645..af690973 100644
--- a/src/client/view/graph_view.js
+++ b/src/client/view/graph_view.js
@@ -25,8 +25,8 @@
  * which resulted in overly complex (read: undefined/buggy) code.
  */
 
-define(['d3', 'Bacon', 'util', 'view/selection', 'view/helpers', 'model/diff', 'view/view', 'view/bubble'],
-function(d3 ,  Bacon ,  util ,  selection      ,  view_helpers,  model_diff  ,  view, view_bubble) {
+define(['d3', 'Bacon_wrapper', 'util', 'view/selection', 'view/helpers', 'model/diff', 'view/view', 'view/bubble'],
+function(d3 ,  Bacon         ,  util ,  selection      ,  view_helpers,  model_diff  ,  view, view_bubble) {
 
 var obj_take = util.obj_take;
 
diff --git a/src/client/view/selection.js b/src/client/view/selection.js
index fa8e1cf4..b7c0722b 100644
--- a/src/client/view/selection.js
+++ b/src/client/view/selection.js
@@ -1,5 +1,5 @@
-define(['rz_core', 'Bacon', 'jquery', 'underscore'],
-function(rz_core,   Bacon,   $,        _) {
+define(['rz_core', 'Bacon_wrapper', 'jquery', 'underscore'],
+function(rz_core,   Bacon,           $,        _) {
 
 function list_from_list_like(list_like)
 {
diff --git a/src/client/view/svg_input.js b/src/client/view/svg_input.js
index 6318dca7..6320156e 100644
--- a/src/client/view/svg_input.js
+++ b/src/client/view/svg_input.js
@@ -1,5 +1,5 @@
-define(['jquery', 'Bacon', 'model/diff', 'rz_bus', 'consts'],
-function($,        Bacon,   model_diff,   rz_bus,   consts)
+define(['jquery', 'Bacon_wrapper', 'model/diff', 'rz_bus', 'consts'],
+function($,        Bacon,           model_diff,   rz_bus,   consts)
 {
 var svg_input_fo_node_y = '-.70em',
     svg_input_fo_height = '30px';
diff --git a/src/client/view/tab.js b/src/client/view/tab.js
index 9fca9a29..2f642409 100644
--- a/src/client/view/tab.js
+++ b/src/client/view/tab.js
@@ -1,7 +1,7 @@
 "use strict"
 
-define(['jquery', 'Bacon'],
-function($, Bacon) {
+define(['jquery', 'Bacon_wrapper'],
+function($,        Bacon) {
 
 function Tab(dict) {
     var k,