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/06 16:17:36 UTC
qpid-broker-j git commit: QPID-8014:[Broker-J][WMC] Make sure that
qpid console specific classes are loaded after console html is parsed
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 192863d31 -> 22b606e94
QPID-8014:[Broker-J][WMC] Make sure that qpid console specific classes are loaded after console html is parsed
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/22b606e9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/22b606e9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/22b606e9
Branch: refs/heads/master
Commit: 22b606e94d4ccdc501c9b9dff02a230d42d49c73
Parents: 192863d
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Nov 3 16:22:42 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Mar 6 16:17:23 2018 +0000
----------------------------------------------------------------------
.../src/main/java/resources/index.html | 23 +++++++++++++-------
.../resources/js/qpid/common/ConsoleHelper.js | 9 +++++---
2 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/22b606e9/broker-plugins/management-http/src/main/java/resources/index.html
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/index.html b/broker-plugins/management-http/src/main/java/resources/index.html
index 2ac76f3..474e712 100644
--- a/broker-plugins/management-http/src/main/java/resources/index.html
+++ b/broker-plugins/management-http/src/main/java/resources/index.html
@@ -50,6 +50,7 @@
}
var dojoConfig = {
+ parseOnLoad: false,
tlmSiblingOfDojo: false,
async: true,
baseUrl: getContextPath(),
@@ -88,9 +89,7 @@
var management = null;
require([
"dojo/parser",
- "qpid/common/ConsoleHelper",
- "qpid/management/treeView",
- "qpid/management/controller",
+ "dojo/ready",
"qpid/common/LoginForm",
"dijit/layout/BorderContainer",
"dijit/layout/TabContainer",
@@ -104,12 +103,20 @@
"dijit/MenuItem",
"qpid/common/footer"
],
- function (parser, ConsoleHelper, treeView, controller)
+ function (parser, ready)
{
- qpidManagementHelper = ConsoleHelper;
- parser.parse();
- qpidManagementHelper.init(controller, treeView);
- management = qpidManagementHelper.management;
+ ready(function()
+ {
+ parser.parse().then(function ()
+ {
+ require(["qpid/common/ConsoleHelper"], function (ConsoleHelper)
+ {
+ qpidManagementHelper = ConsoleHelper;
+ qpidManagementHelper.init();
+ management = qpidManagementHelper.management;
+ });
+ });
+ });
});
</script>
</head>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/22b606e9/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 1436c74..af2b5fb 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
@@ -23,12 +23,15 @@ define(["dojo/query",
"dojox/html/entities",
"qpid/common/Structure",
"qpid/common/updater",
- "qpid/management/Management",
"qpid/common/util",
+ "qpid/management/Management",
+ "qpid/management/treeView",
+ "qpid/management/controller",
"dijit/Dialog",
"dojo/dom-class",
"dojo/dom",
- "dojo/domReady!"], function (query, registry, entities, Structure, updater, Management, util, Dialog, domClass, dom)
+ "dojo/domReady!"],
+ function (query, registry, entities, Structure, updater, util, Management, TreeView, controller, Dialog, domClass, dom)
{
var documentationUrl = null;
@@ -166,7 +169,7 @@ define(["dojo/query",
tabType: "dashboardBrowser"
});
},
- init: function (controller, TreeView)
+ init: function ()
{
this.controller = controller;
this.management = new Management("", util.xhrErrorHandler);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org