summaryrefslogtreecommitdiff
path: root/src/client/app.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/app.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/app.js')
-rw-r--r--src/client/app.js4
1 files changed, 4 insertions, 0 deletions
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',