From a8e1c775fd95cfb73ab5453a8e7ec7c1d3e03b98 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Wed, 19 Oct 2016 11:57:29 -0400 Subject: [PATCH] [NIFI-1459] add css translate3d to properties table editors in order to move the element along the z-axis of the 3D space and allow the scrollbars to properly be poistioned. This closes #1070 --- .../js/jquery/propertytable/jquery.propertytable.js | 12 +++++++++--- .../src/main/webapp/js/application.js | 6 ++++-- 2 files changed, 13 insertions(+), 5 deletions(-) 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 47231f0b21..246129c3df 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 @@ -77,7 +77,8 @@ 'background-color': 'rgb(255, 255, 255)', 'overflow': 'hidden', 'padding': '10px 20px', - 'cursor': 'move' + 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)' }).appendTo(container); // create the input field @@ -301,7 +302,8 @@ 'border-radius': '2px', 'box-shadow': 'rgba(0, 0, 0, 0.247059) 0px 2px 5px', 'background-color': 'rgb(255, 255, 255)', - 'cursor': 'move' + 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)' }).draggable({ cancel: 'input, textarea, pre, .nf-checkbox, .button, .' + editorClass, containment: 'parent' @@ -506,7 +508,8 @@ 'border-radius': '2px', 'box-shadow': 'rgba(0, 0, 0, 0.247059) 0px 2px 5px', 'background-color': 'rgb(255, 255, 255)', - 'cursor': 'move' + 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)' }).draggable({ cancel: '.button, .combo', containment: 'parent' @@ -723,6 +726,7 @@ 'box-shadow': 'rgba(0, 0, 0, 0.247059) 0px 2px 5px', 'background-color': 'rgb(255, 255, 255)', 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)', 'top': offset.top - 24, 'left': offset.left - 20 }).appendTo('body'); @@ -805,6 +809,7 @@ 'box-shadow': 'rgba(0, 0, 0, 0.247059) 0px 2px 5px', 'background-color': 'rgb(255, 255, 255)', 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)', 'top': offset.top - 22, 'left': offset.left - 43 }).draggable({ @@ -835,6 +840,7 @@ 'box-shadow': 'rgba(0, 0, 0, 0.247059) 0px 2px 5px', 'background-color': 'rgb(255, 255, 255)', 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)', 'top': offset.top - 26, 'left': offset.left - 20 }); 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 1963f3da8f..a7984d7733 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 @@ -1727,7 +1727,8 @@ var ua = { 'overflow': 'hidden', 'border-radius': '2px', 'box-shadow': 'rgba(0, 0, 0, 0.247059) 0px 2px 5px', - 'cursor': 'move' + 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)' }).draggable({ containment: 'parent' }).appendTo(container); @@ -1865,7 +1866,8 @@ var ua = { 'overflow': 'hidden', 'border-radius': '2px', 'box-shadow': 'rgba(0, 0, 0, 0.247059) 0px 2px 5px', - 'cursor': 'move' + 'cursor': 'move', + 'transform': 'translate3d(0px, 0px, 0px)' }).draggable({ cancel: 'input, textarea, pre, .button, div.' + editorClass, containment: 'parent'