diff options
Diffstat (limited to 'src/Angular.js')
| -rw-r--r-- | src/Angular.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Angular.js b/src/Angular.js index b208d0ec..ce25423c 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -20,7 +20,8 @@ if (typeof Node == 'undefined') { function noop() {} if (!window['console']) window['console']={'log':noop, 'error':noop}; -var consoleNode, jQuery, msie, +var consoleNode, msie, + jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy foreach = _.each, extend = _.extend, angular = window['angular'] || (window['angular'] = {}), @@ -270,7 +271,7 @@ function exposeMethods(obj, methods){ function wireAngular(element, config) { var widgetFactory = new WidgetFactory(config['server'], config['database']); var binder = new Binder(element[0], widgetFactory, datastore, config['location'], config); - var controlBar = new ControlBar(element.find('body'), config['server']); + var controlBar = new ControlBar(element.find('body'), config['server'], config['database']); var onUpdate = function(){binder.updateView();}; var server = config['database'] =="$MEMORY" ? new FrameServer(window) : |