You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/05/02 17:57:54 UTC
svn commit: r1741993 [1/29] - in /qpid/java/trunk:
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/
bdbstore/src/main/java/resources/js/qpid/management/virtualh...
Author: lquack
Date: Mon May 2 15:57:52 2016
New Revision: 1741993
URL: http://svn.apache.org/viewvc?rev=1741993&view=rev
Log:
QPID-7239: Apply adjuseted code style
Modified:
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/add.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/add.js
qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js
qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js
qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/addVirtualHostAlias.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/FormWidgetMixin.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/JsonRest.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/TimeZoneSelector.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/UpdatableStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/WarningPane.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/footer.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/formatter.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilter.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/EnhancedFilterTools.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/FilterSummary.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/QueryTab.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLogInclusionRule.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLogger.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostAlias.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/amqp/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/http/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/CriteriaPane.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/DropDownSelect.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/MessageDialog.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereExpression.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/autogeneratedselfsigned/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/autogeneratedselfsigned/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/defaultalias/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/hostnamealias/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/namealias/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/patternmatchingalias/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/Authenticator.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/CredentialBasedSaslClient.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/SaslClient.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/ShaSaslClient.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/cram-md5-hex/SaslClient.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/cram-md5/SaslClient.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/plain/SaslClient.js
qpid/java/trunk/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js
qpid/java/trunk/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhostnode/memory/add.js
qpid/java/trunk/perftests/etc/testdefs/defaultTests.js
qpid/java/trunk/perftests/src/main/java/json2.js
qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js Mon May 2 15:57:52 2016
@@ -28,18 +28,19 @@ define(["dojo/_base/xhr",
"dijit/form/ValidationTextBox",
"dijit/form/NumberTextBox",
"dojo/domReady!"], function (xhr, parser, dom, domConstruct, json, registry, template, util)
- {
- return {
- show: function (data)
- {
- this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
- parser.parse(this.containerNode).then(function (instances)
- {
- registry.byId("addVirtualHost.storeUnderfullSize")
- .set("regExpGen", util.numericOrContextVarRegexp);
- registry.byId("addVirtualHost.storeOverfullSize")
- .set("regExpGen", util.numericOrContextVarRegexp);
- });
- }
- };
- });
+{
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode)
+ .then(function (instances)
+ {
+ registry.byId("addVirtualHost.storeUnderfullSize")
+ .set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("addVirtualHost.storeOverfullSize")
+ .set("regExpGen", util.numericOrContextVarRegexp);
+ });
+ }
+ };
+});
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js Mon May 2 15:57:52 2016
@@ -23,8 +23,10 @@ define(["dijit/registry", "qpid/common/u
{
util.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html", function ()
{
- registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
- registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("editVirtualHost.storeUnderfullSize")
+ .set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("editVirtualHost.storeOverfullSize")
+ .set("regExpGen", util.numericOrContextVarRegexp);
});
}
};
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js Mon May 2 15:57:52 2016
@@ -26,12 +26,12 @@ define(["dojo/_base/xhr",
"dijit/form/ValidationTextBox",
"dijit/form/CheckBox",
"dojo/domReady!"], function (xhr, parser, dom, domConstruct, json, registry, template)
- {
- return {
- show: function (data)
- {
- this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
- parser.parse(this.containerNode);
- }
- };
- });
+{
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode);
+ }
+ };
+});
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js Mon May 2 15:57:52 2016
@@ -23,8 +23,10 @@ define(["qpid/common/util", "dijit/regis
{
util.parseHtmlIntoDiv(data.containerNode, "virtualhost/bdb_ha/edit.html", function ()
{
- registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
- registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("editVirtualHost.storeUnderfullSize")
+ .set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("editVirtualHost.storeOverfullSize")
+ .set("regExpGen", util.numericOrContextVarRegexp);
});
}
};
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/add.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/add.js Mon May 2 15:57:52 2016
@@ -28,12 +28,12 @@ define(["dojo/_base/xhr",
"dijit/form/ValidationTextBox",
"dijit/form/CheckBox",
"dojo/domReady!"], function (xhr, parser, dom, domConstruct, json, registry, template)
- {
- return {
- show: function (data)
- {
- this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
- parser.parse(this.containerNode);
- }
- };
- });
+{
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode);
+ }
+ };
+});
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js Mon May 2 15:57:52 2016
@@ -24,7 +24,7 @@ define(["qpid/common/util", "dijit/regis
util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html", function ()
{
registry.byId("editVirtualHostNode.storePath")
- .set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+ .set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
});
}
};
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js Mon May 2 15:57:52 2016
@@ -29,57 +29,56 @@ define(["dojo/_base/xhr",
"dijit/form/ValidationTextBox",
"dijit/form/RadioButton",
"dojo/domReady!"], function (xhr, parser, array, dom, domConstruct, json, registry, template)
- {
- return {
- show: function (data)
- {
- var that = this;
+{
+ return {
+ show: function (data)
+ {
+ var that = this;
- this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
- parser.parse(this.containerNode).then(function (instances)
- {
- // lookup field
- that.groupChoice =
- registry.byId("addVirtualHostNode.group");
- that.virtualHostNodeBdbhaTypeFieldsContainer =
- dom.byId("addVirtualHostNode.bdbha.typeFields");
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode)
+ .then(function (instances)
+ {
+ // lookup field
+ that.groupChoice = registry.byId("addVirtualHostNode.group");
+ that.virtualHostNodeBdbhaTypeFieldsContainer = dom.byId("addVirtualHostNode.bdbha.typeFields");
- // add callback
- that.groupChoice.on("change", function (type)
- {
- that._groupChoiceChanged(type,
- that.virtualHostNodeBdbhaTypeFieldsContainer,
- "qpid/management/virtualhostnode/bdb_ha/add/");
- });
- });
- },
- _groupChoiceChanged: function (type, typeFieldsContainer, urlStem)
- {
- var widgets = registry.findWidgets(typeFieldsContainer);
- array.forEach(widgets, function (item)
- {
- item.destroyRecursive();
- });
- domConstruct.empty(typeFieldsContainer);
+ // add callback
+ that.groupChoice.on("change", function (type)
+ {
+ that._groupChoiceChanged(type,
+ that.virtualHostNodeBdbhaTypeFieldsContainer,
+ "qpid/management/virtualhostnode/bdb_ha/add/");
+ });
+ });
+ },
+ _groupChoiceChanged: function (type, typeFieldsContainer, urlStem)
+ {
+ var widgets = registry.findWidgets(typeFieldsContainer);
+ array.forEach(widgets, function (item)
+ {
+ item.destroyRecursive();
+ });
+ domConstruct.empty(typeFieldsContainer);
- if (type)
- {
- var that = this;
- require([urlStem + type.toLowerCase() + "/add"], function (TypeUI)
- {
- try
- {
- TypeUI.show({
- containerNode: typeFieldsContainer,
- parent: that
- });
- }
- catch (e)
- {
- console.warn(e);
- }
- });
- }
- }
- };
- });
+ if (type)
+ {
+ var that = this;
+ require([urlStem + type.toLowerCase() + "/add"], function (TypeUI)
+ {
+ try
+ {
+ TypeUI.show({
+ containerNode: typeFieldsContainer,
+ parent: that
+ });
+ }
+ catch (e)
+ {
+ console.warn(e);
+ }
+ });
+ }
+ }
+ };
+});
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js Mon May 2 15:57:52 2016
@@ -27,27 +27,25 @@ define(["dojo/_base/xhr",
"dijit/form/ValidationTextBox",
"dijit/form/CheckBox",
"dojo/domReady!"], function (xhr, parser, dom, domConstruct, json, registry, template, util)
- {
- return {
- show: function (data)
- {
- this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
- parser.parse(this.containerNode).then(function (instances)
- {
- registry.byId("addVirtualHostNode.groupName")
- .set("regExpGen", util.nameOrContextVarRegexp);
- registry.byId("addVirtualHostNode.helperNodeName")
- .set("regExpGen", util.nameOrContextVarRegexp);
- registry.byId("addVirtualHostNode.helperAddress")
- .set("regExpGen",
- util.nodeAddressOrContextVarRegexp);
- registry.byId("addVirtualHostNode.address")
- .set("regExpGen",
- util.nodeAddressOrContextVarRegexp);
+{
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode)
+ .then(function (instances)
+ {
+ registry.byId("addVirtualHostNode.groupName")
+ .set("regExpGen", util.nameOrContextVarRegexp);
+ registry.byId("addVirtualHostNode.helperNodeName")
+ .set("regExpGen", util.nameOrContextVarRegexp);
+ registry.byId("addVirtualHostNode.helperAddress")
+ .set("regExpGen", util.nodeAddressOrContextVarRegexp);
+ registry.byId("addVirtualHostNode.address")
+ .set("regExpGen", util.nodeAddressOrContextVarRegexp);
- dom.byId("addVirtualHostNode.uploadFields").style.display =
- "none";
- });
- }
- };
- });
+ dom.byId("addVirtualHostNode.uploadFields").style.display = "none";
+ });
+ }
+ };
+});
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js Mon May 2 15:57:52 2016
@@ -29,179 +29,179 @@ define(["dojo/_base/xhr",
"dijit/form/MultiSelect",
"dijit/form/Button",
"dojo/domReady!"], function (xhr, win, parser, dom, domConstruct, json, registry, template, util)
- {
- return {
- permittedNodesArray: [],
- show: function (data)
- {
- var that = this;
-
- this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
- parser.parse(this.containerNode).then(function (instances)
- {
- that._postParse(data);
- });
-
- },
- _postParse: function (data)
- {
- var that = this;
- this.addVirtualHostNodeAddress = registry.byId("addVirtualHostNode.address");
- this.addVirtualHostNodeAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp);
-
- this.addVirtualHostNodeAddress.on("change", function (address)
- {
- that._changeAddress(address, that.virtualHostNodeHelperAddress);
- });
- this.addVirtualHostNodeAddress.on("click", function (e)
- {
- that._updatePermittedNodesJson();
- });
-
- this.virtualHostNodeHelperAddress = registry.byId("addVirtualHostNode.helperAddress");
- this.virtualHostNodeHelperAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp);
-
- // list objects html node and dojo object
- this.addVirtualHostNodePermittedNodesList = dom.byId("addVirtualHostNode.permittedNodesList");
- this.addVirtualHostNodePermittedNodesListDojo =
- registry.byId("addVirtualHostNode.permittedNodesList");
- this.addVirtualHostNodePermittedNodesListDojo.on("change", function (value)
- {
- that._changePermittedNodeList(value);
- });
-
- // permitted node text field
- this.addVirtualHostNodePermittedNode = registry.byId("addVirtualHostNode.permittedNode");
- this.addVirtualHostNodePermittedNode.set("regExpGen", util.nodeAddressOrContextVarRegexp);
- this.addVirtualHostNodePermittedNode.on("change", function (value)
- {
- that._changePermittedNode(value);
- });
-
- // add and remove buttons & click handlers
- this.addVirtualHostNodePermittedNodeAddButton = registry.byId("addVirtualHostNode.permittedNodeAdd");
- this.addVirtualHostNodePermittedNodeAddButton.set("disabled", true);
- this.addVirtualHostNodePermittedNodeRemoveButton =
- registry.byId("addVirtualHostNode.permittedNodeRemove");
- this.addVirtualHostNodePermittedNodeRemoveButton.set("disabled", true);
- this.addVirtualHostNodePermittedNodeAddButton.on("click", function (e)
- {
- that._clickAddPermittedNodeButton(e);
- });
- this.addVirtualHostNodePermittedNodeRemoveButton.on("click", function (e)
- {
- that._clickRemovePermittedNodeButton(e);
- });
-
- // This will contain the serialised form that will go to the server
- this.addVirtualHostNodePermittedNodes = registry.byId("addVirtualHostNode.permittedNodes");
-
- registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp);
-
- dom.byId("addVirtualHostNode.uploadFields").style.display = "block";
-
- this.addVirtualHostNodePermittedNodes._getValueAttr = function ()
- {
- return that.permittedNodesArray;
- };
- },
- _updatePermittedNodesJson: function ()
- {
- var nodeAddress = this.addVirtualHostNodeAddress.get("value");
- var permittedNodes = [];
- if (nodeAddress)
- {
- permittedNodes.push(nodeAddress);
- }
- var children = this.addVirtualHostNodePermittedNodesList.children;
- var i;
- for (i = 0; i < children.length; i++)
- {
- var child = children.item(i);
- if (child.value != nodeAddress)
- {
- permittedNodes.push(child.value);
- }
- }
- this.permittedNodesArray = permittedNodes;
- },
- _changePermittedNodeList: function (value)
- {
- var hasSelection = this.addVirtualHostNodePermittedNodesListDojo.get("value").length > 0;
- this.addVirtualHostNodePermittedNodeRemoveButton.set("disabled", !hasSelection);
- },
- _changePermittedNode: function (value)
- {
- var fieldIsEmpty = (this.addVirtualHostNodePermittedNode.get("value") == "");
- this.addVirtualHostNodePermittedNodeAddButton.set("disabled", fieldIsEmpty);
- return true;
- },
- _changeAddress: function (address, virtualHostNodeHelperAddress)
- {
- virtualHostNodeHelperAddress.set("value", address);
- this._updatePermittedNodesJson();
- },
- _clickAddPermittedNodeButton: function (e)
- {
- // check the text box is valid and not empty
- if (this.addVirtualHostNodePermittedNode.isValid() && this.addVirtualHostNodePermittedNode.value
- && this.addVirtualHostNodePermittedNode.value != "")
- {
- // read value to add from text box
- var newAddress = this.addVirtualHostNodePermittedNode.value;
-
- // clear UI value
- this.addVirtualHostNodePermittedNode.set("value", "");
- this.addVirtualHostNodePermittedNodeAddButton.set("disabled", true);
-
- //check entry not already present in list
- var alreadyPresent = false;
- var children = this.addVirtualHostNodePermittedNodesList.children;
- var i;
- for (i = 0; i < children.length; i++)
- {
- var child = children.item(i);
- if (child.value == newAddress)
- {
- alreadyPresent = true;
- break;
- }
- }
-
- if (!alreadyPresent)
- {
- // construct new option for list
- var newOption = win.doc.createElement('option');
- newOption.innerHTML = newAddress;
- newOption.value = newAddress;
-
- // add new option to list
- this.addVirtualHostNodePermittedNodesList.appendChild(newOption);
- }
- }
- this._updatePermittedNodesJson();
- },
- _clickRemovePermittedNodeButton: function (e)
- {
- var selectedValues = this.addVirtualHostNodePermittedNodesListDojo.get("value");
- var v;
- for (v in selectedValues)
- {
- var children = this.addVirtualHostNodePermittedNodesList.children;
- var i;
- for (i = 0; i < children.length; i++)
- {
- var child = children.item(i);
- if (child.value == selectedValues[v])
- {
- this.addVirtualHostNodePermittedNodesList.removeChild(child);
- }
- }
- }
- this.addVirtualHostNodePermittedNodeRemoveButton.set("disabled", true);
-
- this._updatePermittedNodesJson();
-
- }
- };
- });
+{
+ return {
+ permittedNodesArray: [],
+ show: function (data)
+ {
+ var that = this;
+
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode)
+ .then(function (instances)
+ {
+ that._postParse(data);
+ });
+
+ },
+ _postParse: function (data)
+ {
+ var that = this;
+ this.addVirtualHostNodeAddress = registry.byId("addVirtualHostNode.address");
+ this.addVirtualHostNodeAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp);
+
+ this.addVirtualHostNodeAddress.on("change", function (address)
+ {
+ that._changeAddress(address, that.virtualHostNodeHelperAddress);
+ });
+ this.addVirtualHostNodeAddress.on("click", function (e)
+ {
+ that._updatePermittedNodesJson();
+ });
+
+ this.virtualHostNodeHelperAddress = registry.byId("addVirtualHostNode.helperAddress");
+ this.virtualHostNodeHelperAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp);
+
+ // list objects html node and dojo object
+ this.addVirtualHostNodePermittedNodesList = dom.byId("addVirtualHostNode.permittedNodesList");
+ this.addVirtualHostNodePermittedNodesListDojo = registry.byId("addVirtualHostNode.permittedNodesList");
+ this.addVirtualHostNodePermittedNodesListDojo.on("change", function (value)
+ {
+ that._changePermittedNodeList(value);
+ });
+
+ // permitted node text field
+ this.addVirtualHostNodePermittedNode = registry.byId("addVirtualHostNode.permittedNode");
+ this.addVirtualHostNodePermittedNode.set("regExpGen", util.nodeAddressOrContextVarRegexp);
+ this.addVirtualHostNodePermittedNode.on("change", function (value)
+ {
+ that._changePermittedNode(value);
+ });
+
+ // add and remove buttons & click handlers
+ this.addVirtualHostNodePermittedNodeAddButton = registry.byId("addVirtualHostNode.permittedNodeAdd");
+ this.addVirtualHostNodePermittedNodeAddButton.set("disabled", true);
+ this.addVirtualHostNodePermittedNodeRemoveButton = registry.byId("addVirtualHostNode.permittedNodeRemove");
+ this.addVirtualHostNodePermittedNodeRemoveButton.set("disabled", true);
+ this.addVirtualHostNodePermittedNodeAddButton.on("click", function (e)
+ {
+ that._clickAddPermittedNodeButton(e);
+ });
+ this.addVirtualHostNodePermittedNodeRemoveButton.on("click", function (e)
+ {
+ that._clickRemovePermittedNodeButton(e);
+ });
+
+ // This will contain the serialised form that will go to the server
+ this.addVirtualHostNodePermittedNodes = registry.byId("addVirtualHostNode.permittedNodes");
+
+ registry.byId("addVirtualHostNode.groupName")
+ .set("regExpGen", util.nameOrContextVarRegexp);
+
+ dom.byId("addVirtualHostNode.uploadFields").style.display = "block";
+
+ this.addVirtualHostNodePermittedNodes._getValueAttr = function ()
+ {
+ return that.permittedNodesArray;
+ };
+ },
+ _updatePermittedNodesJson: function ()
+ {
+ var nodeAddress = this.addVirtualHostNodeAddress.get("value");
+ var permittedNodes = [];
+ if (nodeAddress)
+ {
+ permittedNodes.push(nodeAddress);
+ }
+ var children = this.addVirtualHostNodePermittedNodesList.children;
+ var i;
+ for (i = 0; i < children.length; i++)
+ {
+ var child = children.item(i);
+ if (child.value != nodeAddress)
+ {
+ permittedNodes.push(child.value);
+ }
+ }
+ this.permittedNodesArray = permittedNodes;
+ },
+ _changePermittedNodeList: function (value)
+ {
+ var hasSelection = this.addVirtualHostNodePermittedNodesListDojo.get("value").length > 0;
+ this.addVirtualHostNodePermittedNodeRemoveButton.set("disabled", !hasSelection);
+ },
+ _changePermittedNode: function (value)
+ {
+ var fieldIsEmpty = (this.addVirtualHostNodePermittedNode.get("value") == "");
+ this.addVirtualHostNodePermittedNodeAddButton.set("disabled", fieldIsEmpty);
+ return true;
+ },
+ _changeAddress: function (address, virtualHostNodeHelperAddress)
+ {
+ virtualHostNodeHelperAddress.set("value", address);
+ this._updatePermittedNodesJson();
+ },
+ _clickAddPermittedNodeButton: function (e)
+ {
+ // check the text box is valid and not empty
+ if (this.addVirtualHostNodePermittedNode.isValid() && this.addVirtualHostNodePermittedNode.value
+ && this.addVirtualHostNodePermittedNode.value != "")
+ {
+ // read value to add from text box
+ var newAddress = this.addVirtualHostNodePermittedNode.value;
+
+ // clear UI value
+ this.addVirtualHostNodePermittedNode.set("value", "");
+ this.addVirtualHostNodePermittedNodeAddButton.set("disabled", true);
+
+ //check entry not already present in list
+ var alreadyPresent = false;
+ var children = this.addVirtualHostNodePermittedNodesList.children;
+ var i;
+ for (i = 0; i < children.length; i++)
+ {
+ var child = children.item(i);
+ if (child.value == newAddress)
+ {
+ alreadyPresent = true;
+ break;
+ }
+ }
+
+ if (!alreadyPresent)
+ {
+ // construct new option for list
+ var newOption = win.doc.createElement('option');
+ newOption.innerHTML = newAddress;
+ newOption.value = newAddress;
+
+ // add new option to list
+ this.addVirtualHostNodePermittedNodesList.appendChild(newOption);
+ }
+ }
+ this._updatePermittedNodesJson();
+ },
+ _clickRemovePermittedNodeButton: function (e)
+ {
+ var selectedValues = this.addVirtualHostNodePermittedNodesListDojo.get("value");
+ var v;
+ for (v in selectedValues)
+ {
+ var children = this.addVirtualHostNodePermittedNodesList.children;
+ var i;
+ for (i = 0; i < children.length; i++)
+ {
+ var child = children.item(i);
+ if (child.value == selectedValues[v])
+ {
+ this.addVirtualHostNodePermittedNodesList.removeChild(child);
+ }
+ }
+ }
+ this.addVirtualHostNodePermittedNodeRemoveButton.set("disabled", true);
+
+ this._updatePermittedNodesJson();
+
+ }
+ };
+});
Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js (original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js Mon May 2 15:57:52 2016
@@ -25,189 +25,196 @@ define(["qpid/common/util",
"dojo/data/ObjectStore",
"dojo/_base/window",
"dojo/domReady!"], function (util, lang, registry, Memory, ObjectStore, win)
- {
- return {
- permittedNodesArray: [],
- show: function (data)
- {
- var that = this;
- util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/bdb_ha/edit.html", function ()
- {
- that._postParse(data);
- });
- },
- _postParse: function (data)
- {
- var node = data.data;
- if (!(data.data.state == "ERRORED" || data.data.state == "STOPPED"))
- {
- registry.byId("editVirtualHostNode.storePath").set("disabled", true);
- }
- if (!( data.effectiveData.role == "MASTER" || data.data.state == "ERRORED" || data.data.state
- == "STOPPED"))
- {
- registry.byId("editVirtualHostNode.permittedNodesList").set("disabled", true);
- }
- var overrideData = [{
- id: '0',
- name: 'Majority',
- selected: '1'
- }];
- if (node.remotereplicationnodes && node.remotereplicationnodes.length > 1)
- {
- registry.byId("editVirtualHostNode.designatedPrimary").set("disabled", true);
- registry.byId("editVirtualHostNode.priority").set("disabled", false);
- registry.byId("editVirtualHostNode.quorumOverride").set("disabled", false);
- var overrideLimit = Math.floor((node.remotereplicationnodes.length + 1) / 2);
- for (var i = 1; i <= overrideLimit; i++)
- {
- overrideData.push({
- id: i,
- name: i + ""
- });
- }
- }
- else
- {
- registry.byId("editVirtualHostNode.designatedPrimary").set("disabled", false);
- registry.byId("editVirtualHostNode.priority").set("disabled", true);
- registry.byId("editVirtualHostNode.quorumOverride").set("disabled", true);
- }
- var store = new Memory({
- data: overrideData,
- idProperty: "id"
- });
- registry.byId("editVirtualHostNode.quorumOverride")
- .set("store", new ObjectStore({objectStore: store}));
-
- var that = this;
- this.permittedNodes = registry.byId("editVirtualHostNode.permittedNodes");
- this.permittedNodesArray = lang.clone(data.permittedNodes);
- this.permittedNodes._getValueAttr = function ()
- {
- return that.permittedNodesArray;
- };
- this.permittedNodesList = registry.byId("editVirtualHostNode.permittedNodesList");
- this.permittedNodesList.on("change", function (value)
- {
- that._changePermittedNodeList(value);
- });
-
- // permitted node text field
- this.permittedNode = registry.byId("editVirtualHostNode.permittedNode");
- this.permittedNode.on("change", function (value)
- {
- that._changePermittedNode(value);
- });
-
- // add and remove buttons & click handlers
- this.permittedNodeAddButton = registry.byId("editVirtualHostNode.permittedNodeAdd");
- this.permittedNodeAddButton.set("disabled", true);
- this.permittedNodeRemoveButton = registry.byId("editVirtualHostNode.permittedNodeRemove");
- this.permittedNodeRemoveButton.set("disabled", true);
- this.permittedNodeAddButton.on("click", function (e)
- {
- that._clickAddPermittedNodeButton(e);
- });
- this.permittedNodeRemoveButton.on("click", function (e)
- {
- that._clickRemovePermittedNodeButton(e);
- });
-
- var permittedNodes = data.data.permittedNodes;
- for (var i = 0; i < permittedNodes.length; i++)
- {
- var host = permittedNodes[i];
- var newOption = this._addOption(host);
- // add new option to list
- this.permittedNodesList.containerNode.appendChild(newOption);
- }
- },
- _clickAddPermittedNodeButton: function (e)
- {
- // check the text box is valid and not empty
- if (this.permittedNode.isValid() && this.permittedNode.value && this.permittedNode.value != "")
- {
- // read value to add from text box
- var newAddress = this.permittedNode.value;
-
- // clear UI value
- this.permittedNode.set("value", "");
- this.permittedNodeAddButton.set("disabled", true);
-
- //check entry not already present in list
- var alreadyPresent = false;
- var children = this.permittedNodesList.containerNode.children;
- var i;
- for (i = 0; i < children.length; i++)
- {
- var child = children.item(i);
- if (child.value == newAddress)
- {
- alreadyPresent = true;
- break;
- }
- }
-
- if (!alreadyPresent)
- {
- var newOption = this._addOption(newAddress);
-
- // add new option to list
- this.permittedNodesList.containerNode.appendChild(newOption);
- this._updatePermittedNodes();
- }
- }
- },
- _clickRemovePermittedNodeButton: function (e)
- {
- var selectedValues = this.permittedNodesList.get("value");
- var v;
- for (v in selectedValues)
- {
- var children = this.permittedNodesList.containerNode.children;
- var i;
- for (i = 0; i < children.length; i++)
- {
- var child = children.item(i);
- if (child.value == selectedValues[v])
- {
- this.permittedNodesList.containerNode.removeChild(child);
- }
- }
- }
- this._updatePermittedNodes();
- this.permittedNodeRemoveButton.set("disabled", true);
- },
- _addOption: function (newAddress)
- {
- // construct new option for list
- var newOption = win.doc.createElement('option');
- newOption.innerHTML = newAddress;
- newOption.value = newAddress;
- return newOption;
- },
- _changePermittedNodeList: function (value)
- {
- var hasSelection = this.permittedNodesList.get("value").length > 0;
- this.permittedNodeRemoveButton.set("disabled", !hasSelection);
- },
- _changePermittedNode: function (value)
- {
- var fieldIsEmpty = (this.permittedNode.get("value") == "");
- this.permittedNodeAddButton.set("disabled", fieldIsEmpty);
- return true;
- },
- _updatePermittedNodes: function ()
- {
- var values = [];
- var children = this.permittedNodesList.containerNode.children;
- for (var i = 0; i < children.length; i++)
- {
- var child = children.item(i);
- values.push(children.item(i).value);
- }
- this.permittedNodesArray = values;
- }
- };
- });
+{
+ return {
+ permittedNodesArray: [],
+ show: function (data)
+ {
+ var that = this;
+ util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/bdb_ha/edit.html", function ()
+ {
+ that._postParse(data);
+ });
+ },
+ _postParse: function (data)
+ {
+ var node = data.data;
+ if (!(data.data.state == "ERRORED" || data.data.state == "STOPPED"))
+ {
+ registry.byId("editVirtualHostNode.storePath")
+ .set("disabled", true);
+ }
+ if (!( data.effectiveData.role == "MASTER" || data.data.state == "ERRORED" || data.data.state == "STOPPED"))
+ {
+ registry.byId("editVirtualHostNode.permittedNodesList")
+ .set("disabled", true);
+ }
+ var overrideData = [{
+ id: '0',
+ name: 'Majority',
+ selected: '1'
+ }];
+ if (node.remotereplicationnodes && node.remotereplicationnodes.length > 1)
+ {
+ registry.byId("editVirtualHostNode.designatedPrimary")
+ .set("disabled", true);
+ registry.byId("editVirtualHostNode.priority")
+ .set("disabled", false);
+ registry.byId("editVirtualHostNode.quorumOverride")
+ .set("disabled", false);
+ var overrideLimit = Math.floor((node.remotereplicationnodes.length + 1) / 2);
+ for (var i = 1; i <= overrideLimit; i++)
+ {
+ overrideData.push({
+ id: i,
+ name: i + ""
+ });
+ }
+ }
+ else
+ {
+ registry.byId("editVirtualHostNode.designatedPrimary")
+ .set("disabled", false);
+ registry.byId("editVirtualHostNode.priority")
+ .set("disabled", true);
+ registry.byId("editVirtualHostNode.quorumOverride")
+ .set("disabled", true);
+ }
+ var store = new Memory({
+ data: overrideData,
+ idProperty: "id"
+ });
+ registry.byId("editVirtualHostNode.quorumOverride")
+ .set("store", new ObjectStore({objectStore: store}));
+
+ var that = this;
+ this.permittedNodes = registry.byId("editVirtualHostNode.permittedNodes");
+ this.permittedNodesArray = lang.clone(data.permittedNodes);
+ this.permittedNodes._getValueAttr = function ()
+ {
+ return that.permittedNodesArray;
+ };
+ this.permittedNodesList = registry.byId("editVirtualHostNode.permittedNodesList");
+ this.permittedNodesList.on("change", function (value)
+ {
+ that._changePermittedNodeList(value);
+ });
+
+ // permitted node text field
+ this.permittedNode = registry.byId("editVirtualHostNode.permittedNode");
+ this.permittedNode.on("change", function (value)
+ {
+ that._changePermittedNode(value);
+ });
+
+ // add and remove buttons & click handlers
+ this.permittedNodeAddButton = registry.byId("editVirtualHostNode.permittedNodeAdd");
+ this.permittedNodeAddButton.set("disabled", true);
+ this.permittedNodeRemoveButton = registry.byId("editVirtualHostNode.permittedNodeRemove");
+ this.permittedNodeRemoveButton.set("disabled", true);
+ this.permittedNodeAddButton.on("click", function (e)
+ {
+ that._clickAddPermittedNodeButton(e);
+ });
+ this.permittedNodeRemoveButton.on("click", function (e)
+ {
+ that._clickRemovePermittedNodeButton(e);
+ });
+
+ var permittedNodes = data.data.permittedNodes;
+ for (var i = 0; i < permittedNodes.length; i++)
+ {
+ var host = permittedNodes[i];
+ var newOption = this._addOption(host);
+ // add new option to list
+ this.permittedNodesList.containerNode.appendChild(newOption);
+ }
+ },
+ _clickAddPermittedNodeButton: function (e)
+ {
+ // check the text box is valid and not empty
+ if (this.permittedNode.isValid() && this.permittedNode.value && this.permittedNode.value != "")
+ {
+ // read value to add from text box
+ var newAddress = this.permittedNode.value;
+
+ // clear UI value
+ this.permittedNode.set("value", "");
+ this.permittedNodeAddButton.set("disabled", true);
+
+ //check entry not already present in list
+ var alreadyPresent = false;
+ var children = this.permittedNodesList.containerNode.children;
+ var i;
+ for (i = 0; i < children.length; i++)
+ {
+ var child = children.item(i);
+ if (child.value == newAddress)
+ {
+ alreadyPresent = true;
+ break;
+ }
+ }
+
+ if (!alreadyPresent)
+ {
+ var newOption = this._addOption(newAddress);
+
+ // add new option to list
+ this.permittedNodesList.containerNode.appendChild(newOption);
+ this._updatePermittedNodes();
+ }
+ }
+ },
+ _clickRemovePermittedNodeButton: function (e)
+ {
+ var selectedValues = this.permittedNodesList.get("value");
+ var v;
+ for (v in selectedValues)
+ {
+ var children = this.permittedNodesList.containerNode.children;
+ var i;
+ for (i = 0; i < children.length; i++)
+ {
+ var child = children.item(i);
+ if (child.value == selectedValues[v])
+ {
+ this.permittedNodesList.containerNode.removeChild(child);
+ }
+ }
+ }
+ this._updatePermittedNodes();
+ this.permittedNodeRemoveButton.set("disabled", true);
+ },
+ _addOption: function (newAddress)
+ {
+ // construct new option for list
+ var newOption = win.doc.createElement('option');
+ newOption.innerHTML = newAddress;
+ newOption.value = newAddress;
+ return newOption;
+ },
+ _changePermittedNodeList: function (value)
+ {
+ var hasSelection = this.permittedNodesList.get("value").length > 0;
+ this.permittedNodeRemoveButton.set("disabled", !hasSelection);
+ },
+ _changePermittedNode: function (value)
+ {
+ var fieldIsEmpty = (this.permittedNode.get("value") == "");
+ this.permittedNodeAddButton.set("disabled", fieldIsEmpty);
+ return true;
+ },
+ _updatePermittedNodes: function ()
+ {
+ var values = [];
+ var children = this.permittedNodesList.containerNode.children;
+ for (var i = 0; i < children.length; i++)
+ {
+ var child = children.item(i);
+ values.push(children.item(i).value);
+ }
+ this.permittedNodesArray = values;
+ }
+ };
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org