summaryrefslogtreecommitdiff
path: root/src/client/model/graph.js
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-03-17 08:14:04 +0200
committerAlon Levy <alon@pobox.com>2015-03-17 08:14:04 +0200
commitbf4df7f0c9898f748bce01ed237e0c52738432cf (patch)
tree58da36b7a2211fb63d459f73f4ea916980aa5e4a /src/client/model/graph.js
parentcb8304d24eefe57cd3ae35aa26275277af92d73d (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/model/graph.js')
-rw-r--r--src/client/model/graph.js2
1 files changed, 1 insertions, 1 deletions
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