- Updating draggable usage for better consistency.
This commit is contained in:
Matt Gilman 2014-12-17 10:07:45 -05:00
parent 9c08118f57
commit ca872badae
3 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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);