You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2016/05/12 18:54:46 UTC
qpid-dispatch git commit: DISPATCH-326: Fix missing sliders on chart
edit dialog
Repository: qpid-dispatch
Updated Branches:
refs/heads/master eb7cdb959 -> b5b470e14
DISPATCH-326: Fix missing sliders on chart edit dialog
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/b5b470e1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/b5b470e1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/b5b470e1
Branch: refs/heads/master
Commit: b5b470e146df21b8deb32d3d061ca7882c13c401
Parents: eb7cdb9
Author: Ernest Allen <ea...@redhat.com>
Authored: Thu May 12 14:54:31 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Thu May 12 14:54:31 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/plugin/html/qdrCharts.html | 5 +-
.../src/main/webapp/plugin/js/dispatchPlugin.js | 3 -
.../src/main/webapp/plugin/js/qdrCharts.js | 75 +++++++++++---------
3 files changed, 46 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5b470e1/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html b/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
index 90df9b3..9f1319c 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
@@ -30,7 +30,7 @@
<label><input type="radio" ng-model="dialogChart.type" value="rate" /> Rate Chart</label>
<div class="dlg-slider" ng-show="dialogChart.type=='rate'">
<span>Rate Window: {{rateWindow}} second{{rateWindow > 1 ? "s" : ""}}</span>
- <div class="slider" ui-slider="slider.options" ng-model="rateWindow"></div>
+ <div id="rateSlider"></div>
</div>
<div style="clear:both;"> </div>
</tab>
@@ -47,7 +47,8 @@
<tab heading="Duration">
<legend>Chart duration</legend>
<div class="dlg-slider duration">
- <span>Show data for past {{dialogChart.visibleDuration}} minute{{dialogChart.visibleDuration > 1 ? "s" : ""}}</span> <div class="slider" ui-slider="duration.options" ng-model="dialogChart.visibleDuration"></div>
+ <span>Show data for past {{dialogChart.visibleDuration}} minute{{dialogChart.visibleDuration > 1 ? "s" : ""}}</span>
+ <div id="durationSlider"></div>
</div>
<div style="clear:both;"> </div>
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5b470e1/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index ce52092..0e71d2f 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -5,9 +5,6 @@
* The main entry point for the QDR module
*
*/
-$.getScript('https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js', function() {
- hawtioPluginLoader.addModule('ui.slider');
-});
var QDR = (function(QDR) {
/**
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5b470e1/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js b/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
index 02b1d85..ea29e63 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
@@ -223,34 +223,48 @@ var QDR = (function (QDR) {
dialog.close();
};
- // initialize the rateWindow slider
- $scope.slider = {
- 'options': {
- min: 1,
- max: 10,
- step: 1,
- tick: true,
- stop: function (event, ui) {
- $scope.dialogChart.rateWindow = ui.value * 1000;
- if (dialogSvgChart)
- dialogSvgChart.tick($scope.svgDivId);
- }
- }
- };
-
- $scope.visibleDuration =
- $scope.duration = {
- 'options': {
- min: 1,
- max: 10,
- step: 1,
- tick: true,
- stop: function (event, ui) {
- if (dialogSvgChart)
- dialogSvgChart.tick($scope.svgDivId);
- }
- }
- };
+ var initRateSlider = function () {
+ if (document.getElementById('rateSlider')) {
+ $( "#rateSlider" ).slider({
+ value: $scope.rateWindow,
+ min: 1,
+ max: 10,
+ step: 1,
+ slide: function( event, ui ) {
+ $scope.rateWindow = ui.value;
+ $scope.dialogChart.rateWindow = ui.value * 1000;
+ $scope.$apply();
+ if (dialogSvgChart)
+ dialogSvgChart.tick($scope.svgDivId);
+ }
+ });
+
+ } else {
+ setTimeout(initRateSlider, 100)
+ }
+ }
+ initRateSlider();
+
+ var initDurationSlider = function () {
+ if (document.getElementById('durationSlider')) {
+ $( "#durationSlider" ).slider({
+ value: $scope.dialogChart.visibleDuration,
+ min: 1,
+ max: 10,
+ step: 1,
+ slide: function( event, ui ) {
+ $scope.visibleDuration = $scope.dialogChart.visibleDuration = ui.value;
+ $scope.$apply();
+ if (dialogSvgChart)
+ dialogSvgChart.tick($scope.svgDivId);
+ }
+ });
+
+ } else {
+ setTimeout(initDurationSlider, 100)
+ }
+ }
+ initDurationSlider();
// handle the Apply button click
// update the dashboard chart's properties
@@ -258,7 +272,7 @@ var QDR = (function (QDR) {
$scope.chart.areaColor = $scope.dialogChart.areaColor;
$scope.chart.lineColor = $scope.dialogChart.lineColor;
$scope.chart.type = $scope.dialogChart.type;
- $scope.chart.rateWindow = $scope.dialogChart.rateWindow;
+ $scope.chart.rateWindow = $scope.rateWindow * 1000;
$scope.chart.title($scope.dialogChart.title());
$scope.chart.visibleDuration = $scope.dialogChart.visibleDuration;
QDRChartService.saveCharts();
@@ -299,6 +313,3 @@ var QDR = (function (QDR) {
return QDR;
}(QDR || {}));
-
-// "QDRBrouteraddressrouteraddressLqdrouterdeliveriesTransit_0_0"
-// "QDRBrouteraddressrouteraddressLqdrouterdeliveriesTransit_1_0"
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org