[dss-commits] r8906 - in dss/branches/0.6: data/webroot/js websrc/dss-setup-interface/dSS
dss-commits at forum.digitalstrom.org
dss-commits at forum.digitalstrom.org
Tue Nov 10 12:33:48 CET 2009
Author: mfernandez
Date: 2009-11-10 12:33:48 +0100 (Tue, 10 Nov 2009)
New Revision: 8906
Modified:
dss/branches/0.6/data/webroot/js/dss-setup-interface.js
dss/branches/0.6/websrc/dss-setup-interface/dSS/SystemPanel.js
dss/branches/0.6/websrc/dss-setup-interface/dSS/ZonePanel.js
Log:
Merging r8904 back to release 0.6 branch
Modified: dss/branches/0.6/data/webroot/js/dss-setup-interface.js
===================================================================
--- dss/branches/0.6/data/webroot/js/dss-setup-interface.js 2009-11-10 11:33:46 UTC (rev 8905)
+++ dss/branches/0.6/data/webroot/js/dss-setup-interface.js 2009-11-10 11:33:48 UTC (rev 8906)
@@ -293,7 +293,7 @@
}
}
catch (err) {
- Ext.MessageBox.alert('Error', 'Could not create Zone');
+ Ext.MessageBox.alert('Error', 'Could not create Zone: ' + err);
}
},
failure: function(result, request) {
@@ -809,11 +809,15 @@
this.on(
'activate',
function(component) {
+ if(this.initializedTabs) {
+ return;
+ }
this.contentPanel.items.each(function(item) {
var tab = new tabRecord({title: item.title});
tabStore.add([tab]);
}, this);
this.listView.select(0, false, true);
+ this.initializedTabs = true;
},
this
);
Modified: dss/branches/0.6/websrc/dss-setup-interface/dSS/SystemPanel.js
===================================================================
--- dss/branches/0.6/websrc/dss-setup-interface/dSS/SystemPanel.js 2009-11-10 11:33:46 UTC (rev 8905)
+++ dss/branches/0.6/websrc/dss-setup-interface/dSS/SystemPanel.js 2009-11-10 11:33:48 UTC (rev 8906)
@@ -51,12 +51,16 @@
this.on(
'activate',
function(component) {
+ if(this.initializedTabs) {
+ return;
+ }
// for each item in contentPanel
this.contentPanel.items.each(function(item) {
var tab = new tabRecord({title: item.title});
tabStore.add([tab]);
}, this);
this.listView.select(0, false, true);
+ this.initializedTabs = true;
},
this
);
Modified: dss/branches/0.6/websrc/dss-setup-interface/dSS/ZonePanel.js
===================================================================
--- dss/branches/0.6/websrc/dss-setup-interface/dSS/ZonePanel.js 2009-11-10 11:33:46 UTC (rev 8905)
+++ dss/branches/0.6/websrc/dss-setup-interface/dSS/ZonePanel.js 2009-11-10 11:33:48 UTC (rev 8906)
@@ -115,7 +115,7 @@
}
}
catch (err) {
- Ext.MessageBox.alert('Error', 'Could not create Zone');
+ Ext.MessageBox.alert('Error', 'Could not create Zone: ' + err);
}
},
failure: function(result, request) {
More information about the dss-commits
mailing list