Merge branch 'master' of git://github.com/angular/angular.js

2 files changed, 9 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
+};
diff --git a/src/Widgets.js b/src/Widgets.js
index 71fcd110..13506a78 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -775,6 +775,13 @@ PopUp.prototype = {
 // Status
 //////////////////////////////////
 
+function NullStatus(body) {
+};
+
+NullStatus.prototype = {
+ beginRequest:function(){},
+ endRequest:function(){}
+};
 
 function Status(body) {
   this.requestCount = 0;