You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/09/25 06:50:12 UTC
qpid-broker-j git commit: QPID-7772: [Java Broker] Fix statistic
table heading rendering defect
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 0ce2ecd88 -> bd784a89b
QPID-7772: [Java Broker] Fix statistic table heading rendering defect
Mix-in column resizer.
Addressing some review comments from Lorenz Quack <qu...@gmail.com>.
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/bd784a89
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/bd784a89
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/bd784a89
Branch: refs/heads/master
Commit: bd784a89ba23d62a27c98c16b1462ada4d0bc760
Parents: 0ce2ecd
Author: Keith Wall <ke...@gmail.com>
Authored: Sat Sep 23 15:01:20 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Sat Sep 23 15:04:47 2017 +0100
----------------------------------------------------------------------
.../management-http/src/main/java/resources/images/minus.svg | 2 +-
.../main/java/resources/js/qpid/common/StatisticsWidget.js | 8 ++++++--
.../src/main/java/resources/js/qpid/management/Broker.js | 5 -----
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bd784a89/broker-plugins/management-http/src/main/java/resources/images/minus.svg
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/images/minus.svg b/broker-plugins/management-http/src/main/java/resources/images/minus.svg
index 239d1a5..ad40c98 100644
--- a/broker-plugins/management-http/src/main/java/resources/images/minus.svg
+++ b/broker-plugins/management-http/src/main/java/resources/images/minus.svg
@@ -20,7 +20,7 @@
~
-->
-<svg xmlns="http://www.w3.org/2000/svg" width="360" height="360" id="plus" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" width="360" height="360" id="minus" version="1.1">
<rect style="opacity:1;fill:#FF0000;fill-opacity:1;stroke:#FF0000;stroke-width:0;"
id="horizontal" width="360" height="100" x="0" y="130"/>
</svg>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bd784a89/broker-plugins/management-http/src/main/java/resources/js/qpid/common/StatisticsWidget.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/StatisticsWidget.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/StatisticsWidget.js
index 3bdd97f..194a199 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/StatisticsWidget.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/StatisticsWidget.js
@@ -32,6 +32,7 @@ define(["dojox/lang/functional/object",
'dstore/Trackable',
"dojox/html/entities",
"dgrid/OnDemandGrid",
+ "dgrid/extensions/ColumnResizer",
"dijit/_WidgetBase",
"dijit/Tooltip",
"dijit/registry",
@@ -52,7 +53,8 @@ define(["dojox/lang/functional/object",
Memory,
Trackable,
entities,
- Grid,
+ OnDemandGrid,
+ ColumnResizer,
_WidgetBase,
Tooltip,
registry,
@@ -130,6 +132,8 @@ define(["dojox/lang/functional/object",
highlightRow : function() {return false}
};
+ var Grid = declare([OnDemandGrid, ColumnResizer]);
+
this._msgBytePairCumulativeStatisticsGrid =
new Grid(lang.mixin(lang.clone(gridProps), {
collection: this._pairedStatsStore.filter({statisticType : "CUMULATIVE"})
@@ -202,7 +206,7 @@ define(["dojox/lang/functional/object",
this._msgBytePairPointInTimeStatisticsGrid,
this._otherPointInTimeStatisticsGrid];
- this.statisticsPane.on("toggle", lang.hitch(this, this.resize));
+ this.statisticsPane.on("show", lang.hitch(this, this.resize));
this.allStatsToggle.on("change", lang.hitch(this, this._onStatsToggleChange));
},
startup: function ()
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bd784a89/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index dd2292d..0649558 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -964,11 +964,6 @@ define(["dojo/parser",
});
that.brokerStatistics.placeAt(dom.byId("showBroker.statistics"));
that.brokerStatistics.startup();
- var brokerPane = registry.byId("showBrokerPane");
- connect.connect(brokerPane, "toggle", lang.hitch(this, function()
- {
- that.brokerStatistics.resize();
- }));
}
var virtualHostData = util.queryResultToObjects(data.virtualHosts);
var queryVirtualHostNodes = {};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org