aboutsummaryrefslogtreecommitdiffstats
path: root/src/Angular.js
diff options
context:
space:
mode:
authorMisko Hevery2010-02-17 16:05:51 -0800
committerMisko Hevery2010-02-17 16:05:51 -0800
commit060c18c796f59703193efcf61818684187091663 (patch)
tree9d89bb5e589d59568f9aac8edfa64f41c926b934 /src/Angular.js
parent7e14dff90516a41ff1903cc44fe3389710f15556 (diff)
parentb561f6a0cc3e2e03c05925fbed3e06723f91b4b5 (diff)
downloadangular.js-060c18c796f59703193efcf61818684187091663.tar.bz2
Merge branch 'master' of git://github.com/angular/angular.js
Diffstat (limited to 'src/Angular.js')
-rw-r--r--src/Angular.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 93ca71b4..6cb3f602 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -282,7 +282,7 @@ function wireAngular(element, config) {
var server = config['database'] =="$MEMORY" ?
new FrameServer(window) :
new Server(config['server'], jQuery['getScript']);
- server = new VisualServer(server, new Status(element.find('body')), onUpdate);
+ server = new VisualServer(server, new NullStatus(element.find('body')), onUpdate);
var users = new Users(server, controlBar);
var databasePath = '/data/' + config['database'];
var post = function(request, callback){
@@ -368,4 +368,4 @@ angular['compile'] = function(element, config) {
configureJQueryPlugins();
return wireAngular(jQuery(element), config);
-}; \ No newline at end of file
+};