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/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.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/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js')
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js | 5 |
1 files changed, 3 insertions, 2 deletions
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();}); + }); }}); }; |