Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-17 07:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Misko Hevery 2010-02-17 16:05:51 -08:00
commit 060c18c796
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Angular.js
View file

@ -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);
};
};

7
src/Widgets.js
View file

@ -775,6 +775,13 @@ PopUp.prototype = {
// Status
//////////////////////////////////
function NullStatus(body) {
};
NullStatus.prototype = {
beginRequest:function(){},
endRequest:function(){}
};
function Status(body) {
this.requestCount = 0;