diff options
| author | Keith Wall <kwall@apache.org> | 2015-02-24 13:20:10 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-02-24 13:20:10 +0000 |
| commit | e897e38cc360d88dc69ab8c5f911f02dab18cd0b (patch) | |
| tree | 08a0d7211c68df828c580795e56b63179ff14e38 | |
| parent | e1c2dac46c9b7b8e28be8c56e683bd49b4870652 (diff) | |
| download | qpid-python-e897e38cc360d88dc69ab8c5f911f02dab18cd0b.tar.gz | |
QPID-6398: [Java Broker] Update web management console UI to invoke dojo parser.parse as a promise due to changes in dojo 1.8 causing the parser to run in asynchronous fashion in some cases
svn merge -c 1661166 https://svn.apache.org/repos/asf/qpid/trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661935 13f79535-47bb-0310-9956-ffa450edef68
68 files changed, 424 insertions, 214 deletions
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js index 7b12d10343..323b8e9750 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js @@ -34,10 +34,11 @@ define(["dojo/_base/xhr", show: function (data) { this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode); - - registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + parser.parse(this.containerNode).then(function(instances) + { + registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + }); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js index e0dac745c2..f1a3887777 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js @@ -22,10 +22,12 @@ define(["dijit/registry", "qpid/common/util", "dojo/domReady!"], return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null); - - registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null, + function() + { + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + }); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js index 3f36d56397..c94795e31c 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js @@ -22,10 +22,12 @@ define(["qpid/common/util", "qpid/common/metadata", "dijit/registry", "dojo/domR return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null); - - registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + util.buildEditUI(data.containerNode, "virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null, + function() + { + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + }); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js index 3bc3305e1f..c0b079cf4c 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js @@ -27,10 +27,13 @@ define(["qpid/common/util", "dojo/query", "dojo/domReady!"], function BDB(data) { - util.buildUI(data.containerNode, data.parent, "virtualhost/bdb_ha/show.html", fields, this); - - this[localTransactionSynchronizationPolicy]= query("." + localTransactionSynchronizationPolicy, data.containerNode)[0]; - this[remoteTransactionSynchronizationPolicy]= query("."+ remoteTransactionSynchronizationPolicy, data.containerNode)[0]; + var that = this; + util.buildUI(data.containerNode, data.parent, "virtualhost/bdb_ha/show.html", fields, this, + function() + { + that[localTransactionSynchronizationPolicy]= query("." + localTransactionSynchronizationPolicy, data.containerNode)[0]; + that[remoteTransactionSynchronizationPolicy]= query("."+ remoteTransactionSynchronizationPolicy, data.containerNode)[0]; + }); } BDB.prototype.update = function(data) diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js index 35ecbec315..20d63378a7 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js @@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], 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")); + }); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js index 6431ddb6db..9b2b26d560 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js @@ -37,15 +37,21 @@ define(["dojo/_base/xhr", var that=this; this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode); - - // lookup field - this.groupChoice = registry.byId("addVirtualHostNode.group"); - this.virtualHostNodeBdbhaTypeFieldsContainer = dom.byId("addVirtualHostNode.bdbha.typeFields"); - - // add callback - this.groupChoice.on("change", function(type){that._groupChoiceChanged(type, that.virtualHostNodeBdbhaTypeFieldsContainer, "qpid/management/virtualhostnode/bdb_ha/add/");}); + parser.parse(this.containerNode).then(function(instances) + { + // lookup field + that.groupChoice = registry.byId("addVirtualHostNode.group"); + that.virtualHostNodeBdbhaTypeFieldsContainer = dom.byId("addVirtualHostNode.bdbha.typeFields"); + // add callback + that.groupChoice.on("change", + function(type) + { + that._groupChoiceChanged(type, + that.virtualHostNodeBdbhaTypeFieldsContainer, + "qpid/management/virtualhostnode/bdb_ha/add/"); + }); + }); }, _groupChoiceChanged: function(type, typeFieldsContainer, urlStem) { diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js index 532c37f65b..be43e5f28b 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js @@ -33,15 +33,15 @@ define(["dojo/_base/xhr", show: function(data) { this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode); - - registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp); - registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen", util.nameOrContextVarRegexp); - registry.byId("addVirtualHostNode.helperAddress").set("regExpGen", util.nodeAddressOrContextVarRegexp); - registry.byId("addVirtualHostNode.address").set("regExpGen", util.nodeAddressOrContextVarRegexp); - - dom.byId("addVirtualHostNode.uploadFields").style.display = "none"; + parser.parse(this.containerNode).then(function(instances) + { + registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp); + registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen", util.nameOrContextVarRegexp); + registry.byId("addVirtualHostNode.helperAddress").set("regExpGen", util.nodeAddressOrContextVarRegexp); + registry.byId("addVirtualHostNode.address").set("regExpGen", util.nodeAddressOrContextVarRegexp); + dom.byId("addVirtualHostNode.uploadFields").style.display = "none"; + }); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js index c1aa9ffe4f..841f2051f5 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js @@ -37,8 +37,15 @@ define(["dojo/_base/xhr", 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) + { + var that=this; this.addVirtualHostNodeAddress = registry.byId("addVirtualHostNode.address"); this.addVirtualHostNodeAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp); @@ -72,7 +79,6 @@ define(["dojo/_base/xhr", registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp); dom.byId("addVirtualHostNode.uploadFields").style.display = "block"; - }, _updatePermittedNodesJson: function () { diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js index b1399a59cb..3a50f98293 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js @@ -32,8 +32,13 @@ define(["qpid/common/util", return { show: function(data) { + var that = this; + util.buildEditUI(data.containerNode, "virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, data.data, + function(){that._postParse(data);}); + }, + _postParse: function(data) + { var node = data.data; - util.buildEditUI(data.containerNode, "virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, node); if ( !(data.data.state == "ERRORED" || data.data.state == "STOPPED")) { registry.byId("editVirtualHostNode.storePath").set("disabled", true); diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js index 9538b6b5b6..5338916812 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js @@ -82,11 +82,14 @@ define(["dojo/_base/xhr", function BDBHA(data) { - var containerNode = data.containerNode; this.parent = data.parent; var that = this; - util.buildUI(data.containerNode, data.parent, "virtualhostnode/bdb_ha/show.html", nodeFields, this); - + util.buildUI(data.containerNode, data.parent, "virtualhostnode/bdb_ha/show.html", nodeFields, this, function(){that._postParse(data);}); + }; + BDBHA.prototype._postParse = function(data) + { + var that = this; + var containerNode = data.containerNode; this.designatedPrimaryContainer = findNode("designatedPrimaryContainer", containerNode); this.priorityContainer = findNode("priorityContainer", containerNode); this.quorumOverrideContainer = findNode("quorumOverrideContainer", containerNode); diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js index 7b12d10343..323b8e9750 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js @@ -34,10 +34,11 @@ define(["dojo/_base/xhr", show: function (data) { this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode); - - registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + parser.parse(this.containerNode).then(function(instances) + { + registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + }); } }; } diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js index a8b68a0c16..b98254f54b 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js @@ -22,10 +22,12 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null); - - registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null, + function() + { + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + }); } }; } diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js index 5fa0443185..2ab6dcc22b 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js @@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], 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"); + util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data, + function() + { + registry.byId("editVirtualHostNode.storePath").set("disabled", data.data.state != "STOPPED"); + }); } }; } diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js index 31e5db5035..3d15cdbc37 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js @@ -40,13 +40,15 @@ define(["dojo/_base/xhr", sync: true, load: function(template) { containerNode.innerHTML = template; - parser.parse(containerNode); + parser.parse(containerNode).then(function(instances) + { + for(var i=0; i<fieldNames.length;i++) + { + var fieldName = fieldNames[i]; + that[fieldName]= query("." + fieldName, containerNode)[0]; + } + }); }}); - for(var i=0; i<fieldNames.length;i++) - { - var fieldName = fieldNames[i]; - this[fieldName]= query("." + fieldName, containerNode)[0]; - } } BoneCP.prototype.update=function(data) diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js index beb298e988..8de6206373 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js @@ -36,12 +36,18 @@ 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) + { + var that = this; registry.byId("addVirtualHost.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); registry.byId("addVirtualHost.username").set("regExpGen", util.nameOrContextVarRegexp); - var poolTypes = json.parse(poolTypeJsonString); var poolTypesData = []; for (var i =0 ; i < poolTypes.length; i++) diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js index 90fc246276..22823b675a 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js @@ -33,8 +33,11 @@ define(["qpid/common/util", return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/jdbc/edit.html", "editVirtualHost.", fieldNames, data.data); - + var that = this; + util.buildEditUI(data.containerNode, "virtualhost/jdbc/edit.html", "editVirtualHost.", fieldNames, data.data, function(){that._postParse(data)}); + }, + _postParse: function(data) + { registry.byId("editVirtualHost.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); registry.byId("editVirtualHost.username").set("regExpGen", util.nameOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js index d3fdf50769..b717f2091d 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js @@ -25,9 +25,12 @@ define(["qpid/common/util", "dojo/query", "dojo/_base/array", "dojo/dom-construc function JDBC(data) { - util.buildUI(data.containerNode, data.parent, "virtualhostnode/jdbc/show.html", fieldNames, this); - this.usernameAttributeContainer=query(".usernameAttributeContainer", data.containerNode)[0]; - this.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; + var that = this; + util.buildUI(data.containerNode, data.parent, "virtualhostnode/jdbc/show.html", fieldNames, this, function() + { + that.usernameAttributeContainer=query(".usernameAttributeContainer", data.containerNode)[0]; + that.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; + }); } JDBC.prototype.update = function(data) diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js index d5a7b43aae..071c0c8b23 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js @@ -38,9 +38,16 @@ 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) + { + var that = this; registry.byId("addVirtualHostNode.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); registry.byId("addVirtualHostNode.username").set("regExpGen", util.nameOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js index 828369cae0..5586cf6c07 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js @@ -32,8 +32,12 @@ define(["qpid/common/util", return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhostnode/jdbc/edit.html", "editVirtualHostNode.", fieldNames, data.data); - + var that = this; + util.buildEditUI(data.containerNode, "virtualhostnode/jdbc/edit.html", "editVirtualHostNode.", + fieldNames, data.data, function(){ that._postParse(data);}); + }, + _postParse: function(data) + { registry.byId("editVirtualHostNode.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); registry.byId("editVirtualHostNode.username").set("regExpGen", util.nameOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js index 15c237d0a2..019962fc64 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js @@ -27,10 +27,13 @@ define(["qpid/common/util", "dojo/query", "dojo/_base/array", "dojo/dom-construc function Jdbc(data) { this.parent = data.parent; - util.buildUI(data.containerNode, data.parent, "virtualhostnode/jdbc/show.html", fieldNames, this); - - this.usernameAttributeContainer=query(".usernameAttributeContainer", data.containerNode)[0]; - this.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; + var that = this; + util.buildUI(data.containerNode, data.parent, "virtualhostnode/jdbc/show.html", fieldNames, this, + function() + { + that.usernameAttributeContainer=query(".usernameAttributeContainer", data.containerNode)[0]; + that.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; + }); } Jdbc.prototype.update=function(data) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js index d285dfaad6..a0b62082cb 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js @@ -45,10 +45,15 @@ return declare("qpid.common.grid.ColumnDefDialog", null, { constructor: function(args){ var grid = this.grid = args.grid; - + var that = this; this.containerNode = dom.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances) + { + that._postParse(); + }); + }, + _postParse: function() + { var submitButton = registry.byNode(query(".displayButton", this.containerNode)[0]); this.closeButton = registry.byNode(query(".cancelButton", this.containerNode)[0]); var columnsContainer = query(".columnList", this.containerNode)[0]; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js index db3ae5a2ea..e78670bf57 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js @@ -41,11 +41,17 @@ return declare("qpid.management.logs.RowNumberLimitDialog", null, { grid: null, dialog: null, - constructor: function(domNode, limitChangedCallback){ - + constructor: function(domNode, limitChangedCallback) + { + var that = this; this.containerNode = dom.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances) + { + that._postParse(domNode, limitChangedCallback); + }); + }, + _postParse: function(domNode, limitChangedCallback) + { this.rowNumberLimit = registry.byNode(query(".rowNumberLimit", this.containerNode)[0]) this.submitButton = registry.byNode(query(".submitButton", this.containerNode)[0]); this.closeButton = registry.byNode(query(".cancelButton", this.containerNode)[0]); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js index 60be40b62b..43f4d1dc84 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js @@ -528,40 +528,64 @@ define(["dojo/_base/xhr", return object1 === object2; } - util.parseHtmlIntoDiv = function(containerNode, htmlTemplateLocation) + util.parseHtmlIntoDiv = function(containerNode, htmlTemplateLocation, postParseCallback) { xhr.get({url: htmlTemplateLocation, sync: true, load: function(template) { containerNode.innerHTML = template; - parser.parse(containerNode); + parser.parse(containerNode).then(function(instances) + { + if (postParseCallback && typeof postParseCallback == "function") + { + postParseCallback(); + } + }); }}); } - util.buildUI = function(containerNode, parent, htmlTemplateLocation, fieldNames, obj) + util.buildUI = function(containerNode, parent, htmlTemplateLocation, fieldNames, obj, postParseCallback) { - this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation); - if (fieldNames && obj) - { - for(var i=0; i<fieldNames.length;i++) + this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation, + function() + { + if (fieldNames && obj) { - var fieldName = fieldNames[i]; - obj[fieldName]= query("." + fieldName, containerNode)[0]; + for(var i=0; i<fieldNames.length;i++) + { + var fieldName = fieldNames[i]; + obj[fieldName]= query("." + fieldName, containerNode)[0]; + } } - } + + if (postParseCallback && typeof postParseCallback == "function") + { + postParseCallback(); + } + }); + } - util.buildEditUI = function(containerNode, htmlTemplateLocation, fieldNamePrefix, fieldNames, data) + util.buildEditUI = function(containerNode, htmlTemplateLocation, fieldNamePrefix, fieldNames, data, postParseCallback) { - this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation); - if (fieldNames) + this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation, function() { + + if (fieldNames) + { for(var i = 0; i < fieldNames.length; i++) { var fieldName = fieldNames[i]; var widget = registry.byId(fieldNamePrefix + fieldName); widget.set("value", data[fieldName]); } - } + } + + if (postParseCallback && typeof postParseCallback == "function") + { + postParseCallback(); + } + + }); } util.updateUI = function(data, fieldNames, obj) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js index 1d4cc1447b..cf95a23819 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js @@ -52,17 +52,19 @@ 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.accessControlProviderUpdater = new AccessControlProviderUpdater(contentPane.containerNode, that.modelObj, that.controller); + that.accessControlProviderUpdater = new AccessControlProviderUpdater(contentPane.containerNode, that.modelObj, that.controller); - var deleteButton = query(".deleteAccessControlProviderButton", contentPane.containerNode)[0]; - var deleteWidget = registry.byNode(deleteButton); - connect.connect(deleteWidget, "onClick", + var deleteButton = query(".deleteAccessControlProviderButton", contentPane.containerNode)[0]; + var deleteWidget = registry.byNode(deleteButton); + connect.connect(deleteWidget, "onClick", function(evt){ event.stop(evt); that.deleteAccessControlProvider(); }); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js index 8545d2da75..cf9c32496a 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js @@ -56,7 +56,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) + { var authProviderUpdater = new AuthProviderUpdater(contentPane.containerNode, that.modelObj, that.controller, that); that.authProviderUpdater = authProviderUpdater; @@ -97,6 +98,7 @@ define(["dojo/_base/xhr", } updater.add( that.authProviderUpdater ); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index a0a2e8324f..9720bc988b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -82,14 +82,10 @@ 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.brokerUpdater = new BrokerUpdater(contentPane.containerNode, that.modelObj, that.controller); - updater.add( that.brokerUpdater ); - - that.brokerUpdater.update(); - var logViewerButton = query(".logViewer", contentPane.containerNode)[0]; registry.byNode(logViewerButton).on("click", function(evt){ that.controller.show("logViewer", ""); @@ -233,6 +229,7 @@ define(["dojo/_base/xhr", "Are you sure you want to delete access control provider"); } ); + }); }}); }; @@ -554,6 +551,9 @@ define(["dojo/_base/xhr", }); }, gridProperties, EnhancedGrid); that.displayACLWarnMessage(aclData); + + updater.add( that); + }); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js index 34d9a9b2de..bbb4dc8322 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js @@ -50,14 +50,12 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { contentPane.containerNode.innerHTML = data; - parser.parse(contentPane.containerNode); - - that.connectionUpdater = new ConnectionUpdater(contentPane.containerNode, that.modelObj, that.controller); - - updater.add( that.connectionUpdater ); - - that.connectionUpdater.update(); - + parser.parse(contentPane.containerNode).then(function(instances) + { + that.connectionUpdater = new ConnectionUpdater(contentPane.containerNode, that.modelObj, that.controller); + updater.add( that.connectionUpdater ); + that.connectionUpdater.update(); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js index 2ac881abc1..1f1b8361a2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js @@ -69,7 +69,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.exchangeUpdater = new ExchangeUpdater(contentPane.containerNode, that.modelObj, that.controller); @@ -106,7 +107,7 @@ define(["dojo/_base/xhr", that.deleteExchange(); }); } - + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js index f739e52665..9b32d0e6b2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js @@ -56,8 +56,13 @@ define(["dojo/_base/xhr", var that = this; this.contentPane = contentPane; contentPane.containerNode.innerHTML = template; - parser.parse(contentPane.containerNode); + parser.parse(contentPane.containerNode).then(function(instances) { that.onOpen(); }); + }; + GroupProvider.prototype.onOpen = function() + { + var that = this; + var contentPane = this.contentPane; this.groupProviderUpdater = new GroupProviderUpdater(contentPane.containerNode, this.modelObj, this.controller); // load data diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js index 0f23053c2d..dfcb712740 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js @@ -51,7 +51,8 @@ define(["dojo/dom", sync: true, load: function(data) { contentPane.containerNode.innerHTML = data; - parser.parse(contentPane.containerNode); + parser.parse(contentPane.containerNode).then(function(instances) + { that.keyStoreUpdater = new KeyStoreUpdater(contentPane.containerNode, that.modelObj, that.controller, that.url); that.keyStoreUpdater.update(); @@ -75,6 +76,7 @@ define(["dojo/dom", addStore.show(data[0], that.url); }); }); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js index 47f6cffe5a..300754ed8c 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js @@ -48,9 +48,10 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { contentPane.containerNode.innerHTML = data; - parser.parse(contentPane.containerNode); - - that.pluginUpdater = new PluginUpdater(contentPane.containerNode, that.modelObj, that.controller); + parser.parse(contentPane.containerNode).then(function(instances) + { + that.pluginUpdater = new PluginUpdater(contentPane.containerNode, that.modelObj, that.controller); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js index 1bf41ec730..320de8a876 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js @@ -51,8 +51,8 @@ define(["dojo/dom", sync: true, load: function(data) { contentPane.containerNode.innerHTML = data; - parser.parse(contentPane.containerNode); - + parser.parse(contentPane.containerNode).then(function(instances) + { that.portUpdater = new PortUpdater(contentPane.containerNode, that.modelObj, that.controller, "api/latest/port/" + encodeURIComponent(that.name)); updater.add( that.portUpdater ); @@ -72,6 +72,7 @@ define(["dojo/dom", function(evt){ that.showEditDialog(); }); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js index f9982a1699..c8e1d17e06 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js @@ -65,8 +65,15 @@ function (declare, xhr, event, connect, dom, domConstruct, parser, json, Memory, this.userPreferences = {}; this.domNode = domConstruct.create("div", {innerHTML: markup}); - this.preferencesDialog = parser.parse(this.domNode)[0]; - + parser.parse(this.domNode).then(function(instances) + { + that._postParse(); + }); + }, + _postParse: function() + { + var that = this; + this.preferencesDialog = registry.byId("preferences.preferencesDialog"); for(var i=0; i<preferenceNames.length; i++) { var name = preferenceNames[i]; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js index 0d40669823..c145ba0d34 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js @@ -51,8 +51,8 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { node.innerHTML = data; - parser.parse(node); - + parser.parse(node).then(function(instances) + { that.containerNode = node; that.parentObject = parentObject; that.preferencesProviderType=query(".preferencesProviderType", node)[0]; @@ -65,6 +65,7 @@ define(["dojo/_base/xhr", editPreferencesProviderWidget.on("click", function(evt){ event.stop(evt); that.editPreferencesProvider();}); var deletePreferencesProviderWidget = registry.byNode(that.deletePreferencesProviderButton); deletePreferencesProviderWidget.on("click", function(evt){ event.stop(evt); that.deletePreferencesProvider();}); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js index 5b441a7b2f..55d0df1241 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js @@ -79,7 +79,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.queueUpdater = new QueueUpdater(contentPane.containerNode, that, that.controller); @@ -180,6 +181,8 @@ define(["dojo/_base/xhr", editQueue.show({nodeName:that.modelObj.parent.parent.name, hostName:that.modelObj.parent.name,queueName:that.name}); }); UserPreferences.addListener(that); + + }); }}); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js index 82e2b204f9..fa6b63212e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js @@ -51,7 +51,8 @@ define(["dojo/dom", sync: true, load: function(data) { contentPane.containerNode.innerHTML = data; - parser.parse(contentPane.containerNode); + parser.parse(contentPane.containerNode).then(function(instances) + { that.keyStoreUpdater = new KeyStoreUpdater(contentPane.containerNode, that.modelObj, that.controller, that.url); that.keyStoreUpdater.update(); @@ -75,6 +76,7 @@ define(["dojo/dom", addStore.show(data[0], that.url); }); }); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js index 434e119736..e4482cc39e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js @@ -55,8 +55,8 @@ define(["dojo/_base/xhr", load: function(data) { var containerNode = contentPane.containerNode; containerNode.innerHTML = data; - parser.parse(containerNode); - + parser.parse(containerNode).then(function(instances) + { that.vhostUpdater = new Updater(containerNode, that.modelObj, that.controller, that); var addQueueButton = query(".addQueueButton", containerNode)[0]; @@ -149,6 +149,7 @@ define(["dojo/_base/xhr", that.vhostUpdater.update(); updater.add( that.vhostUpdater ); + }); }}); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js index 76eaadad18..837ff04c78 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js @@ -56,8 +56,10 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { contentPane.containerNode.innerHTML = data; - parser.parse(contentPane.containerNode); - that.onOpen(contentPane.containerNode) + parser.parse(contentPane.containerNode).then(function(instances) + { + that.onOpen(contentPane.containerNode) + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js index 12c8677c11..e8250217c6 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js @@ -53,14 +53,14 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { node.innerHTML = data; - parser.parse(node); - + parser.parse(node).then(function(instances) + { that.groupDatabaseUpdater= new AclFileUpdater(node, aclProviderObj, controller); updater.add( that.groupDatabaseUpdater); that.groupDatabaseUpdater.update(); - + }); }}); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js index e42dafb3c3..2c25149091 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js @@ -31,8 +31,11 @@ define(["dojo/dom","dojo/query","dijit/registry","qpid/common/util"], show: function(data) { var that=this; - util.parseHtmlIntoDiv(data.containerNode, "accesscontrolprovider/aclfile/add.html"); - + util.parseHtmlIntoDiv(data.containerNode, "accesscontrolprovider/aclfile/add.html", function(){that._postParse(data);}); + }, + _postParse: function(data) + { + var that=this; this.aclServerPath = registry.byId("addAccessControlProvider.serverPath"); this.aclUploadFields = dom.byId("addAccessControlProvider.uploadFields"); this.aclSelectedFileContainer = dom.byId("addAccessControlProvider.selectedFile"); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js index 38a6c8e841..83bf23f669 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js @@ -53,8 +53,11 @@ define(["dojo/_base/lang", { var that=this; this.containerNode = construct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances){ that._postParse(); }); + }, + _postParse: function() + { + var that=this; this.accessControlProviderName = registry.byId("addAccessControlProvider.name"); this.accessControlProviderName.set("regExpGen", util.nameOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js index 17b7edcec9..ccae89d6c1 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js @@ -56,8 +56,11 @@ define(["dojo/_base/xhr", { var that=this; this.containerNode = construct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances) { that._postParse(); }); + }, + _postParse: function() + { + var that = this; this.authenticationProviderName = registry.byId("addAuthenticationProvider.name"); this.authenticationProviderName.set("regExpGen", util.nameOrContextVarRegexp); this.authenticationProviderName.on("change", function(newValue){that.preferencesProviderForm.preferencesProviderNameWidget.set("value",newValue);}); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js index f158b8ceb6..81ce40ebe9 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js @@ -53,8 +53,11 @@ define([ { var that=this; this.containerNode = construct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances) { that._postParse(); }); + }, + _postParse: function() + { + var that=this; this.groupProviderName = registry.byId("addGroupProvider.name"); this.groupProviderName.set("regExpGen", util.nameOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js index 072b202b23..2136318dfb 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js @@ -40,8 +40,11 @@ define([ { var that=this; this.containerNode = construct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances) { that._postParse(); }); + }, + _postParse: function() + { + var that=this; this.preferencesProviderForm = registry.byId("addPreferencesProvider.preferencesProvider"); this.dialog = registry.byId("addPreferencesProvider"); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js index da37acec82..caf14d0cc8 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js @@ -53,8 +53,11 @@ define(["dojo/_base/lang", { var that=this; this.containerNode = construct.create("div", {innerHTML: template}); - parser.parse(this.containerNode); - + parser.parse(this.containerNode).then(function(instances) { that._postParse(); }); + }, + _postParse: function() + { + var that=this; this.storeName = registry.byId("addStore.name"); this.storeName.set("regExpGen", util.nameOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js index f379361a09..21927ea0e5 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js @@ -57,8 +57,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; var virtualHostNodeName = registry.byId("addVirtualHostNode.nodeName"); virtualHostNodeName.set("regExpGen", util.nameOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js index 96083843fa..e6f2249f65 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js @@ -51,8 +51,10 @@ define(["dojo/_base/xhr", sync: true, load: function(data) { node.innerHTML = data; - parser.parse(node); - that.init(node, authProviderObj, controller); + parser.parse(node).then(function(instances) + { + that.init(node, authProviderObj, controller); + }); }}); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js index a593b14fd6..cbc5ce356d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js @@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","qpid/common/util"], return { show: function(data) { - util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html"); - if (data.data) + util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html", + function() { - var path = registry.byNode(query(".path", data.containerNode)[0]); - path.set("value", data.data.path); - } + if (data.data) + { + var path = registry.byNode(query(".path", data.containerNode)[0]); + path.set("value", data.data.path); + } + }); } }; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js index 6147bf5249..979a10cae9 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js @@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","qpid/common/util"], return { show: function(data) { - util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/external/add.html"); - if (data.data) + util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/external/add.html", + function() { - var useFullDN = registry.byNode(query(".useFullDN", data.containerNode)[0]); - useFullDN.set("value", data.data.useFullDN); - } + if (data.data) + { + var useFullDN = registry.byNode(query(".useFullDN", data.containerNode)[0]); + useFullDN.set("value", data.data.useFullDN); + } + }); } }; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js index a593b14fd6..cbc5ce356d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js @@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","qpid/common/util"], return { show: function(data) { - util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html"); - if (data.data) + util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html", + function() { - var path = registry.byNode(query(".path", data.containerNode)[0]); - path.set("value", data.data.path); - } + if (data.data) + { + var path = registry.byNode(query(".path", data.containerNode)[0]); + path.set("value", data.data.path); + } + }); } }; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js index 2c0dc688e9..4e04bfd6f0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js @@ -24,8 +24,11 @@ define(["dojo/_base/xhr","dojo/query","dijit/registry","qpid/common/util","qpid/ return { show: function(data) { - util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/simpleldap/add.html"); - + var that = this; + util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/simpleldap/add.html", function(){that._postParse(data);}); + }, + _postParse: function(data) + { var that = this; xhr.get({url: "api/latest/truststore", sync: true, handleAs: "json"}).then( function(trustStores) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js index 07938fe8e7..08a4a84d47 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js @@ -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"); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js index 06c9672efe..91fc9891cf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js @@ -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"); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js index 849fd9378c..b47052b546 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js @@ -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"); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js index 4f815f1f1d..8638164d9f 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js @@ -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"); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js index 8ac6be04cc..7832941e71 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js @@ -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"); } ); + }); }}); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js index ea12280d0d..5788fad8af 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js @@ -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() diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js index f28f250134..6543d6a797 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js @@ -25,12 +25,15 @@ define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/comm 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); + } + }); } }; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js index 29054b5379..c013a88d0a 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js @@ -51,9 +51,13 @@ return declare("qpid.management.logs.LogFileDownloadDialog", null, { 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]); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js index 470ad28cd2..4a76110a58 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js @@ -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){ diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js index 69f520bf42..4c32cce7cd 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js @@ -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(); }); + }); }}); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js index 3579d258e9..4141b6b670 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js @@ -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(); }); + }); }}); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js index d030ea2832..929d318b4f 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js @@ -23,12 +23,15 @@ define(["dojo/query", "dijit/registry", "qpid/common/util"], 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); + } + }); } }; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js index 46dedcc9f5..660b6673f2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js @@ -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]; + }); }}); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js index 89b0b5d88f..7d78026d05 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js @@ -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) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js index 7d14c6450f..c4e44f5027 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js @@ -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"; } + } }; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js index 6264d81335..9672426384 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js @@ -24,10 +24,12 @@ define(["dijit/registry", "qpid/common/util", "dojo/domReady!"], 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); + }); } }; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js index 35ecbec315..20d63378a7 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js @@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], 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")); + }); } }; } |