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 /qpid/java/broker-plugins/derby-store/src/main/java/resources/js | |
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
Diffstat (limited to 'qpid/java/broker-plugins/derby-store/src/main/java/resources/js')
3 files changed, 16 insertions, 10 deletions
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"); + }); } }; } |