summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-02-24 13:20:10 +0000
committerKeith Wall <kwall@apache.org>2015-02-24 13:20:10 +0000
commite897e38cc360d88dc69ab8c5f911f02dab18cd0b (patch)
tree08a0d7211c68df828c580795e56b63179ff14e38 /qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
parente1c2dac46c9b7b8e28be8c56e683bd49b4870652 (diff)
downloadqpid-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/management-http/src/main/java/resources/js/qpid/management/Preferences.js')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js11
1 files changed, 9 insertions, 2 deletions
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];