Author: orudyy
Date: Sat Jan 31 01:30:10 2015
New Revision: 1656131
URL: http://svn.apache.org/r1656131
Log:
QPID-6346: Create keystore/trustore tab UI only once
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1656131&r1=1656130&r2=1656131&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
Sat Jan 31 01:30:10 2015
@@ -54,10 +54,8 @@ define(["dojo/dom",
parser.parse(contentPane.containerNode);
that.keyStoreUpdater = new
KeyStoreUpdater(contentPane.containerNode, that.modelObj, that.controller,
that.url);
-
- updater.add( that.keyStoreUpdater );
-
that.keyStoreUpdater.update();
+ updater.add( that.keyStoreUpdater );
var deleteKeyStoreButton =
query(".deleteStoreButton", contentPane.containerNode)[0];
var node = registry.byNode(deleteKeyStoreButton);
@@ -132,13 +130,20 @@ define(["dojo/dom",
that.keyStoreData = data[0];
that.updateHeader();
- require(["qpid/management/store/" +
encodeURIComponent(that.keyStoreData.type.toLowerCase()) + "/show"],
+ if (that.details)
+ {
+ that.details.update(that.keyStoreData);
+ }
+ else
+ {
+ require(["qpid/management/store/" +
encodeURIComponent(that.keyStoreData.type.toLowerCase()) + "/show"],
function(DetailsUI)
{
that.details = new
DetailsUI({containerNode:that.keyStoreDetailsContainer, parent: that});
that.details.update(that.keyStoreData);
}
);
+ }
});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1656131&r1=1656130&r2=1656131&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
Sat Jan 31 01:30:10 2015
@@ -54,10 +54,8 @@ define(["dojo/dom",
parser.parse(contentPane.containerNode);
that.keyStoreUpdater = new
KeyStoreUpdater(contentPane.containerNode, that.modelObj, that.controller,
that.url);
-
- updater.add( that.keyStoreUpdater );
-
that.keyStoreUpdater.update();
+ updater.add( that.keyStoreUpdater );
var deleteTrustStoreButton =
query(".deleteStoreButton", contentPane.containerNode)[0];
var node = registry.byNode(deleteTrustStoreButton);
@@ -129,14 +127,20 @@ define(["dojo/dom",
{
that.trustStoreData = data[0];
that.updateHeader();
-
- require(["qpid/management/store/" +
encodeURIComponent(that.trustStoreData.type.toLowerCase()) + "/show"],
- function(DetailsUI)
- {
- that.details = new
DetailsUI({containerNode:that.keyStoreDetailsContainer, parent: that});
- that.details.update(that.trustStoreData);
- }
- );
+ if (that.details)
+ {
+ that.details.update(that.trustStoreData);
+ }
+ else
+ {
+ require(["qpid/management/store/" +
encodeURIComponent(that.trustStoreData.type.toLowerCase()) + "/show"],
+ function(DetailsUI)
+ {
+ that.details = new
DetailsUI({containerNode:that.keyStoreDetailsContainer, parent: that});
+ that.details.update(that.trustStoreData);
+ }
+ );
+ }
});
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
