From c4826cac5417f3b1308f14aa1de9b426d1ae82be Mon Sep 17 00:00:00 2001
From: Scott Aslan <scottyaslan@gmail.com>
Date: Mon, 26 Sep 2016 21:51:29 -0400
Subject: [PATCH] [NIFI-1757] remove iframe from shell dialog to prevent
 reoccurring requests, update fill color and label config dialog content
 margins to fit into their respective dialogs. This closes #1069

---
 .../webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp     | 2 +-
 .../webapp/WEB-INF/partials/canvas/label-configuration.jsp   | 4 ++--
 .../main/webapp/js/nf/bulletin-board/nf-bulletin-board.js    | 2 +-
 .../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js   | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
index 6e7346f7f6..db6f66f78c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
@@ -17,7 +17,7 @@
 <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
 <div id="fill-color-dialog" class="hidden">
     <div class="dialog-content">
-        <div class="setting">
+        <div class="setting" style="margin-bottom: 0px;">
             <div class="setting-name">Color</div>
             <div class="setting-field">
                 <input type="text" id="fill-color" value="#FFFFFF"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
index 5e05914de0..61725d9080 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
@@ -17,13 +17,13 @@
 <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
 <div id="label-configuration" class="hidden medium-dialog">
     <div id="label-configuration-contents" class="dialog-content">
-        <div class="setting" style="margin-top: 5px;">
+        <div class="setting">
             <div class="setting-name">Label Value</div>
             <div class="setting-field">
                 <textarea cols="30" rows="4" id="label-value" class="setting-input"></textarea>
             </div>
         </div>
-        <div class="setting" style="margin-top: 5px; margin-bottom: 40px;">
+        <div class="setting">
             <div class="setting-name">Font Size</div>
             <div class="setting-field">
                 <div id="label-font-size"></div>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index 94fc0859d1..58d8f7933a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -196,7 +196,7 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) {
      */
     var poll = function () {
         // if the page is no longer open, stop polling
-        var isOpen = $('body').is(':visible');
+        var isOpen = $('#bulletin-board').is(':visible');
         if (!isOpen) {
             bulletinBoardCtrl.polling = false;
         }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
index 93cbfb3c6c..b5eaeb298f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
@@ -94,11 +94,10 @@ nf.Shell = (function () {
                     canUndock = true;
                 }
 
-                // remove the previous contents of the shell
-                shell.empty();
-
                 // register a new close handler
                 $('#shell-dialog').modal('setCloseHandler', function () {
+                    // remove the previous contents of the shell
+                    shell.empty();
                     deferred.resolve();
                 });