client: Bacon/jquery dependency: use shim

add shim requirement for Bacon to have jquery loaded first, since Bacon
patches in asEventStream (and other APIs).

Undo the Bacon_wrapper non fix:

git grep -l Bacon_wrapper | while read f; do sed -i -e s/Bacon_wrapper/Bacon/g $f; done

11 files changed, 13 insertions, 13 deletions

diff --git a/src/client/Bacon_wrapper.js b/src/client/Bacon_wrapper.js
deleted file mode 100644
index 1a45379e..00000000
--- a/src/client/Bacon_wrapper.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Force jquery to load before Bacon */
-define(['jquery', 'Bacon'], function($, Bacon) {
-    return Bacon;
-});
diff --git a/src/client/app.js b/src/client/app.js
index a3e294ac..fbe29ced 100644
--- a/src/client/app.js
+++ b/src/client/app.js
@@ -3,6 +3,10 @@
     var config = {
         shim: {
             'socketio': { exports: 'io' },
+            'Bacon': {
+                deps: ['jquery'],
+                exports: 'Bacon',
+            }
         },
         paths: {
             autocomplete: lib_path + 'autocomplete',
diff --git a/src/client/model/graph.js b/src/client/model/graph.js
index 7056cac6..6e67cbec 100644
--- a/src/client/model/graph.js
+++ b/src/client/model/graph.js
@@ -1,6 +1,6 @@
 "use strict"
 
-define(['underscore', 'Bacon_wrapper', 'consts', 'util', 'model/core', 'model/util', 'model/diff', 'rz_api_backend', 'rz_api_mesh', 'history', 'model/types'],
+define(['underscore', 'Bacon', 'consts', 'util', 'model/core', 'model/util', 'model/diff', 'rz_api_backend', 'rz_api_mesh', 'history', 'model/types'],
 function (_,           Bacon,           consts,   util,   model_core,   model_util,   model_diff,   rz_api_backend,   rz_api_mesh,   history,   model_types) {
 
 // aliases
diff --git a/src/client/rz_bus.js b/src/client/rz_bus.js
index 4ff82d9d..444573a4 100644
--- a/src/client/rz_bus.js
+++ b/src/client/rz_bus.js
@@ -1,6 +1,6 @@
 "use strict"
 
-define(['consts', 'Bacon_wrapper'],
+define(['consts', 'Bacon'],
 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 50cabdd1..d5345c43 100644
--- a/src/client/textanalysis.ui.js
+++ b/src/client/textanalysis.ui.js
@@ -1,6 +1,6 @@
 "use strict"
 
-define(['jquery', 'Bacon_wrapper', 'consts', 'rz_bus', 'rz_core', 'textanalysis', 'util', 'view/textanalyser_input'],
+define(['jquery', 'Bacon', 'consts', 'rz_bus', 'rz_core', 'textanalysis', 'util', 'view/textanalyser_input'],
 function($,        Bacon         ,  consts ,  rz_bus ,  rz_core ,  textanalysis ,  util,        textanalyser_input) {
 
 var element_name = '#textanalyser',
diff --git a/src/client/view/bubble.js b/src/client/view/bubble.js
index 17998694..0b3787b7 100644
--- a/src/client/view/bubble.js
+++ b/src/client/view/bubble.js
@@ -1,4 +1,4 @@
-define(["jquery", "Bacon_wrapper"],
+define(["jquery", "Bacon"],
 function ($,       Bacon)
 {
 function Bubble(raw_parent, radius) {
diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js
index 9942e2d6..9a0b78d1 100644
--- a/src/client/view/graph_view.js
+++ b/src/client/view/graph_view.js
@@ -25,7 +25,7 @@
  * which resulted in overly complex (read: undefined/buggy) code.
  */
 
-define(['d3', 'Bacon_wrapper', 'consts', 'util', 'view/selection', 'view/helpers', 'model/diff', 'view/view', 'view/bubble', 'model/types'],
+define(['d3', 'Bacon', 'consts', 'util', 'view/selection', 'view/helpers', 'model/diff', 'view/view', 'view/bubble', 'model/types'],
 function(d3 ,  Bacon         ,  consts,   util ,  selection      ,  view_helpers,  model_diff  ,  view,        view_bubble,   model_types) {
 
 // aliases
diff --git a/src/client/view/selection.js b/src/client/view/selection.js
index 35eb8f2b..229a4751 100644
--- a/src/client/view/selection.js
+++ b/src/client/view/selection.js
@@ -1,4 +1,4 @@
-define(['Bacon_wrapper', 'jquery', 'underscore'],
+define(['Bacon', 'jquery', 'underscore'],
 function(Bacon,           $,        _) {
 
 var rz_core; // circular dependency, see get_rz_core
diff --git a/src/client/view/svg_input.js b/src/client/view/svg_input.js
index 1810d814..0e466c64 100644
--- a/src/client/view/svg_input.js
+++ b/src/client/view/svg_input.js
@@ -1,4 +1,4 @@
-define(['jquery', 'Bacon_wrapper', 'consts', 'model/diff', 'rz_bus', 'consts'],
+define(['jquery', 'Bacon', 'consts', 'model/diff', 'rz_bus', 'consts'],
 function($,        Bacon,           consts,   model_diff,   rz_bus,   consts)
 {
 var svg_input_fo_node_y = '-.70em',
diff --git a/src/client/view/tab.js b/src/client/view/tab.js
index 2f642409..586e308a 100644
--- a/src/client/view/tab.js
+++ b/src/client/view/tab.js
@@ -1,6 +1,6 @@
 "use strict"
 
-define(['jquery', 'Bacon_wrapper'],
+define(['jquery', 'Bacon'],
 function($,        Bacon) {
 
 function Tab(dict) {
diff --git a/src/client/view/textanalyser_input.js b/src/client/view/textanalyser_input.js
index 9defdef3..8b54fb04 100644
--- a/src/client/view/textanalyser_input.js
+++ b/src/client/view/textanalyser_input.js
@@ -1,4 +1,4 @@
-define(['jquery', 'Bacon_wrapper', 'underscore', 'util', 'view/completer', 'rz_bus', 'textanalysis', 'consts'],
+define(['jquery', 'Bacon', 'underscore', 'util', 'view/completer', 'rz_bus', 'textanalysis', 'consts'],
 function($,        Bacon,           _,            util,        completer,   rz_bus,   textanalysis,   consts)
 {
 // Aliases