You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/10/05 12:15:02 UTC

nifi git commit: [NIFI-2864] Update when shell empties content. This closes #1096

Repository: nifi
Updated Branches:
  refs/heads/master 4dbdfea5d -> 44cc7e007


[NIFI-2864] Update when shell empties content. This closes #1096


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/44cc7e00
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/44cc7e00
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/44cc7e00

Branch: refs/heads/master
Commit: 44cc7e00728892a3025d7554ffd7df432b32b02e
Parents: 4dbdfea
Author: Scott Aslan <sc...@gmail.com>
Authored: Tue Oct 4 16:07:44 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Oct 5 08:14:15 2016 -0400

----------------------------------------------------------------------
 .../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/44cc7e00/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
----------------------------------------------------------------------
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 b5eaeb2..c51f03f 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
@@ -145,9 +145,6 @@ nf.Shell = (function () {
                 if (content.length) {
                     var shell = $('#shell');
 
-                    // remove the previous contents of the shell
-                    shell.empty();
-
                     // get the parent of the content and detach it
                     var parent = content.parent();
                     content.detach();
@@ -166,6 +163,9 @@ nf.Shell = (function () {
 
                         // detach the content and add it back to the parent
                         content.hide().detach().appendTo(parent);
+
+                        // remove the previous contents of the shell
+                        shell.empty();
                     });
 
                     // hide the undock button