Repository: qpid-dispatch Updated Branches: refs/heads/master 00e4bbe6f -> 7952fbf41
DISPATCH-970 Fixed initial position of checkboxes on chords page Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/7952fbf4 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/7952fbf4 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/7952fbf4 Branch: refs/heads/master Commit: 7952fbf4122298417ce3dc96fa5030f1e8e69173 Parents: 00e4bbe Author: Ernest Allen <[email protected]> Authored: Fri Apr 20 08:19:29 2018 -0400 Committer: Ernest Allen <[email protected]> Committed: Fri Apr 20 08:19:29 2018 -0400 ---------------------------------------------------------------------- console/stand-alone/plugin/html/qdrChord.html | 3 +++ console/stand-alone/plugin/js/chord/qdrChord.js | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7952fbf4/console/stand-alone/plugin/html/qdrChord.html ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/html/qdrChord.html b/console/stand-alone/plugin/html/qdrChord.html index a1b055a..475bbe8 100644 --- a/console/stand-alone/plugin/html/qdrChord.html +++ b/console/stand-alone/plugin/html/qdrChord.html @@ -28,9 +28,11 @@ margin-right: 1em; padding-right: 1em; opacity: 0; + background-color: white; } #switches ul { list-style: none; + padding-left: 0; } #switches li { @@ -216,3 +218,4 @@ </ul> </div> </div> + <div ng-init="loaded=true"></div> http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7952fbf4/console/stand-alone/plugin/js/chord/qdrChord.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/chord/qdrChord.js b/console/stand-alone/plugin/js/chord/qdrChord.js index c5f7417..4e6b94f 100644 --- a/console/stand-alone/plugin/js/chord/qdrChord.js +++ b/console/stand-alone/plugin/js/chord/qdrChord.js @@ -184,19 +184,16 @@ var QDR = (function (QDR) { //startOver(); //}; //d3.select(window).on('resize.updatesvg', updateWindow); - let offBy = 6; let windowResized = function () { let legendPos = $('#legend').position(); let switches = $('#switches'); let outerWidth = switches.outerWidth(); - switches.css({left: (legendPos.left - outerWidth - offBy), opacity: 1}); - offBy = 0; + switches.css({left: (legendPos.left - outerWidth), opacity: 1}); }; window.addEventListener('resize', function () { - windowResized() + windowResized(); setTimeout(windowResized, 1); }); - $().ready(windowResized); // used for animation duration and the data refresh interval let transitionDuration = 1000; @@ -806,7 +803,11 @@ var QDR = (function (QDR) { }); // get the raw data and render the svg - chordData.getMatrix().then(render, function (e) { + chordData.getMatrix().then(function (matrix) { + // now that we have the routers and addresses, move the control switches and legend + $timeout(windowResized); + render(matrix); + }, function (e) { console.log(ERROR_RENDERING + e); }); // called periodically to refresh the data --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
