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 2014/12/17 16:37:47 UTC
[3/4] incubator-nifi git commit: NIFI-85: - Updating draggable usage
for better consistency.
NIFI-85:
- Updating draggable usage for better consistency.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ca872bad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ca872bad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ca872bad
Branch: refs/heads/develop
Commit: ca872badaea08987728a6496eeabf5091163f1ba
Parents: 9c08118
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Dec 17 10:07:45 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Dec 17 10:07:45 2014 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-label-configuration.js | 3 ++-
.../webapp/js/nf/canvas/nf-processor-property-combo-editor.js | 5 ++++-
.../webapp/js/nf/canvas/nf-processor-property-text-editor.js | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ca872bad/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js
index 4c8e555..aef6c74 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js
@@ -62,7 +62,8 @@ nf.LabelConfiguration = (function () {
// make the new property dialog draggable
$('#label-configuration').draggable({
- containment: 'parent'
+ containment: 'parent',
+ cancel: 'textarea, .button, .combo'
}).on('click', '#label-configuration-apply', apply).on('click', '#label-configuration-cancel', cancel);
// create the available sizes
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ca872bad/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js
index a7c488c..11cd7ff 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js
@@ -33,7 +33,10 @@ nf.ProcessorPropertyComboEditor = function (args) {
'border': '3px solid #365C6A',
'box-shadow': '4px 4px 6px rgba(0, 0, 0, 0.9)',
'cursor': 'move'
- }).draggable().appendTo(container);
+ }).draggable({
+ cancel: '.button, .combo',
+ containment: 'parent'
+ }).appendTo(container);
// identify the property descriptor - property descriptor is never null/undefined here... in order
// to use this editor, the property descriptor would have had to indicate a set of allowable values
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ca872bad/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js
index 7eb562a..8b65b3f 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js
@@ -44,6 +44,7 @@ nf.ProcessorPropertyTextEditor = function (args) {
'box-shadow': '4px 4px 6px rgba(0, 0, 0, 0.9)',
'cursor': 'move'
}).draggable({
+ cancel: '.button, textarea, .nf-checkbox',
containment: 'parent'
}).appendTo(container);