From bf4df7f0c9898f748bce01ed237e0c52738432cf Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Tue, 17 Mar 2015 08:14:04 +0200 Subject: 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 --- src/client/model/graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/model') 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 -- cgit v1.3.1