frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.16

Browse Source
This commit is contained in:
Nick O'Leary
2017-01-06 14:30:13 +00:00
committed by GitHub
parent e6de26736b 8916f6f829
commit e73216d4c1
27 changed files with 354 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/js/ui/common/typedInput.js
View File

@@ -14,9 +14,6 @@
* limitations under the License.
**/
(function($) {
var allOptions = {
msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
flow: {value:"flow",label:"flow.",validate:RED.utils.validatePropertyExpression},

4
editor/js/ui/palette-editor.js
View File

@@ -255,7 +255,9 @@ RED.palette.editor = (function() {
nodeEntry.removeButton.hide();
} else {
nodeEntry.enableButton.removeClass('disabled');
nodeEntry.removeButton.show();
if (moduleInfo.local) {
nodeEntry.removeButton.show();
}
if (activeTypeCount === 0) {
nodeEntry.enableButton.html(RED._('palette.editor.enableall'));
} else {