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/app.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/client/app.js') 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', -- cgit v1.3.1