Merge pull request #12 from jenkinsci/fix-log-placement

Fix log popup placement [JENKINS-33109]
jenkinsci · May 10, 2016 · 18898e7 · 18898e7
2 parents c5c9c33 + 1c67a90
commit 18898e7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/ui/src/main/js/view/stage-logs.js b/ui/src/main/js/view/stage-logs.js
@@ -44,6 +44,8 @@ exports.render = function (stageDescription, onElement) {
     onElement.on(clickNSEvent, function() {
         dialog.show('Stage Logs (' + stageDescription.name + ')', stageLogsDom, {
             classes: 'cbwf-stage-logs-dialog',
+            placement: 'window-visible-top',
+            onElement: onElement,
             width: dialogWidth,
             height: dialogHeight,
             onshow: function() {

diff --git a/ui/src/main/js/view/widgets/dialog/index.js b/ui/src/main/js/view/widgets/dialog/index.js
@@ -59,7 +59,9 @@ exports.show = function(title, body, options) {
     bodyEl.append(body);
 
     options.modal = true;
-    var popover = popoverWidget.newPopover(title, dialog, undefined, options);
+    // Undefined for the onElement makes it in the window center, otherwise it needs it for positioning
+    var popover = popoverWidget.newPopover(title, dialog, options.onElement, options);
+
     popover.show();
     if (options.onshow) {
         options.onshow();

diff --git a/ui/src/main/js/view/widgets/popover/index.js b/ui/src/main/js/view/widgets/popover/index.js
@@ -343,6 +343,20 @@ Popover.prototype.applyPlacement = function() {
         // top thn 1/4 the window height.
         topPlacement = Math.min(topPlacement, (winWidth / 4));
 
+        thisPopover.popover.css({
+            'top': topPlacement,
+            'left': leftPlacement
+        });
+    } else if (placement === 'window-visible-top') { // Centered at top of visible window
+        var winWidth = $(theWindow).width();
+        var popoverWidth = thisPopover.popover.width();
+        var leftPlacement = ((winWidth - popoverWidth) / 2);
+
+        var topPlacement = 20;  // For tests, which don't have a window
+        if (typeof window !== 'undefined') {
+            topPlacement = window.scrollY + 20;
+        }
+
         thisPopover.popover.css({
             'top': topPlacement,
             'left': leftPlacement

diff --git a/ui/src/test/js/util/formatters-spec.js b/ui/src/test/js/util/formatters-spec.js
@@ -17,9 +17,9 @@ describe("util/formatters-spec", function () {
         expect(formatters.memory(1)).toBe('1B');
         expect(formatters.memory(999)).toBe('999B');
         expect(formatters.memory(1999)).toBe('1.95KB');
-        expect(formatters.memory(1999999)).toBe('1.95MB');
-        expect(formatters.memory(1999999999)).toBe('1.95GB');
-        expect(formatters.memory(1999999999999)).toBe('1.95TB');
+        expect(formatters.memory(1999999)).toBe('1.91MB');
+        expect(formatters.memory(1999999999)).toBe('1.86GB');
+        expect(formatters.memory(1999999999999)).toBe('1.82TB');
     });
 
     it("- test_time_default", function () {