You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/03/28 21:51:26 UTC
[2/2] qpid-broker-j git commit: QPID-7925: [Broker-J] [WMC] Emit
'hide' event on hiding of load form
QPID-7925: [Broker-J] [WMC] Emit 'hide' event on hiding of load form
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/6cdcc25b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/6cdcc25b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/6cdcc25b
Branch: refs/heads/master
Commit: 6cdcc25b9489f53bea64169e4b4386b72ef14ec5
Parents: 3040a4f
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Mar 28 22:50:44 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Mar 28 22:50:44 2018 +0100
----------------------------------------------------------------------
.../js/qpid/management/accesscontrolprovider/RuleBased.js | 8 ++++----
.../management/accesscontrolprovider/rulebased/LoadForm.js | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6cdcc25b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js
index 10b3b83..8b32916 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js
@@ -169,6 +169,9 @@ define(["dojo/_base/declare",
lang.hitch(this, function (LoadForm) {
this.loadForm = new LoadForm();
this.loadForm.on("load", lang.hitch(this, this.loadFromFile));
+ this.loadForm.on("hide", lang.hitch(this, function () {
+ this.loadButton.set("disabled", false);
+ }));
this.loadForm.show();
}));
}
@@ -186,10 +189,7 @@ define(["dojo/_base/declare",
lang.hitch(this, function(error){
util.xhrErrorHandler(error);
this.loadForm.reset();
- }))
- .always(lang.hitch(this, function () {
- this.loadButton.set("disabled", false);
- }));
+ }));
};
RuleBased.prototype.extractRules = function () {
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6cdcc25b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js
index 3330ce4..36887b4 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js
@@ -72,6 +72,9 @@ define(["dojo/_base/declare",
this.warning.innerHTML = "File upload requires a more recent browser with HTML5 support";
this.warning.className = this.warning.className.replace("hidden", "");
}
+ this.loadDialog.onHide = lang.hitch(this, function () {
+ this.emit("hide");
+ });
},
show: function()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org