diff options
| author | Alon Levy <alon@pobox.com> | 2015-03-17 08:14:04 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-03-17 08:14:04 +0200 |
| commit | bf4df7f0c9898f748bce01ed237e0c52738432cf (patch) | |
| tree | 58da36b7a2211fb63d459f73f4ea916980aa5e4a /src/client/view | |
| parent | cb8304d24eefe57cd3ae35aa26275277af92d73d (diff) | |
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
Diffstat (limited to 'src/client/view')
| -rw-r--r-- | src/client/view/bubble.js | 2 | ||||
| -rw-r--r-- | src/client/view/graph_view.js | 2 | ||||
| -rw-r--r-- | src/client/view/selection.js | 2 | ||||
| -rw-r--r-- | src/client/view/svg_input.js | 2 | ||||
| -rw-r--r-- | src/client/view/tab.js | 2 | ||||
| -rw-r--r-- | src/client/view/textanalyser_input.js | 2 |
6 files changed, 6 insertions, 6 deletions
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 |