lib/padrino-admin/generators/app/views/javascripts/admin.js.erb in padrino-admin-0.7.0 vs lib/padrino-admin/generators/app/views/javascripts/admin.js.erb in padrino-admin-0.7.1
- old
+ new
@@ -97,11 +97,12 @@
// var s = document.createElement("script");
// s.src = url;
// s.type = 'text/javascript';
// // Now we can append the child.
// hd.appendChild(s);
- Ext.Ajax.request({ url: url, nocache:true });
+ Admin.app.mask();
+ Ext.Ajax.request({ url: url, nocache:true, callback:this.unmask, scope:this });
} else if (ext == 'html'){
this.loadWidget(url);
} else {
Admin.showAlert(Admin.locale.messages.alert.message);
}
@@ -118,10 +119,11 @@
var win = undefined;
if (id) { Ext.WindowMgr.each(function(w) { if (w.id == id) { win = w; return false } }, this) };
if (win){
win.toFront();
} else {
+ Admin.app.mask();
var win = new Admin.window({ id: id });
win.show(); win.hide();
win.load({
url: url,
scripts: true,
@@ -231,9 +233,10 @@
});
this.addItem(this.tabPanel);
}
+ Admin.app.unmask();
this.fireEvent('contentLoaded');
},//inspectContent
fireEvent: function(event){
Admin.events.fireEvent(event);
\ No newline at end of file