Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js Fri Feb 20 17:16:04 2015 @@ -55,8 +55,11 @@ define(["dojo/_base/xhr", { var that=this; this.containerNode = domConstruct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances){ that._postParse();}); + }, + _postParse: function() + { + var that=this; this.dialog = registry.byId("editBrokerDialog"); this.saveButton = registry.byId("editBroker.saveButton"); this.cancelButton = registry.byId("editBroker.cancelButton");
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js Fri Feb 20 17:16:04 2015 @@ -79,7 +79,11 @@ define(["dojo/_base/xhr", { var that=this; this.containerNode = domConstruct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); + parser.parse(this.containerNode).then(function(instances){ that._postParse();}); + }, + _postParse: function() + { + var that=this; this.allFieldsContainer = dom.byId("formEditQueue.allFields"); this.dialog = registry.byId("editQueue"); this.saveButton = registry.byId("formEditQueue.saveButton"); Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js Fri Feb 20 17:16:04 2015 @@ -56,7 +56,11 @@ define(["dojo/_base/xhr", { var that=this; this.containerNode = domConstruct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); + parser.parse(this.containerNode).then(function(instances){ that._postParse();}); + }, + _postParse: function() + { + var that=this; this.allFieldsContainer = dom.byId("editVirtualHost.allFields"); this.typeFieldsContainer = dom.byId("editVirtualHost.typeFields"); this.dialog = registry.byId("editVirtualHostDialog"); Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js Fri Feb 20 17:16:04 2015 @@ -52,7 +52,11 @@ define(["dojo/_base/xhr", { var that=this; this.containerNode = domConstruct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); + parser.parse(this.containerNode).then(function(instances){ that._postParse();}); + }, + _postParse: function() + { + var that=this; this.typeFieldsContainer = dom.byId("editVirtualHostNode.typeFields"); this.dialog = registry.byId("editVirtualHostNodeDialog"); this.saveButton = registry.byId("editVirtualHostNode.saveButton"); Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js Fri Feb 20 17:16:04 2015 @@ -76,8 +76,8 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { contentPane.containerNode.innerHTML = data; - parser.parse(contentPane.containerNode); - + parser.parse(contentPane.containerNode).then(function(instances) + { that.groupUpdater = new GroupUpdater(contentPane.containerNode, that, that.controller); that.groupUpdater.update(); updater.add( that.groupUpdater ); @@ -100,6 +100,7 @@ define(["dojo/_base/xhr", "Are you sure you want to remove group member"); } ); + }); }}); }; Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js Fri Feb 20 17:16:04 2015 @@ -54,9 +54,9 @@ define(["dojo/_base/xhr", var that = this; this.name = groupProviderObj.name; node.innerHTML = template; - parser.parse(node); this.controller = controller; - + parser.parse(node).then(function(instances) + { var groupDiv = query(".groups", node)[0]; var gridProperties = { @@ -75,7 +75,7 @@ define(["dojo/_base/xhr", indirectSelection: true }}; - this.groupsGrid = new UpdatableStore([], groupDiv, + that.groupsGrid = new UpdatableStore([], groupDiv, [ { name: "Group Name", field: "name", width: "100%" } ], function(obj) { connect.connect(obj.grid, "onRowDblClick", obj.grid, @@ -86,10 +86,11 @@ define(["dojo/_base/xhr", that.controller.show("group", name, groupProviderObj, theItem.id); }); }, gridProperties, EnhancedGrid); - var addGroupButton = query(".addGroupButton", node)[0]; - registry.byNode(addGroupButton).on("click", function(evt){ addGroup.show(groupProviderObj.name) }); - var deleteWidget = registry.byNode(query(".deleteGroupButton", node)[0]); - deleteWidget.on("click", function(evt){ event.stop(evt); that.deleteGroups(); }); + var addGroupButton = query(".addGroupButton", node)[0]; + registry.byNode(addGroupButton).on("click", function(evt){ addGroup.show(groupProviderObj.name) }); + var deleteWidget = registry.byNode(query(".deleteGroupButton", node)[0]); + deleteWidget.on("click", function(evt){ event.stop(evt); that.deleteGroups(); }); + }); } GroupManagingGroupProvider.prototype.deleteGroups = function() Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js Fri Feb 20 17:16:04 2015 @@ -25,12 +25,15 @@ define(["dojo/dom","dojo/query", "dojo/_ return { show: function(data) { var that=this; - util.parseHtmlIntoDiv(data.containerNode, "groupprovider/groupfile/add.html"); - if (data.data) + util.parseHtmlIntoDiv(data.containerNode, "groupprovider/groupfile/add.html", + function() { - var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]); - pathWidget.set("value", data.data.path); - } + if (data.data) + { + var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]); + pathWidget.set("value", data.data.path); + } + }); } }; } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js Fri Feb 20 17:16:04 2015 @@ -51,9 +51,13 @@ return declare("qpid.management.logs.Log closeButton: null, constructor: function(args){ + var that = this; this.containerNode = domConstruct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances){that._postParse();}); + }, + _postParse: function() + { + var that = this; this.logFileTreeDiv = query(".logFilesGrid", this.containerNode)[0]; this.downloadLogsButton = registry.byNode(query(".downloadLogsButton", this.containerNode)[0]); this.closeButton = registry.byNode(query(".downloadLogsDialogCloseButton", this.containerNode)[0]); Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js Fri Feb 20 17:16:04 2015 @@ -62,9 +62,13 @@ define(["dojo/_base/xhr", this.contentPane = contentPane; this.contentPane.containerNode.innerHTML = markup; - parser.parse(this.contentPane.containerNode); + parser.parse(this.contentPane.containerNode).then(function(instances){self._postParse();}); + }; + LogViewer.prototype._postParse = function() + { + var self = this; - this.downloadLogsButton = registry.byNode(query(".downloadLogs", contentPane.containerNode)[0]); + this.downloadLogsButton = registry.byNode(query(".downloadLogs", this.contentPane.containerNode)[0]); this.downloadLogDialog = new LogFileDownloadDialog(); this.downloadLogsButton.on("click", function(evt){ Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js Fri Feb 20 17:16:04 2015 @@ -47,14 +47,15 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { node.innerHTML = data; - parser.parse(node); - + parser.parse(node).then(function(instances) + { that.managementHttpUpdater= new ManagementHttpUpdater(node, pluginObject, controller); that.managementHttpUpdater.update(true); updater.add( that.managementHttpUpdater); var editButton = query(".editPluginButton", node)[0]; connect.connect(registry.byNode(editButton), "onClick", function(evt){ that.edit(); }); + }); }}); } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js Fri Feb 20 17:16:04 2015 @@ -43,14 +43,15 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { node.innerHTML = data; - parser.parse(node); - + parser.parse(node).then(function(instances) + { that.managementJmxUpdater= new ManagementJmxUpdater(node, pluginObject, controller); that.managementJmxUpdater.update(true); updater.add( that.managementJmxUpdater); var editButton = query(".editPluginButton", node)[0]; connect.connect(registry.byNode(editButton), "onClick", function(evt){ that.edit(); }); + }); }}); } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js Fri Feb 20 17:16:04 2015 @@ -23,12 +23,15 @@ define(["dojo/query", "dijit/registry", return { show: function (data) { - util.parseHtmlIntoDiv(data.containerNode, "preferencesprovider/filesystempreferences/add.html"); - if (data.data) + util.parseHtmlIntoDiv(data.containerNode, "preferencesprovider/filesystempreferences/add.html", + function() { - var pathWidget = registry.byNode(query(".addPreferencesProviderPath", data.containerNode)[0]); - pathWidget.set("value", data.data.path); - } + if (data.data) + { + var pathWidget = registry.byNode(query(".addPreferencesProviderPath", data.containerNode)[0]); + pathWidget.set("value", data.data.path); + } + }); } }; } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js Fri Feb 20 17:16:04 2015 @@ -32,8 +32,10 @@ define(["dojo/_base/xhr", sync: true, load: function(template) { containerNode.innerHTML = template; - parser.parse(containerNode); - that.preferencesProviderPath=query(".fileSystemPreferencesProviderPath", containerNode)[0]; + parser.parse(containerNode).then(function(instances) + { + that.preferencesProviderPath=query(".fileSystemPreferencesProviderPath", containerNode)[0]; + }); }}); } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js Fri Feb 20 17:16:04 2015 @@ -36,10 +36,12 @@ define(["dojo/query", { this.fields.push(name); } - util.buildUI(data.containerNode, data.parent, "store/nonjavatruststore/show.html", this.fields, this); - var gridNode = query(".details", data.containerNode)[0]; - var dateTimeFormatter = function(value){ return value ? UserPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";}; - this.detailsGrid = new UpdatableStore([], + var that = this; + util.buildUI(data.containerNode, data.parent, "store/nonjavatruststore/show.html", this.fields, this, function() + { + var gridNode = query(".details", data.containerNode)[0]; + var dateTimeFormatter = function(value){ return value ? UserPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";}; + that.detailsGrid = new UpdatableStore([], gridNode, [ { name: 'Subject', field: 'SUBJECT_NAME', width: '25%' }, @@ -47,6 +49,7 @@ define(["dojo/query", { name: 'Valid from', field: 'VALID_START', width: '25%', formatter: dateTimeFormatter }, { name: 'Valid to', field: 'VALID_END', width: '25%', formatter: dateTimeFormatter} ]); + }); } NonJavaTrustStore.prototype.update = function(data) Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js Fri Feb 20 17:16:04 2015 @@ -32,9 +32,12 @@ define(["dojo/_base/xhr", return { show: function (data) { + var that= this; this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances) {that._postParse(data);}); + }, + _postParse: function(data) + { registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); @@ -42,6 +45,7 @@ define(["dojo/_base/xhr", { dom.byId("addVirtualHost.diskFlowControls").style.display = "none"; } + } }; } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js Fri Feb 20 17:16:04 2015 @@ -24,10 +24,12 @@ define(["dijit/registry", "qpid/common/u return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/providedstore/edit.html", "editVirtualHost.", fieldNames, data.data); - - registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + util.buildEditUI(data.containerNode, "virtualhost/providedstore/edit.html", "editVirtualHost.", fieldNames, data.data, + function() + { + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + }); } }; } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js Fri Feb 20 17:16:04 2015 @@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/regis return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data); - registry.byId("editVirtualHostNode.storePath").set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED")); + util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data, + function() + { + registry.byId("editVirtualHostNode.storePath").set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED")); + }); } }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
