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 2017/11/03 09:13:22 UTC
[2/3] qpid-broker-j git commit: QPID-8007:[Broker-J][WMC] Remove
calls to ready on loading of query and dashboard creation forms
QPID-8007:[Broker-J][WMC] Remove calls to ready on loading of query and dashboard creation forms
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/8bb393f5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/8bb393f5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/8bb393f5
Branch: refs/heads/master
Commit: 8bb393f5ad2bd22feb025fc4a651e2ce4cfe6dac
Parents: 10d49a7
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Nov 2 21:35:48 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Nov 3 09:13:11 2017 +0000
----------------------------------------------------------------------
.../resources/js/qpid/common/ConsoleHelper.js | 86 +++++++++-----------
1 file changed, 40 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8bb393f5/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
index 75af5f1..deace04 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
@@ -86,33 +86,30 @@ define(["dojo/query",
{
var management = this.management;
var controller = this.controller;
- if (queryCreateDialog == null)
+ if (queryCreateDialog === null)
{
- require(["qpid/management/query/QueryCreateDialogForm", "dojo/ready"],
- function (QueryCreateDialogForm, ready)
+ require(["qpid/management/query/QueryCreateDialogForm"],
+ function (QueryCreateDialogForm)
{
- ready(function ()
+ queryCreateDialogForm =
+ new QueryCreateDialogForm({management: management, structure: controller.structure});
+ queryCreateDialogForm.on("create", function (e)
{
- queryCreateDialogForm =
- new QueryCreateDialogForm({management: management, structure: controller.structure});
- queryCreateDialogForm.on("create", function (e)
- {
- queryCreateDialog.hide();
- var tabData = {
- tabType: "query",
- modelObject: e.parentObject,
- data: e.preference,
- preferenceId: e.preference.id
- };
- controller.showTab(tabData);
- });
- queryCreateDialogForm.on("cancel", function (e)
- {
- queryCreateDialog.hide();
- });
- queryCreateDialog = new Dialog({title: "Create query", content: queryCreateDialogForm});
- queryCreateDialog.show();
+ queryCreateDialog.hide();
+ var tabData = {
+ tabType: "query",
+ modelObject: e.parentObject,
+ data: e.preference,
+ preferenceId: e.preference.id
+ };
+ controller.showTab(tabData);
});
+ queryCreateDialogForm.on("cancel", function (e)
+ {
+ queryCreateDialog.hide();
+ });
+ queryCreateDialog = new Dialog({title: "Create query", content: queryCreateDialogForm});
+ queryCreateDialog.show();
});
}
else
@@ -131,33 +128,30 @@ define(["dojo/query",
{
var management = this.management;
var controller = this.controller;
- if (dashboardCreateDialog == null)
+ if (dashboardCreateDialog === null)
{
- require(["qpid/management/dashboard/DashboardCreateDialogForm", "dojo/ready"],
- function (DashboardCreateDialogForm, ready)
+ require(["qpid/management/dashboard/DashboardCreateDialogForm"],
+ function (DashboardCreateDialogForm)
{
- ready(function ()
+ dashboardCreateDialogForm =
+ new DashboardCreateDialogForm({management: management, structure: controller.structure});
+ dashboardCreateDialogForm.on("create", function (e)
+ {
+ dashboardCreateDialog.hide();
+ var tabData = {
+ tabType: "dashboard",
+ modelObject: e.parentObject,
+ data: e.preference,
+ preferenceId: e.preference.id
+ };
+ controller.showTab(tabData);
+ });
+ dashboardCreateDialogForm.on("cancel", function (e)
{
- dashboardCreateDialogForm =
- new DashboardCreateDialogForm({management: management, structure: controller.structure});
- dashboardCreateDialogForm.on("create", function (e)
- {
- dashboardCreateDialog.hide();
- var tabData = {
- tabType: "dashboard",
- modelObject: e.parentObject,
- data: e.preference,
- preferenceId: e.preference.id
- };
- controller.showTab(tabData);
- });
- dashboardCreateDialogForm.on("cancel", function (e)
- {
- dashboardCreateDialog.hide();
- });
- dashboardCreateDialog = new Dialog({title: "Create dashboard", content: dashboardCreateDialogForm});
- dashboardCreateDialog.show();
+ dashboardCreateDialog.hide();
});
+ dashboardCreateDialog = new Dialog({title: "Create dashboard", content: dashboardCreateDialogForm});
+ dashboardCreateDialog.show();
});
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org