nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject nifi git commit: [NIFI-1792] Clear the selected rule id when deleting the last rule in the list. Add scrollable styles when appropriate. Close popups when appropriate. This PR also adjusts the position of the table cell nfel and long text editors. This c
Date Thu, 06 Oct 2016 13:51:40 GMT
Repository: nifi
Updated Branches:
  refs/heads/master 3c673972e -> 8bd85e208


[NIFI-1792] Clear the selected rule id when deleting the last rule in the list. Add scrollable
styles when appropriate. Close popups when appropriate. This PR also adjusts the position
of the table cell nfel and long text editors. This closes #1099.


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

Branch: refs/heads/master
Commit: 8bd85e20853c44bbb33bcad2795bfb4ac8819e1a
Parents: 3c67397
Author: Scott Aslan <scottyaslan@gmail.com>
Authored: Wed Oct 5 16:17:32 2016 -0400
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Thu Oct 6 09:51:05 2016 -0400

----------------------------------------------------------------------
 .../propertytable/jquery.propertytable.js       |  6 +--
 .../src/main/webapp/css/main.css                |  5 ++-
 .../src/main/webapp/js/application.js           | 46 +++++++++++++++++---
 3 files changed, 44 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/8bd85e20/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 47a4497..47231f0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -1685,11 +1685,7 @@
                             }
                         });
 
-                        // make the new property dialog draggable
-                        newPropertyDialog.draggable({
-                            cancel: 'input, textarea, pre, .button, .' + editorClass,
-                            containment: 'body'
-                        }).on('click', 'div.new-property-ok', add).on('click', 'div.new-property-cancel',
cancel);
+                        newPropertyDialog.on('click', 'div.new-property-ok', add).on('click',
'div.new-property-cancel', cancel);
 
                         // build the control to open the new property dialog
                         var addProperty = $('<div class="add-property"></div>').appendTo(header);

http://git-wip-us.apache.org/repos/asf/nifi/blob/8bd85e20/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
index b5d315c..d1debc8 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
@@ -191,9 +191,10 @@ div.remove-rule {
 }
 
 #no-rule-selected-label {
-    clear: both;
-    height: 32px;
     line-height: 32px;
+    position: absolute;
+    left: 0px;
+    top: 26px;
 }
 
 div.large-label-container {

http://git-wip-us.apache.org/repos/asf/nifi/blob/8bd85e20/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/application.js
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/application.js
index 3f85f07..1963f3d 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/application.js
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/application.js
@@ -91,14 +91,30 @@ var ua = {
         // initialize the rule list
         ua.initRuleList();
 
+        var destroyEditors = function(){
+            if($('.slickgrid-nfel-editor').is(':visible') || $('.slickgrid-custom-long-text-editor').is(':visible')){
+
+                $('#selected-rule-actions').data('gridInstance').getEditController().cancelCurrentEdit();
+                $('#selected-rule-conditions').data('gridInstance').getEditController().cancelCurrentEdit();
+            }
+            if( $('#new-condition-dialog').is(':visible')){
+                $('#new-condition-dialog').modal('hide');
+            }
+            if( $('#new-action-dialog').is(':visible')){
+                $('#new-action-dialog').modal('hide');
+            }
+        };
+
         // button click for new rules
         $('#new-rule').on('click', function () {
+            destroyEditors();
             $('#new-rule-dialog').modal('show');
             $('#new-rule-name').focus();
         });
 
         // button click for new conditions/actions
         $('#new-condition').on('click', function () {
+            destroyEditors();
             var ruleId = $('#selected-rule-id').text();
 
             if (ruleId === '') {
@@ -114,6 +130,7 @@ var ua = {
             }
         });
         $('#new-action').on('click', function () {
+            destroyEditors();
             var ruleId = $('#selected-rule-id').text();
 
             if (ruleId === '') {
@@ -647,6 +664,7 @@ var ua = {
     initOkDialog: function () {
         $('#ok-dialog').modal({
             overlayBackground: false,
+            scrollableContentStyle: 'scrollable',
             buttons: [{
                     buttonText: 'Ok',
                     color: {
@@ -677,6 +695,7 @@ var ua = {
      */
     initYesNoDialog: function () {
         $('#yes-no-dialog').modal({
+            scrollableContentStyle: 'scrollable',
             overlayBackground: false
         });
     },
@@ -974,6 +993,8 @@ var ua = {
                     if (ruleList.is(':empty')) {
                         // update the rule list visibility
                         ua.hideRuleList();
+                        // clear the selected rule id
+                        $('#selected-rule-id').text('');
                     }
 
                     // clear the rule details
@@ -1665,7 +1686,7 @@ var ua = {
 
         // add an ok button that will remove the entire pop up
         var ok = $('<div class="button button-normal">Ok</div>').on('click',
function () {
-            cleaUp();
+            cleanUp();
         });
 
         $('<div></div>').css({
@@ -1698,7 +1719,7 @@ var ua = {
             var container = $('#update-attributes-content');
 
             // create the wrapper
-            wrapper = $('<div></div>').css({
+            wrapper = $('<div></div>').addClass('slickgrid-custom-long-text-editor').css({
                 'z-index': 100000,
                 'position': 'absolute',
                 'background': 'white',
@@ -1716,7 +1737,8 @@ var ua = {
                 'width': args.position.width + 'px',
                 'min-width': '202px',
                 'height': '80px',
-                'margin-bottom': '35px'
+                'margin-bottom': '35px',
+                'resize': 'both'
             }).on('keydown', scope.handleKeyDown).appendTo(wrapper);
 
             // create the button panel
@@ -1764,12 +1786,18 @@ var ua = {
         };
 
         this.show = function () {
+            if( $('#new-condition-dialog').is(':visible')){
+                $('#new-condition-dialog').modal('hide');
+            }
+            if( $('#new-action-dialog').is(':visible')){
+                $('#new-action-dialog').modal('hide');
+            }
             wrapper.show();
         };
 
         this.position = function (position) {
             wrapper.css({
-                'top': position.top - 5,
+                'top': position.top - 11,
                 'left': position.left - 5
             });
         };
@@ -1887,13 +1915,19 @@ var ua = {
         };
 
         this.show = function () {
+            if( $('#new-condition-dialog').is(':visible')){
+                $('#new-condition-dialog').modal('hide');
+            }
+            if( $('#new-action-dialog').is(':visible')){
+                $('#new-action-dialog').modal('hide');
+            }
             wrapper.show();
         };
 
         this.position = function (position) {
             wrapper.css({
-                'top': position.top - 5,
-                'left': position.left - 5
+                'top': position.top - 6,
+                'left': position.left - 25
             });
         };
 


Mime
View raw message