",{id:"red-ui-actionList",class:"red-ui-search"}).appendTo("#red-ui-main-container");
+ var searchDiv = $("
",{class:"red-ui-search-container"}).appendTo(dialog);
+ searchInput = $('').appendTo(searchDiv).searchBox({
+ change: function() {
+ filterTerm = $(this).val().trim();
+ filterTerms = filterTerm.split(" ");
+ searchResults.editableList('filter');
+ searchResults.find("li.selected").removeClass("selected");
+ var children = searchResults.children(":visible");
+ if (children.length) {
+ $(children[0]).addClass('selected');
+ }
+ }
+ });
+
+ searchInput.on('keydown',function(evt) {
+ var selectedChild;
+ if (evt.keyCode === 40) {
+ // Down
+ selectedChild = searchResults.find("li.selected");
+ if (!selectedChild.length) {
+ var children = searchResults.children(":visible");
+ if (children.length) {
+ $(children[0]).addClass('selected');
+ }
+ } else {
+ var nextChild = selectedChild.nextAll(":visible").first();
+ if (nextChild.length) {
+ selectedChild.removeClass('selected');
+ nextChild.addClass('selected');
+ }
+ }
+ ensureSelectedIsVisible();
+ evt.preventDefault();
+ } else if (evt.keyCode === 38) {
+ // Up
+ selectedChild = searchResults.find("li.selected");
+ var nextChild = selectedChild.prevAll(":visible").first();
+ if (nextChild.length) {
+ selectedChild.removeClass('selected');
+ nextChild.addClass('selected');
+ }
+ ensureSelectedIsVisible();
+ evt.preventDefault();
+ } else if (evt.keyCode === 13) {
+ // Enter
+ selectedChild = searchResults.find("li.selected");
+ selectCommand(searchResults.editableList('getItem',selectedChild));
+ }
+ });
+ searchInput.i18n();
+
+ var searchResultsDiv = $("
",{class:"red-ui-search-results-container"}).appendTo(dialog);
+ searchResults = $('
- ',{style:"position: absolute;top: 5px;bottom: 5px;left: 5px;right: 5px;"}).appendTo(searchResultsDiv).editableList({
+ addButton: false,
+ addItem: function(container,i,action) {
+ if (action.id === undefined) {
+ $('
- '+
- ''+
- ''+
- '
'+
+ $('- '+ + ''+ + ''+ + '
').prependTo(".header-toolbar"); - RED.menu.init({id:"btn-deploy-options", + ''+ + '
'+
''+RED._("deploy.deploy")+''+
''+
- ''+
- ''+
- ' ').prependTo(".red-ui-header-toolbar");
+ RED.menu.init({id:"red-ui-header-button-deploy-options",
options: [
- {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
- {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
- {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
+ {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
+ {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+ {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
null,
- {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.png",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
+ {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
]
});
} else if (type == "simple") {
var label = options.label || RED._("deploy.deploy");
- var icon = 'red/images/deploy-full-o.png';
+ var icon = 'red/images/deploy-full-o.svg';
if (options.hasOwnProperty('icon')) {
icon = options.icon;
}
- $(' - '+ + ''+ + ''+ + '
- '+
- ''+
- ''+
- (icon?'
':'')+ + $('
- '+ + ''+ + ''+ + (icon?'
').prependTo(".header-toolbar"); + '').prependTo(".red-ui-header-toolbar");
}
- $('#btn-deploy').click(function(event) {
+ $('#red-ui-header-button-deploy').on("click", function(event) {
event.preventDefault();
save();
});
RED.actions.add("core:deploy-flows",save);
- RED.actions.add("core:restart-flows",restart);
+ if (type === "default") {
+ RED.actions.add("core:restart-flows",restart);
+ RED.actions.add("core:set-deploy-type-to-full",function() { RED.menu.setSelected("deploymenu-item-full",true);});
+ RED.actions.add("core:set-deploy-type-to-modified-flows",function() { RED.menu.setSelected("deploymenu-item-flow",true); });
+ RED.actions.add("core:set-deploy-type-to-modified-nodes",function() { RED.menu.setSelected("deploymenu-item-node",true); });
+ }
+
RED.events.on('nodes:change',function(state) {
@@ -107,10 +113,10 @@ RED.deploy = (function() {
window.onbeforeunload = function() {
return RED._("deploy.confirm.undeployedChanges");
}
- $("#btn-deploy").removeClass("disabled");
+ $("#red-ui-header-button-deploy").removeClass("disabled");
} else {
window.onbeforeunload = null;
- $("#btn-deploy").addClass("disabled");
+ $("#red-ui-header-button-deploy").addClass("disabled");
}
});
@@ -176,14 +182,14 @@ RED.deploy = (function() {
function resolveConflict(currentNodes, activeDeploy) {
var message = $(' - '+ + ''+ + ''+ + (icon?'
- '+cropList(unknownNodes).map(function(n) { return sanitize(n) }).join("
- ")+"
- '+cropList(unknownNodes).map(function(n) { return sanitize(n) }).join("
- ")+"
- '+cropList(invalidNodes.map(function(A) { return sanitize( (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")")})).join("
- ")+"
- '+cropList(invalidNodes.map(function(A) { return sanitize( (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")")})).join("
- ")+"
',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
+ } else {
+ var div = $('',{href:'#',class:"red-ui-search-result"}).appendTo(container);
+ var contentDiv = $('
',{class:"red-ui-search-result-action"}).appendTo(div);
+
+
+ $('
').text(action.label).appendTo(contentDiv);
+ // $('
',{class:"red-ui-search-result-node-type"}).text(node.type).appendTo(contentDiv);
+ // $('
',{class:"red-ui-search-result-node-id"}).text(node.id).appendTo(contentDiv);
+ if (action.key) {
+ $('').appendTo(message);
+ var code = $('
');
if (size !== "default") {
div.addClass("red-ui-popover-size-"+size);
@@ -122,7 +127,10 @@ RED.popover = (function() {
}
}
div.addClass('red-ui-popover-'+d).css({top: top, left: left});
-
+ if (existingPopover) {
+ existingPopover.close(true);
+ }
+ target.data("red-ui-popover",res)
if (instant) {
div.show();
} else {
@@ -131,7 +139,7 @@ RED.popover = (function() {
}
}
var closePopup = function(instant) {
- $(document).off('mousedown.modal-popover-close');
+ $(document).off('mousedown.red-ui-popover');
if (!active) {
if (div) {
if (instant) {
@@ -142,6 +150,7 @@ RED.popover = (function() {
});
}
div = null;
+ target.removeData("red-ui-popover",res)
}
}
}
@@ -162,7 +171,7 @@ RED.popover = (function() {
}
});
} else if (trigger === 'click') {
- target.click(function(e) {
+ target.on("click", function(e) {
e.preventDefault();
e.stopPropagation();
active = !active;
@@ -185,7 +194,7 @@ RED.popover = (function() {
}
} else if (trigger === 'modal') {
- $(document).on('mousedown.modal-popover-close', function (event) {
+ $(document).on('mousedown.red-ui-popover', function (event) {
var target = event.target;
while (target.nodeName !== 'BODY' && target !== div[0]) {
target = target.parentElement;
@@ -236,6 +245,7 @@ RED.popover = (function() {
}
}
return RED.popover.create({
+ tooltip: true,
target:target,
trigger: "hover",
size: "small",
@@ -243,6 +253,71 @@ RED.popover = (function() {
content: label,
delay: { show: 750, hide: 50 }
});
+ },
+ panel: function(content) {
+ var panel = $('');
+ panel.css({ display: "none" });
+ panel.appendTo(document.body);
+ content.appendTo(panel);
+ var closeCallback;
+
+ function hide() {
+ $(document).off("mousedown.red-ui-popover-panel-close");
+ panel.hide();
+ panel.css({
+ height: "auto"
+ });
+ panel.remove();
+ }
+ function show(options) {
+ var closeCallback = options.onclose;
+ var target = options.target;
+ var align = options.align || "left";
+
+ var pos = target.offset();
+ var targetWidth = target.width();
+ var targetHeight = target.height();
+ var panelHeight = panel.height();
+ var panelWidth = panel.width();
+
+ var top = (targetHeight+pos.top);
+ if (top+panelHeight > $(window).height()) {
+ top -= (top+panelHeight)-$(window).height() + 5;
+ }
+ if (top < 0) {
+ panelHeight.height(panelHeight+top)
+ top = 0;
+ }
+ if (align === "left") {
+ panel.css({
+ top: top+"px",
+ left: (pos.left)+"px",
+ });
+ } else if(align === "right") {
+ panel.css({
+ top: top+"px",
+ left: (pos.left-panelWidth)+"px",
+ });
+ }
+ panel.slideDown(100);
+
+ $(document).on("mousedown.red-ui-popover-panel-close", function(event) {
+ if(!$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
+ if (closeCallback) {
+ closeCallback();
+ }
+ hide();
+ }
+ // if ($(event.target).closest(target).length) {
+ // event.preventDefault();
+ // }
+ })
+ }
+ return {
+ container: panel,
+ show:show,
+ hide:hide
+ }
}
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
index 1c6aad8d2..214668485 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
@@ -35,6 +35,7 @@
this.currentTimeout = null;
this.lastSent = "";
this.element.val("");
+ this.element.addClass("red-ui-searchBox-input");
this.uiContainer = this.element.wrap("',{class:"red-ui-search-result-action-key"}).html(RED.keyboard.formatKey(action.key)).appendTo(contentDiv);
+ }
+ div.on("click", function(evt) {
+ evt.preventDefault();
+ selectCommand(action);
+ });
+ }
+ },
+ scrollOnAdd: false,
+ filter: function(item) {
+ if (filterTerm !== "") {
+ var pos=0;
+ for (var i=0;i -1) {
+ pos = j;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
+ return true;
+ }
+ });
+
+ }
+
+ function selectCommand(command) {
+ hide();
+ if (command) {
+ RED.actions.invoke(command.id);
+ }
+ }
+
+ function show(v) {
+ if (disabled) {
+ return;
+ }
+ if (!visible) {
+ previousActiveElement = document.activeElement;
+ RED.keyboard.add("*","escape",function(){hide()});
+ $("#red-ui-header-shade").show();
+ $("#red-ui-editor-shade").show();
+ $("#red-ui-palette-shade").show();
+ $("#red-ui-sidebar-shade").show();
+ $("#red-ui-sidebar-separator").hide();
+ if (dialog === null) {
+ createDialog();
+ }
+ dialog.slideDown(300);
+ searchInput.searchBox('value',v)
+ searchResults.editableList('empty');
+ results = [];
+ var actions = RED.actions.list();
+ actions.sort(function(A,B) {
+ return A.id.localeCompare(B.id);
+ });
+ actions.forEach(function(action) {
+ action.label = action.id.replace(/:/,": ").replace(/-/g," ").replace(/(^| )./g,function() { return arguments[0].toUpperCase()});
+ action._label = action.label.toLowerCase();
+ searchResults.editableList('addItem',action)
+ })
+ RED.events.emit("actionList:open");
+ visible = true;
+ }
+ searchInput.trigger("focus");
+ var children = searchResults.children(":visible");
+ if (children.length) {
+ $(children[0]).addClass('selected');
+ }
+ }
+
+ function hide() {
+ if (visible) {
+ RED.keyboard.remove("escape");
+ visible = false;
+ $("#red-ui-header-shade").hide();
+ $("#red-ui-editor-shade").hide();
+ $("#red-ui-palette-shade").hide();
+ $("#red-ui-sidebar-shade").hide();
+ $("#red-ui-sidebar-separator").show();
+ if (dialog !== null) {
+ dialog.slideUp(200,function() {
+ searchInput.searchBox('value','');
+ });
+ }
+ RED.events.emit("actionList:close");
+ if (previousActiveElement) {
+ $(previousActiveElement).trigger("focus");
+ previousActiveElement = null;
+ }
+ }
+ }
+
+ function init() {
+ RED.actions.add("core:show-action-list",show);
+
+ RED.events.on("editor:open",function() { disabled = true; });
+ RED.events.on("editor:close",function() { disabled = false; });
+ RED.events.on("search:open",function() { disabled = true; });
+ RED.events.on("search:close",function() { disabled = false; });
+ RED.events.on("type-search:open",function() { disabled = true; });
+ RED.events.on("type-search:close",function() { disabled = false; });
+
+ $("#red-ui-header-shade").on('mousedown',hide);
+ $("#red-ui-editor-shade").on('mousedown',hide);
+ $("#red-ui-palette-shade").on('mousedown',hide);
+ $("#red-ui-sidebar-shade").on('mousedown',hide);
+ }
+
+ return {
+ init: init,
+ show: show,
+ hide: hide
+ };
+
+})();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index 97addf5c5..cdff62919 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -24,38 +24,38 @@ RED.clipboard = (function() {
var disabled = false;
var popover;
var currentPopoverError;
+ var activeTab;
+ var libraryBrowser;
+ var examplesBrowser;
function setupDialogs() {
- dialog = $('')
- .appendTo("body")
+ dialog = $('')
+ .appendTo("#red-ui-editor")
.dialog({
modal: true,
autoOpen: false,
- width: 500,
+ width: 700,
resizable: false,
+ classes: {
+ "ui-dialog": "red-ui-editor-dialog",
+ "ui-dialog-titlebar-close": "hide",
+ "ui-widget-overlay": "red-ui-editor-dialog"
+ },
buttons: [
{
- id: "clipboard-dialog-cancel",
+ id: "red-ui-clipboard-dialog-cancel",
text: RED._("common.label.cancel"),
click: function() {
$( this ).dialog( "close" );
}
},
{
- id: "clipboard-dialog-close",
- class: "primary",
- text: RED._("common.label.close"),
- click: function() {
- $( this ).dialog( "close" );
- }
- },
- {
- id: "clipboard-dialog-download",
+ id: "red-ui-clipboard-dialog-download",
class: "primary",
text: RED._("clipboard.download"),
click: function() {
var element = document.createElement('a');
- element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent($("#clipboard-export").val()));
+ element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent($("#red-ui-clipboard-dialog-export-text").val()));
element.setAttribute('download', "flows.json");
element.style.display = 'none';
document.body.appendChild(element);
@@ -65,30 +65,100 @@ RED.clipboard = (function() {
}
},
{
- id: "clipboard-dialog-copy",
+ id: "red-ui-clipboard-dialog-export",
class: "primary",
text: RED._("clipboard.export.copy"),
click: function() {
- $("#clipboard-export").select();
- document.execCommand("copy");
- document.getSelection().removeAllRanges();
- RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
- $( this ).dialog( "close" );
+ if (activeTab === "red-ui-clipboard-dialog-export-tab-clipboard") {
+ $("#red-ui-clipboard-dialog-export-text").select();
+ document.execCommand("copy");
+ document.getSelection().removeAllRanges();
+ RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
+ $( this ).dialog( "close" );
+ } else {
+ var flowToExport = $("#red-ui-clipboard-dialog-export-text").val();
+ var selectedPath = libraryBrowser.getSelected();
+ if (!selectedPath.children) {
+ selectedPath = selectedPath.parent;
+ }
+ var filename = $("#red-ui-clipboard-dialog-tab-library-name").val().trim();
+ var saveFlow = function() {
+ $.ajax({
+ url:'library/'+selectedPath.library+'/'+selectedPath.type+'/'+selectedPath.path + filename,
+ type: "POST",
+ data: flowToExport,
+ contentType: "application/json; charset=utf-8"
+ }).done(function() {
+ $(dialog).dialog( "close" );
+ RED.notify(RED._("library.exportedToLibrary"),"success");
+ }).fail(function(xhr,textStatus,err) {
+ if (xhr.status === 401) {
+ RED.notify(RED._("library.saveFailed",{message:RED._("user.notAuthorized")}),"error");
+ } else {
+ RED.notify(RED._("library.saveFailed",{message:xhr.responseText}),"error");
+ }
+ });
+ }
+ if (selectedPath.children) {
+ var exists = false;
+ selectedPath.children.forEach(function(f) {
+ if (f.label === filename) {
+ exists = true;
+ }
+ });
+ if (exists) {
+ dialog.dialog("close");
+ var notification = RED.notify(RED._("clipboard.export.exists",{file:RED.utils.sanitize(filename)}),{
+ type: "warning",
+ fixed: true,
+ buttons: [{
+ text: RED._("common.label.cancel"),
+ click: function() {
+ notification.hideNotification()
+ dialog.dialog( "open" );
+ }
+ },{
+ text: RED._("clipboard.export.overwrite"),
+ click: function() {
+ notification.hideNotification()
+ saveFlow();
+ }
+ }]
+ });
+ } else {
+ saveFlow();
+ }
+ } else {
+ saveFlow();
+ }
+ }
}
},
{
- id: "clipboard-dialog-ok",
+ id: "red-ui-clipboard-dialog-ok",
class: "primary",
text: RED._("common.label.import"),
click: function() {
- RED.view.importNodes($("#clipboard-import").val(),$("#import-tab > a.selected").attr('id') === 'import-tab-new');
+ var addNewFlow = ($("#red-ui-clipboard-dialog-import-opt > a.selected").attr('id') === 'red-ui-clipboard-dialog-import-opt-new');
+ if (activeTab === "red-ui-clipboard-dialog-import-tab-clipboard") {
+ RED.view.importNodes($("#red-ui-clipboard-dialog-import-text").val(),addNewFlow);
+ } else {
+ var selectedPath;
+ if (activeTab === "red-ui-clipboard-dialog-import-tab-library") {
+ selectedPath = libraryBrowser.getSelected();
+ } else {
+ selectedPath = examplesBrowser.getSelected();
+ }
+ if (selectedPath.path) {
+ $.get('library/'+selectedPath.library+'/'+selectedPath.type+'/'+selectedPath.path, function(data) {
+ RED.view.importNodes(data,addNewFlow);
+ });
+ }
+ }
$( this ).dialog( "close" );
}
}
],
- open: function(e) {
- $(this).parent().find(".ui-dialog-titlebar-close").hide();
- },
close: function(e) {
if (popover) {
popover.close(true);
@@ -101,152 +171,281 @@ RED.clipboard = (function() {
exportNodesDialog =
''+
- '').appendTo(message);
- var code = $('
').text(errString);
+ var errorPos;
+ // Chrome error messages
+ var m = /at position (\d+)/i.exec(errString);
+ if (m) {
+ errorPos = parseInt(m[1]);
+ } else {
+ // Firefox error messages
+ m = /at line (\d+) column (\d+)/i.exec(errString);
+ if (m) {
+ var line = parseInt(m[1])-1;
+ var col = parseInt(m[2])-1;
+ var lines = v.split("\n");
+ errorPos = 0;
+ for (var i=0;i'+
- ''+
- '
'+
- '';
+ ''+
+ '
'
+ ;
+
importNodesDialog =
- ''+
+ '
'+
+ ''+
+ ''+
- ' '+
- ''+
+ '
').text(errString);
- var errorPos;
- // Chrome error messages
- var m = /at position (\d+)/i.exec(errString);
- if (m) {
- errorPos = parseInt(m[1]);
- } else {
- // Firefox error messages
- m = /at line (\d+) column (\d+)/i.exec(errString);
- if (m) {
- var line = parseInt(m[1])-1;
- var col = parseInt(m[2])-1;
- var lines = v.split("\n");
- errorPos = 0;
- for (var i=0;i'+
+ '
'+
''+
+ '
'+
+ ''+
''+
- ''+
- '
'+
- '';
+
}
- var validateImportTimeout;
-
- function validateImport() {
- if (validateImportTimeout) {
- clearTimeout(validateImportTimeout);
+ var validateExportFilenameTimeout
+ function validateExportFilename() {
+ if (validateExportFilenameTimeout) {
+ clearTimeout(validateExportFilenameTimeout);
}
- validateImportTimeout = setTimeout(function() {
- var importInput = $("#clipboard-import");
- var v = importInput.val().trim();
- if (v === "") {
- popover.close(true);
- currentPopoverError = null;
- importInput.removeClass("input-error");
- $("#clipboard-dialog-ok").button("disable");
- return;
- }
- try {
- if (!/^\[[\s\S]*\]$/m.test(v)) {
- throw new Error(RED._("clipboard.import.errors.notArray"));
- }
- var res = JSON.parse(v);
- for (var i=0;i').appendTo(parseError);
- $('').text(v.substring(errorPos-12,errorPos)).appendTo(code)
- $('').text(v.charAt(errorPos)).appendTo(code);
- $('').text(v.substring(errorPos+1,errorPos+12)).appendTo(code);
- }
- popover.close(true).setContent(message).open();
- currentPopoverError = errString;
- }
- } else {
- currentPopoverError = null;
- }
- $("#clipboard-dialog-ok").button("disable");
+ validateExportFilenameTimeout = setTimeout(function() {
+ var filenameInput = $("#red-ui-clipboard-dialog-tab-library-name");
+ var filename = filenameInput.val().trim();
+ var valid = filename.length > 0 && !/[\/\\]/.test(filename);
+ if (valid) {
+ filenameInput.removeClass("input-error");
+ $("#red-ui-clipboard-dialog-export").button("enable");
+ } else {
+ filenameInput.addClass("input-error");
+ $("#red-ui-clipboard-dialog-export").button("disable");
}
},100);
}
- function importNodes() {
+ var validateImportTimeout;
+ function validateImport() {
+ if (activeTab === "red-ui-clipboard-dialog-import-tab-clipboard") {
+ if (validateImportTimeout) {
+ clearTimeout(validateImportTimeout);
+ }
+ validateImportTimeout = setTimeout(function() {
+ var importInput = $("#red-ui-clipboard-dialog-import-text");
+ var v = importInput.val().trim();
+ if (v === "") {
+ popover.close(true);
+ currentPopoverError = null;
+ importInput.removeClass("input-error");
+ $("#red-ui-clipboard-dialog-ok").button("disable");
+ return;
+ }
+ try {
+ if (!/^\[[\s\S]*\]$/m.test(v)) {
+ throw new Error(RED._("clipboard.import.errors.notArray"));
+ }
+ var res = JSON.parse(v);
+ for (var i=0;i').appendTo(parseError);
+ $('').text(v.substring(errorPos-12,errorPos)).appendTo(code)
+ $('').text(v.charAt(errorPos)).appendTo(code);
+ $('').text(v.substring(errorPos+1,errorPos+12)).appendTo(code);
+ }
+ popover.close(true).setContent(message).open();
+ currentPopoverError = errString;
+ }
+ } else {
+ currentPopoverError = null;
+ }
+ $("#red-ui-clipboard-dialog-ok").button("disable");
+ }
+ },100);
+ } else {
+ var file = libraryBrowser.getSelected();
+ if (file && file.label && !file.children) {
+ $("#red-ui-clipboard-dialog-ok").button("enable");
+ } else {
+ $("#red-ui-clipboard-dialog-ok").button("disable");
+ }
+ }
+ }
+
+ function importNodes(mode) {
if (disabled) {
return;
}
+ mode = mode || "clipboard";
+
dialogContainer.empty();
dialogContainer.append($(importNodesDialog));
+
+ var tabs = RED.tabs.create({
+ id: "red-ui-clipboard-dialog-import-tabs",
+ vertical: true,
+ onchange: function(tab) {
+ $("#red-ui-clipboard-dialog-import-tabs-content").children().hide();
+ $("#" + tab.id).show();
+ activeTab = tab.id;
+ if (popover) {
+ popover.close(true);
+ currentPopoverError = null;
+ }
+ if (tab.id === "red-ui-clipboard-dialog-import-tab-clipboard") {
+ $("#red-ui-clipboard-dialog-import-text").trigger("focus");
+ } else {
+ libraryBrowser.focus();
+ }
+ validateImport();
+ }
+ });
+ tabs.addTab({
+ id: "red-ui-clipboard-dialog-import-tab-clipboard",
+ label: RED._("clipboard.clipboard")
+ });
+ tabs.addTab({
+ id: "red-ui-clipboard-dialog-import-tab-library",
+ label: RED._("library.library")
+ });
+ tabs.addTab({
+ id: "red-ui-clipboard-dialog-import-tab-examples",
+ label: RED._("library.types.examples")
+ });
+
+ $("#red-ui-clipboard-dialog-tab-library-name").on("keyup", validateExportFilename);
+ $("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
+ $("#red-ui-clipboard-dialog-export").button("enable");
+
+ libraryBrowser = RED.library.createBrowser({
+ container: $("#red-ui-clipboard-dialog-import-tab-library"),
+ onselect: function(file) {
+ if (file && file.label && !file.children) {
+ $("#red-ui-clipboard-dialog-ok").button("enable");
+ } else {
+ $("#red-ui-clipboard-dialog-ok").button("disable");
+ }
+ },
+ onconfirm: function(item) {
+ if (item && item.label && !item.children) {
+ $("#red-ui-clipboard-dialog-ok").trigger("click");
+ }
+ }
+ })
+ loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));
+
+ examplesBrowser = RED.library.createBrowser({
+ container: $("#red-ui-clipboard-dialog-import-tab-examples"),
+ onselect: function(file) {
+ if (file && file.label && !file.children) {
+ $("#red-ui-clipboard-dialog-ok").button("enable");
+ } else {
+ $("#red-ui-clipboard-dialog-ok").button("disable");
+ }
+ },
+ onconfirm: function(item) {
+ if (item && item.label && !item.children) {
+ $("#red-ui-clipboard-dialog-ok").trigger("click");
+ }
+ }
+ })
+ loadFlowLibrary(examplesBrowser,"_examples_",RED._("library.types.examples"));
+
+
dialogContainer.i18n();
- $("#clipboard-dialog-ok").show();
- $("#clipboard-dialog-cancel").show();
- $("#clipboard-dialog-close").hide();
- $("#clipboard-dialog-copy").hide();
- $("#clipboard-dialog-download").hide();
- $("#clipboard-dialog-ok").button("disable");
- $("#clipboard-import").keyup(validateImport);
- $("#clipboard-import").on('paste',function() { setTimeout(validateImport,10)});
+ $("#red-ui-clipboard-dialog-ok").show();
+ $("#red-ui-clipboard-dialog-cancel").show();
+ $("#red-ui-clipboard-dialog-export").hide();
+ $("#red-ui-clipboard-dialog-download").hide();
+ $("#red-ui-clipboard-dialog-ok").button("disable");
+ $("#red-ui-clipboard-dialog-import-text").on("keyup", validateImport);
+ $("#red-ui-clipboard-dialog-import-text").on('paste',function() { setTimeout(validateImport,10)});
- $("#import-tab > a").click(function(evt) {
+ $("#red-ui-clipboard-dialog-import-opt > a").on("click", function(evt) {
evt.preventDefault();
if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
return;
@@ -255,66 +454,122 @@ RED.clipboard = (function() {
$(this).addClass('selected');
});
- $("#import-file-upload").change(function() {
+ $("#red-ui-clipboard-dialog-import-file-upload").on("change", function() {
var fileReader = new FileReader();
fileReader.onload = function () {
- $("#clipboard-import").val(fileReader.result);
+ $("#red-ui-clipboard-dialog-import-text").val(fileReader.result);
validateImport();
};
fileReader.readAsText($(this).prop('files')[0]);
})
- $("#import-file-upload-btn").click(function(evt) {
+ $("#red-ui-clipboard-dialog-import-file-upload-btn").on("click", function(evt) {
evt.preventDefault();
- $("#import-file-upload").click();
+ $("#red-ui-clipboard-dialog-import-file-upload").trigger("click");
})
+ tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
+ if (mode === 'clipboard') {
+ setTimeout(function() {
+ $("#red-ui-clipboard-dialog-import-text").trigger("focus");
+ },100)
+ }
+
+
dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
popover = RED.popover.create({
- target: $("#clipboard-import"),
+ target: $("#red-ui-clipboard-dialog-import-text"),
trigger: "manual",
direction: "bottom",
content: ""
});
}
- function exportNodes() {
+ function exportNodes(mode) {
if (disabled) {
return;
}
+ mode = mode || "clipboard";
+
dialogContainer.empty();
dialogContainer.append($(exportNodesDialog));
- dialogContainer.i18n();
- var format = RED.settings.flowFilePretty ? "export-format-full" : "export-format-mini";
- $("#export-format-group > a").click(function(evt) {
+ var tabs = RED.tabs.create({
+ id: "red-ui-clipboard-dialog-export-tabs",
+ vertical: true,
+ onchange: function(tab) {
+ $("#red-ui-clipboard-dialog-export-tabs-content").children().hide();
+ $("#" + tab.id).show();
+ activeTab = tab.id;
+ if (tab.id === "red-ui-clipboard-dialog-export-tab-clipboard") {
+ $("#red-ui-clipboard-dialog-export").button("option","label", RED._("clipboard.export.copy"))
+ $("#red-ui-clipboard-dialog-download").show();
+ } else {
+ $("#red-ui-clipboard-dialog-export").button("option","label", RED._("clipboard.export.export"))
+ $("#red-ui-clipboard-dialog-download").hide();
+ libraryBrowser.focus();
+ }
+
+ }
+ });
+ tabs.addTab({
+ id: "red-ui-clipboard-dialog-export-tab-clipboard",
+ label: RED._("clipboard.clipboard")
+ });
+ tabs.addTab({
+ id: "red-ui-clipboard-dialog-export-tab-library",
+ label: RED._("library.library")
+ });
+
+ $("#red-ui-clipboard-dialog-tab-library-name").on("keyup", validateExportFilename);
+ $("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
+ $("#red-ui-clipboard-dialog-export").button("enable");
+
+ libraryBrowser = RED.library.createBrowser({
+ container: $("#red-ui-clipboard-dialog-export-tab-library-browser"),
+ folderTools: true,
+ onselect: function(file) {
+ if (file && file.label && !file.children) {
+ $("#red-ui-clipboard-dialog-tab-library-name").val(file.label);
+ }
+ }
+ })
+ loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));
+
+ $("#red-ui-clipboard-dialog-tab-library-name").val("flows.json").select();
+
+ dialogContainer.i18n();
+ var format = RED.settings.flowFilePretty ? "red-ui-clipboard-dialog-export-fmt-full" : "red-ui-clipboard-dialog-export-fmt-mini";
+
+ $("#red-ui-clipboard-dialog-export-fmt-group > a").on("click", function(evt) {
evt.preventDefault();
if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
- $("#clipboard-export").focus();
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
return;
}
$(this).parent().children().removeClass('selected');
$(this).addClass('selected');
- var flow = $("#clipboard-export").val();
+ var flow = $("#red-ui-clipboard-dialog-export-text").val();
if (flow.length > 0) {
var nodes = JSON.parse(flow);
format = $(this).attr('id');
- if (format === 'export-format-full') {
+ if (format === 'red-ui-clipboard-dialog-export-fmt-full') {
flow = JSON.stringify(nodes,null,4);
} else {
flow = JSON.stringify(nodes);
}
- $("#clipboard-export").val(flow);
- $("#clipboard-export").focus();
+ $("#red-ui-clipboard-dialog-export-text").val(flow);
+ setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);
+
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
}
});
- $("#export-range-group > a").click(function(evt) {
+ $("#red-ui-clipboard-dialog-export-rng-group > a").on("click", function(evt) {
evt.preventDefault();
if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
- $("#clipboard-export").focus();
return;
}
$(this).parent().children().removeClass('selected');
@@ -322,7 +577,7 @@ RED.clipboard = (function() {
var type = $(this).attr('id');
var flow = "";
var nodes = null;
- if (type === 'export-range-selected') {
+ if (type === 'red-ui-clipboard-dialog-export-rng-selected') {
var selection = RED.workspaces.selection();
if (selection.length > 0) {
nodes = [];
@@ -335,77 +590,97 @@ RED.clipboard = (function() {
}
// Don't include the subflow meta-port nodes in the exported selection
nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
- } else if (type === 'export-range-flow') {
+ } else if (type === 'red-ui-clipboard-dialog-export-rng-flow') {
var activeWorkspace = RED.workspaces.active();
nodes = RED.nodes.filterNodes({z:activeWorkspace});
var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
nodes.unshift(parentNode);
nodes = RED.nodes.createExportableNodeSet(nodes);
- } else if (type === 'export-range-full') {
+ } else if (type === 'red-ui-clipboard-dialog-export-rng-full') {
nodes = RED.nodes.createCompleteNodeSet(false);
}
if (nodes !== null) {
- if (format === "export-format-full") {
+ if (format === "red-ui-clipboard-dialog-export-fmt-full") {
flow = JSON.stringify(nodes,null,4);
} else {
flow = JSON.stringify(nodes);
}
}
if (flow.length > 0) {
- $("#export-copy").removeClass('disabled');
+ $("#red-ui-clipboard-dialog-export").removeClass('disabled');
} else {
- $("#export-copy").addClass('disabled');
+ $("#red-ui-clipboard-dialog-export").addClass('disabled');
}
- $("#clipboard-export").val(flow);
- $("#clipboard-export").focus();
+ $("#red-ui-clipboard-dialog-export-text").val(flow);
+ setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
})
- $("#clipboard-dialog-ok").hide();
- $("#clipboard-dialog-cancel").hide();
- $("#clipboard-dialog-copy").hide();
- $("#clipboard-dialog-close").hide();
+ $("#red-ui-clipboard-dialog-ok").hide();
+ $("#red-ui-clipboard-dialog-cancel").hide();
+ $("#red-ui-clipboard-dialog-export").hide();
var selection = RED.workspaces.selection();
if (selection.length > 0) {
- $("#export-range-selected").click();
+ $("#red-ui-clipboard-dialog-export-rng-selected").trigger("click");
} else {
selection = RED.view.selection();
if (selection.nodes) {
- $("#export-range-selected").click();
+ $("#red-ui-clipboard-dialog-export-rng-selected").trigger("click");
} else {
- $("#export-range-selected").addClass('disabled').removeClass('selected');
- $("#export-range-flow").click();
+ $("#red-ui-clipboard-dialog-export-rng-selected").addClass('disabled').removeClass('selected');
+ $("#red-ui-clipboard-dialog-export-rng-flow").trigger("click");
}
}
- if (format === "export-format-full") {
- $("#export-format-full").click();
+ if (format === "red-ui-clipboard-dialog-export-fmt-full") {
+ $("#red-ui-clipboard-dialog-export-fmt-full").trigger("click");
} else {
- $("#export-format-mini").click();
+ $("#red-ui-clipboard-dialog-export-fmt-mini").trigger("click");
}
- $("#clipboard-export")
- .focus(function() {
- var textarea = $(this);
- textarea.select();
- textarea.mouseup(function() {
- textarea.unbind("mouseup");
- return false;
- })
- });
+ tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);
dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
- $("#clipboard-export").focus();
- if (!document.queryCommandSupported("copy")) {
- $("#clipboard-dialog-cancel").hide();
- $("#clipboard-dialog-close").show();
- } else {
- $("#clipboard-dialog-cancel").show();
- $("#clipboard-dialog-copy").show();
- }
- $("#clipboard-dialog-download").show();
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
+ $("#red-ui-clipboard-dialog-cancel").show();
+ $("#red-ui-clipboard-dialog-export").show();
+ $("#red-ui-clipboard-dialog-download").show();
+
+ }
+
+ function loadFlowLibrary(browser,library,label) {
+ // if (includeExamples) {
+ // listing.push({
+ // library: "_examples_",
+ // type: "flows",
+ // icon: 'fa fa-hdd-o',
+ // label: RED._("library.types.examples"),
+ // path: "",
+ // children: function(done,item) {
+ // RED.library.loadLibraryFolder("_examples_","flows","",function(children) {
+ // item.children = children;
+ // done(children);
+ // })
+ // }
+ // })
+ // }
+ browser.data([{
+ library: library,
+ type: "flows",
+ icon: 'fa fa-hdd-o',
+ label: label,
+ path: "",
+ expanded: true,
+ children: function(done, item) {
+ RED.library.loadLibraryFolder(library,"flows","",function(children) {
+ item.children = children;
+ done(children);
+ })
+ }
+ }], true);
}
function hideDropTarget() {
- $("#dropTarget").hide();
+ $("#red-ui-drop-target").hide();
RED.keyboard.remove("escape");
}
function copyText(value,element,msg) {
@@ -435,7 +710,7 @@ RED.clipboard = (function() {
if (truncated) {
msg += "_truncated";
}
- $("#clipboard-hidden").val(value).select();
+ $("#red-ui-clipboard-hidden").val(value).select();
var result = document.execCommand("copy");
if (result && element) {
var popover = RED.popover.create({
@@ -455,29 +730,34 @@ RED.clipboard = (function() {
init: function() {
setupDialogs();
- $('').appendTo("body");
+ $('').appendTo("#red-ui-editor");
RED.actions.add("core:show-export-dialog",exportNodes);
RED.actions.add("core:show-import-dialog",importNodes);
+ RED.actions.add("core:show-library-export-dialog",function() { exportNodes('library') });
+ RED.actions.add("core:show-library-import-dialog",function() { importNodes('library') });
RED.events.on("editor:open",function() { disabled = true; });
RED.events.on("editor:close",function() { disabled = false; });
RED.events.on("search:open",function() { disabled = true; });
RED.events.on("search:close",function() { disabled = false; });
+ RED.events.on("actionList:open",function() { disabled = true; });
+ RED.events.on("actionList:close",function() { disabled = false; });
RED.events.on("type-search:open",function() { disabled = true; });
RED.events.on("type-search:close",function() { disabled = false; });
+ $('
').appendTo('#red-ui-editor');
- $('#chart').on("dragenter",function(event) {
+ $('#red-ui-workspace-chart').on("dragenter",function(event) {
if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
$.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
- $("#dropTarget").css({display:'table'});
+ $("#red-ui-drop-target").css({display:'table'});
RED.keyboard.add("*", "escape" ,hideDropTarget);
}
});
- $('#dropTarget').on("dragover",function(event) {
+ $('#red-ui-drop-target').on("dragover",function(event) {
if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
$.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
event.preventDefault();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js
index be7d2d4cd..157c1e495 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js
@@ -38,7 +38,7 @@
this.options[0].show();
}
- this.element.change(function() {
+ this.element.on("change", function() {
if (this.checked) {
that.options[0].hide();
that.options[1].show();
@@ -53,7 +53,7 @@
child.checkboxSet('state',isChecked,false,true);
})
})
- this.uiElement.click(function(e) {
+ this.uiElement.on("click", function(e) {
e.stopPropagation();
// state returns null for a partial state. Clicking on that should
// result in false.
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
index ee29a6a35..06ccc97d9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -32,7 +32,10 @@
* - scrollOnAdd : boolean - whether to scroll to newly added items
* methods:
* - addItem(itemData)
+ * - insertItemAt : function(data,index) - add an item at the specified index
* - removeItem(itemData)
+ * - getItemAt(index)
+ * - indexOf(itemData)
* - width(width)
* - height(height)
* - items()
@@ -75,9 +78,9 @@
addLabel = 'add';
}
}
- $(' '+addLabel+'')
+ $(' '+addLabel+'')
.appendTo(this.topContainer)
- .click(function(evt) {
+ .on("click", function(evt) {
evt.preventDefault();
that.addItem({});
});
@@ -185,6 +188,11 @@
}
},
_destroy: function() {
+ if (this.topContainer) {
+ var tc = this.topContainer;
+ delete this.topContainer;
+ tc.remove();
+ }
},
_refreshFilter: function() {
var that = this;
@@ -230,7 +238,24 @@
this.uiHeight = desiredHeight;
this._resize();
},
- addItem: function(data) {
+ getItemAt: function(index) {
+ var items = this.items();
+ if (index >= 0 && index < items.length) {
+ return $(items[index]).data('data');
+ } else {
+ return;
+ }
+ },
+ indexOf: function(data) {
+ var items = this.items();
+ for (var i=0;i');
@@ -248,7 +273,13 @@
});
}
if (!added) {
- li.appendTo(this.element);
+ if (index <= 0) {
+ li.prependTo(this.element);
+ } else if (index > that.element.children().length-1) {
+ li.appendTo(this.element);
+ } else {
+ li.insertBefore(this.element.children().eq(index));
+ }
}
var row = $('').addClass("red-ui-editableList-item-content").appendTo(li);
row.data('data',data);
@@ -257,10 +288,10 @@
li.addClass("red-ui-editableList-item-sortable");
}
if (this.options.removable) {
- var deleteButton = $('',{href:"#",class:"red-ui-editableList-item-remove editor-button editor-button-small"}).appendTo(li);
+ var deleteButton = $('',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(li);
$('',{class:"fa fa-remove"}).appendTo(deleteButton);
li.addClass("red-ui-editableList-item-removable");
- deleteButton.click(function(evt) {
+ deleteButton.on("click", function(evt) {
evt.preventDefault();
var data = row.data('data');
li.addClass("red-ui-editableList-item-deleting")
@@ -293,6 +324,9 @@
},0);
}
},
+ addItem: function(data) {
+ this.insertItemAt(data,this.element.children().length)
+ },
addItems: function(items) {
for (var i=0; i 0) {
this.uiContainer.scrollTop(this.uiContainer.scrollTop()+items.position().top)
}
+ },
+ getItem: function(li) {
+ var el = li.find(".red-ui-editableList-item-content");
+ if (el.length) {
+ return el.data('data');
+ } else {
+ return null;
+ }
}
});
})(jQuery);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
index 612bf4516..3e16ef9d3 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
@@ -56,12 +56,12 @@ RED.menu = (function() {
}
if (opt === null) {
- item = $('');
+ item = $('');
} else {
item = $('');
if (opt.group) {
- item.addClass("menu-group-"+opt.group);
+ item.addClass("red-ui-menu-group-"+opt.group);
}
var linkContent = '';
@@ -71,7 +71,7 @@ RED.menu = (function() {
}
if (opt.icon !== undefined) {
- if (/\.png/.test(opt.icon)) {
+ if (/\.(png|svg)/.test(opt.icon)) {
linkContent += '
';
} else {
linkContent += ' ';
@@ -79,10 +79,10 @@ RED.menu = (function() {
}
if (opt.sublabel) {
- linkContent += ''
+ linkContent += ''
} else {
- linkContent += ''
+ linkContent += ''
}
linkContent += '';
@@ -92,27 +92,16 @@ RED.menu = (function() {
menuItems[opt.id] = opt;
if (opt.onselect) {
- link.click(function(e) {
+ link.on("click", function(e) {
e.preventDefault();
if ($(this).parent().hasClass("disabled")) {
return;
}
if (opt.toggle) {
- var selected = isSelected(opt.id);
- if (typeof opt.toggle === "string") {
- if (!selected) {
- for (var m in menuItems) {
- if (menuItems.hasOwnProperty(m)) {
- var mi = menuItems[m];
- if (mi.id != opt.id && opt.toggle == mi.toggle) {
- setSelected(mi.id,false);
- }
- }
- }
- setSelected(opt.id,true);
- }
+ if (opt.toggle === true) {
+ setSelected(opt.id, !isSelected(opt.id));
} else {
- setSelected(opt.id, !selected);
+ setSelected(opt.id, true);
}
} else {
triggerAction(opt.id);
@@ -125,13 +114,13 @@ RED.menu = (function() {
link.attr("target","_blank").attr("href",opt.href);
} else if (!opt.options) {
item.addClass("disabled");
- link.click(function(event) {
+ link.on("click", function(event) {
event.preventDefault();
});
}
if (opt.options) {
- item.addClass("dropdown-submenu pull-left");
- var submenu = $('').appendTo(item);
+ item.addClass("red-ui-menu-dropdown-submenu pull-left");
+ var submenu = $('').appendTo(item);
for (var i=0;i",{class:"dropdown-menu pull-right"});
+ var topMenu = $("
",{class:"red-ui-menu red-ui-menu-dropdown pull-right"});
if (options.id) {
topMenu.attr({id:options.id+"-submenu"});
var menuParent = $("#"+options.id);
if (menuParent.length === 1) {
topMenu.insertAfter(menuParent);
+ menuParent.on("click", function(evt) {
+ evt.stopPropagation();
+ evt.preventDefault();
+ if (topMenu.is(":visible")) {
+ $(document).off("click.red-ui-menu");
+ topMenu.hide();
+ } else {
+ $(document).on("click.red-ui-menu", function(evt) {
+ $(document).off("click.red-ui-menu");
+ activeMenu = null;
+ topMenu.hide();
+ });
+ $(".red-ui-menu").hide();
+ topMenu.show();
+ }
+ })
}
}
@@ -193,8 +198,9 @@ RED.menu = (function() {
}
function setSelected(id,state) {
+ var alreadySet = false;
if (isSelected(id) == state) {
- return;
+ alreadySet = true;
}
var opt = menuItems[id];
if (state) {
@@ -202,10 +208,26 @@ RED.menu = (function() {
} else {
$("#"+id).removeClass("active");
}
- if (opt && opt.onselect) {
- triggerAction(opt.id,state);
+ if (opt) {
+ if (opt.toggle && typeof opt.toggle === "string") {
+ if (state) {
+ for (var m in menuItems) {
+ if (menuItems.hasOwnProperty(m)) {
+ var mi = menuItems[m];
+ if (mi.id != opt.id && opt.toggle == mi.toggle) {
+ setSelected(mi.id,false);
+ }
+ }
+ }
+ }
+ }
+ if (!alreadySet && opt.onselect) {
+ triggerAction(opt.id,state);
+ }
+ }
+ if (!opt.local && !alreadySet) {
+ RED.settings.set(opt.setting||("menu-"+opt.id), state);
}
- RED.settings.set(opt.setting||("menu-"+opt.id), state);
}
function toggleSelected(id) {
@@ -223,13 +245,13 @@ RED.menu = (function() {
function addItem(id,opt) {
var item = createMenuItem(opt);
if (opt.group) {
- var groupItems = $("#"+id+"-submenu").children(".menu-group-"+opt.group);
+ var groupItems = $("#"+id+"-submenu").children(".red-ui-menu-group-"+opt.group);
if (groupItems.length === 0) {
item.appendTo("#"+id+"-submenu");
} else {
for (var i=0;i ").parent();
this.uiContainer.addClass("red-ui-searchBox-container");
@@ -44,7 +45,7 @@
e.preventDefault();
that.element.val("");
that._change("",true);
- that.element.focus();
+ that.element.trigger("focus");
});
this.resultCount = $('',{class:"red-ui-searchBox-resultCount hide"}).appendTo(this.uiContainer);
@@ -60,7 +61,7 @@
});
this.element.on("focus",function() {
- $("body").one("mousedown",function() {
+ $(document).one("mousedown",function() {
that.element.blur();
});
});
@@ -86,6 +87,7 @@
that._trigger("change");
},this.options.delay);
} else {
+ this.lastSent = this.element.val();
this._trigger("change");
}
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js
index d31753a31..610f388de 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js
@@ -39,17 +39,17 @@ RED.stack = (function() {
}
}
if (options.fill && options.singleExpanded) {
- $(window).resize(resizeStack);
- $(window).focus(resizeStack);
+ $(window).on("resize", resizeStack);
+ $(window).on("focus", resizeStack);
}
return {
add: function(entry) {
entries.push(entry);
- entry.container = $('
').appendTo(container);
+ entry.container = $('
').appendTo(container);
if (!visible) {
entry.container.hide();
}
- var header = $('').appendTo(entry.container);
+ var header = $('').appendTo(entry.container);
entry.header = header;
entry.contentWrap = $('',{style:"position:relative"}).appendTo(entry.container);
if (options.fill) {
@@ -57,7 +57,7 @@ RED.stack = (function() {
}
entry.content = $('').appendTo(entry.contentWrap);
if (entry.collapsible !== false) {
- header.click(function() {
+ header.on("click", function() {
if (options.singleExpanded) {
if (!entry.isExpanded()) {
for (var i=0;i').appendTo(header);
if (entry.expanded) {
- entry.container.addClass("palette-category-expanded");
+ entry.container.addClass("expanded");
icon.addClass("expanded");
} else {
entry.contentWrap.hide();
@@ -118,7 +118,7 @@ RED.stack = (function() {
}
icon.addClass("expanded");
- entry.container.addClass("palette-category-expanded");
+ entry.container.addClass("expanded");
entry.contentWrap.slideDown(200);
return true;
}
@@ -126,13 +126,13 @@ RED.stack = (function() {
entry.collapse = function() {
if (entry.isExpanded()) {
icon.removeClass("expanded");
- entry.container.removeClass("palette-category-expanded");
+ entry.container.removeClass("expanded");
entry.contentWrap.slideUp(200);
return true;
}
};
entry.isExpanded = function() {
- return entry.container.hasClass("palette-category-expanded");
+ return entry.container.hasClass("expanded");
};
if (options.fill && options.singleExpanded) {
resizeStack();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
index 3de4b5845..288334c06 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -37,7 +37,7 @@ RED.tabs = (function() {
if (options.addButton) {
wrapper.addClass("red-ui-tabs-add");
var addButton = $('').appendTo(wrapper);
- addButton.find('a').click(function(evt) {
+ addButton.find('a').on("click", function(evt) {
evt.preventDefault();
if (typeof options.addButton === 'function') {
options.addButton();
@@ -73,7 +73,7 @@ RED.tabs = (function() {
if (options.searchButton) {
wrapper.addClass("red-ui-tabs-search");
var searchButton = $('').appendTo(wrapper);
- searchButton.find('a').click(function(evt) {
+ searchButton.find('a').on("click", function(evt) {
evt.preventDefault();
if (typeof options.searchButton === 'function') {
options.searchButton()
@@ -96,7 +96,7 @@ RED.tabs = (function() {
if (options.scrollable) {
wrapper.addClass("red-ui-tabs-scrollable");
scrollContainer.addClass("red-ui-tabs-scroll-container");
- scrollContainer.scroll(updateScroll);
+ scrollContainer.on("scroll",updateScroll);
scrollLeft = $('').appendTo(wrapper).find("a");
scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=150') }).on('click',function(evt){ evt.preventDefault();});
scrollRight = $('').appendTo(wrapper).find("a");
@@ -113,7 +113,7 @@ RED.tabs = (function() {
if (options.menu !== false) {
var selectButton = $('').appendTo(collapsedButtonsRow);
selectButton.addClass("red-ui-tab-link-button-menu")
- selectButton.click(function(evt) {
+ selectButton.on("click", function(evt) {
evt.stopPropagation();
evt.preventDefault();
if (!collapsibleMenu) {
@@ -136,7 +136,7 @@ RED.tabs = (function() {
}
});
options = pinnedOptions.concat(options);
- collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
+ collapsibleMenu = RED.menu.init({options: options});
collapsibleMenu.css({
position: "absolute"
})
@@ -148,10 +148,11 @@ RED.tabs = (function() {
left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
})
if (collapsibleMenu.is(":visible")) {
- $(document).off("click.tabmenu");
+ $(document).off("click.red-ui-tabmenu");
} else {
- $(document).on("click.tabmenu", function(evt) {
- $(document).off("click.tabmenu");
+ $(".red-ui-menu").hide();
+ $(document).on("click.red-ui-tabmenu", function(evt) {
+ $(document).off("click.red-ui-tabmenu");
collapsibleMenu.hide();
});
}
@@ -348,7 +349,7 @@ RED.tabs = (function() {
}
var tabs = ul.find("li.red-ui-tab");
var width = wrapper.width();
- var tabCount = tabs.size();
+ var tabCount = tabs.length;
var tabWidth;
if (options.collapsible) {
@@ -434,7 +435,7 @@ RED.tabs = (function() {
var li = ul.find("a[href='#"+id+"']").parent();
if (li.hasClass("active")) {
var tab = li.prev();
- if (tab.size() === 0) {
+ if (tab.length === 0) {
tab = li.next();
}
activateTab(tab.find("a"));
@@ -448,7 +449,10 @@ RED.tabs = (function() {
}
delete tabs[id];
updateTabWidths();
- collapsibleMenu = null;
+ if (collapsibleMenu) {
+ collapsibleMenu.remove();
+ collapsibleMenu = null;
+ }
}
return {
@@ -484,7 +488,7 @@ RED.tabs = (function() {
} else if (tab.iconClass) {
$('',{class:"red-ui-tab-icon "+tab.iconClass}).appendTo(link);
}
- var span = $('',{class:"bidiAware"}).text(tab.label).appendTo(link);
+ var span = $('',{class:"red-ui-text-bidi-aware"}).text(tab.label).appendTo(link);
span.attr('dir', RED.text.bidi.resolveBaseTextDir(tab.label));
if (options.collapsible) {
li.addClass("red-ui-tab-pinned");
@@ -509,7 +513,7 @@ RED.tabs = (function() {
} else {
$('',{class:defaultTabIcon}).appendTo(pinnedLink);
}
- pinnedLink.click(function(evt) {
+ pinnedLink.on("click", function(evt) {
evt.preventDefault();
activateTab(tab.id);
});
@@ -543,7 +547,7 @@ RED.tabs = (function() {
options.onadd(tab);
}
link.attr("title",tab.label);
- if (ul.find("li.red-ui-tab").size() == 1) {
+ if (ul.find("li.red-ui-tab").length == 1) {
activateTab(link);
}
if (options.onreorder) {
@@ -626,7 +630,10 @@ RED.tabs = (function() {
setTimeout(function() {
updateTabWidths();
},10);
- collapsibleMenu = null;
+ if (collapsibleMenu) {
+ collapsibleMenu.remove();
+ collapsibleMenu = null;
+ }
},
removeTab: removeTab,
activateTab: activateTab,
@@ -634,7 +641,7 @@ RED.tabs = (function() {
previousTab: activatePreviousTab,
resize: updateTabWidths,
count: function() {
- return ul.find("li.red-ui-tab").size();
+ return ul.find("li.red-ui-tab").length;
},
contains: function(id) {
return ul.find("a[href='#"+id+"']").length > 0;
@@ -643,7 +650,7 @@ RED.tabs = (function() {
tabs[id].label = label;
var tab = ul.find("a[href='#"+id+"']");
tab.attr("title",label);
- tab.find("span.bidiAware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
+ tab.find("span.red-ui-text-bidi-aware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
updateTabWidths();
},
selection: getSelection,
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js
new file mode 100644
index 000000000..999606912
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js
@@ -0,0 +1,100 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+(function($) {
+
+/**
+ * options:
+ * - invertState : boolean - if "true" the button will show "enabled" when the
+ * checkbox is not selected and vice versa.
+ * - enabledIcon : string - the icon for "enabled" state, default "fa-check-square-o"
+ * - enabledLabel : string - the label for "enabled" state, default "Enabled" ("editor:workspace.enabled")
+ * - disabledIcon : string - the icon for "disabled" state, default "fa-square-o"
+ * - disabledLabel : string - the label for "disabled" state, default "Disabled" ("editor:workspace.disabled")
+ * - baseClass : string - the base css class to apply, default "red-ui-button" (alternative eg "red-ui-sidebar-header-button")
+ * - class : string - additional classes to apply to the button - eg "red-ui-button-small"
+ * methods:
+ * -
+ */
+ $.widget( "nodered.toggleButton", {
+ _create: function() {
+ var that = this;
+
+ var invertState = false;
+ if (this.options.hasOwnProperty("invertState")) {
+ invertState = this.options.invertState;
+ }
+ var baseClass = this.options.baseClass || "red-ui-button";
+ var enabledIcon = this.options.enabledIcon || "fa-check-square-o";
+ var disabledIcon = this.options.disabledIcon || "fa-square-o";
+ var enabledLabel = this.options.enabledLabel || RED._("editor:workspace.enabled");
+ var disabledLabel = this.options.disabledLabel || RED._("editor:workspace.disabled");
+
+ this.element.css("display","none");
+ this.element.on("focus", function() {
+ that.button.focus();
+ });
+ this.button = $('');
+ if (this.options.class) {
+ this.button.addClass(this.options.class)
+ }
+ this.element.after(this.button);
+ this.buttonIcon = this.button.find("i");
+ this.buttonLabel = this.button.find("span");
+
+ // Quick hack to find the maximum width of the button
+ this.button.addClass("selected");
+ this.buttonIcon.addClass(enabledIcon);
+ this.buttonLabel.text(enabledLabel);
+ var width = this.button.width();
+ this.button.removeClass("selected");
+ this.buttonIcon.removeClass(enabledIcon);
+ that.buttonIcon.addClass(disabledIcon);
+ that.buttonLabel.text(disabledLabel);
+ width = Math.max(width,this.button.width());
+ this.buttonIcon.removeClass(disabledIcon);
+
+ // Fix the width of the button so it doesn't jump around when toggled
+ if (width > 0) {
+ this.button.width(Math.ceil(width));
+ }
+
+ this.button.on("click",function(e) {
+ e.stopPropagation();
+ if (that.buttonIcon.hasClass(disabledIcon)) {
+ that.element.prop("checked",!invertState);
+ } else {
+ that.element.prop("checked",invertState);
+ }
+ that.element.trigger("change");
+ })
+
+ this.element.on("change", function(e) {
+ if ($(this).prop("checked") !== invertState) {
+ that.button.addClass("selected");
+ that.buttonIcon.addClass(enabledIcon);
+ that.buttonIcon.removeClass(disabledIcon);
+ that.buttonLabel.text(enabledLabel);
+ } else {
+ that.button.removeClass("selected");
+ that.buttonIcon.addClass(disabledIcon);
+ that.buttonIcon.removeClass(enabledIcon);
+ that.buttonLabel.text(disabledLabel);
+ }
+ })
+ this.element.trigger("change");
+ }
+ });
+})(jQuery);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
index 8e0249183..0e391a5b8 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -18,32 +18,70 @@
/**
* options:
* - data : array - initial items to display in tree
+ * - multi : boolean - if true, .selected will return an array of results
+ * otherwise, returns the first selected item
+ * - sortable: boolean/string - TODO: see editableList
+ * - rootSortable: boolean - if 'sortable' is set, then setting this to
+ * false, prevents items being sorted to the
+ * top level of the tree
*
* methods:
* - data(items) - clears existing items and replaces with new data
*
* events:
* - treelistselect : function(event, item) {}
- *
+ * - treelistconfirm : function(event,item) {}
+ * - treelistchangeparent: function(event,item, oldParent, newParent) {}
*
* data:
* [
* {
* label: 'Local', // label for the item
+ * sublabel: 'Local', // a sub-label for the item
* icon: 'fa fa-rocket', // (optional) icon for the item
* selected: true/false, // (optional) if present, display checkbox accordingly
- * children: [] | function(done) // (optional) an array of child items, or a function
+ * children: [] | function(done,item) // (optional) an array of child items, or a function
* // that will call the `done` callback with an array
* // of child items
+ * expanded: true/false, // show the child items by default
+ * deferBuild: true/false, // don't build any ui elements for the item's children
+ * until it is expanded by the user.
+ * element: // custom dom element to use for the item - ignored if `label` is set
* }
* ]
*
- *
- *
* var treeList = $("
").css({width: "100%", height: "100%"}).treeList({data:[...]})
* treeList.on('treelistselect', function(e,item) { console.log(item)})
* treeList.treeList('data',[ ... ] )
*
+ *
+ * After `data` has been added to the tree, each item is augmented the following
+ * properties and functions:
+ *
+ * item.parent - set to the parent item
+ * item.treeList.container
+ * item.treeList.label - the label element for the item
+ * item.treeList.depth - the depth in the tree (0 == root)
+ * item.treeList.parentList - the editableList instance this item is in
+ * item.treeList.remove() - removes the item from the tree
+ * item.treeList.makeLeaf(detachChildElements) - turns an element with children into a leaf node,
+ * removing the UI decoration etc.
+ * detachChildElements - any children with custom
+ * elements will be detached rather than removed
+ * so jQuery event handlers are preserved in case
+ * the child elements need to be reattached later
+ * item.treeList.makeParent(children) - turns an element into a parent node, adding the necessary
+ * UI decoration.
+ * item.treeList.insertChildAt(newItem,position,select) - adds a child item an the specified position.
+ * Optionally selects the item after adding.
+ * item.treeList.addChild(newItem,select) - appends a child item.
+ * Optionally selects the item after adding.
+ * item.treeList.expand(done) - expands the parent item to show children. Optional 'done' callback.
+ * item.treeList.collapse() - collapse the parent item to hide children.
+ *
+ *
+ *
+ *
*/
$.widget( "nodered.treeList", {
@@ -51,110 +89,449 @@
var that = this;
this.element.addClass('red-ui-treeList');
+ this.element.attr("tabIndex",0);
var wrapper = $('
',{class:'red-ui-treeList-container'}).appendTo(this.element);
+ this.element.on('keydown', function(evt) {
+ var selected = that._topList.find(".selected").parent().data('data');
+ if (!selected && (evt.keyCode === 40 || evt.keyCode === 38)) {
+ that.select(that._data[0]);
+ return;
+ }
+ var target;
+ switch(evt.keyCode) {
+ case 13: // ENTER
+ if (selected.children) {
+ if (selected.treeList.container.hasClass("expanded")) {
+ selected.treeList.collapse()
+ } else {
+ selected.treeList.expand()
+ }
+ } else {
+ that._trigger("confirm",null,selected)
+ }
+ break;
+ case 37: // LEFT
+ if (selected.children&& selected.treeList.container.hasClass("expanded")) {
+ selected.treeList.collapse()
+ } else if (selected.parent) {
+ target = selected.parent;
+ }
+ break;
+ case 38: // UP
+ target = that._getPreviousSibling(selected);
+ if (target) {
+ target = that._getLastDescendant(target);
+ }
+ if (!target && selected.parent) {
+ target = selected.parent;
+ }
+ break;
+ case 39: // RIGHT
+ if (selected.children) {
+ if (!selected.treeList.container.hasClass("expanded")) {
+ selected.treeList.expand()
+ }
+ }
+ break
+ case 40: //DOWN
+ if (selected.children && Array.isArray(selected.children) && selected.children.length > 0 && selected.treeList.container.hasClass("expanded")) {
+ target = selected.children[0];
+ } else {
+ target = that._getNextSibling(selected);
+ while (!target && selected.parent) {
+ selected = selected.parent;
+ target = that._getNextSibling(selected);
+ }
+ }
+ break
+ }
+ if (target) {
+ that.select(target);
+ }
+ });
this._data = [];
- this._topList = $('
- ').css({
+ this._topList = $('
- ').css({
position:'absolute',
top: 0,
left:0,
right:0,
bottom:0
- }).appendTo(wrapper).editableList({
+ }).appendTo(wrapper);
+
+ var topListOptions = {
addButton: false,
scrollOnAdd: false,
height: '100%',
addItem: function(container,i,item) {
- that._addSubtree(container,item,0);
+ that._addSubtree(that._topList,container,item,0);
}
- });
+ };
+ if (this.options.rootSortable !== false && !!this.options.sortable) {
+ topListOptions.sortable = this.options.sortable;
+ topListOptions.connectWith = '.red-ui-treeList-sortable';
+ this._topList.addClass('red-ui-treeList-sortable');
+ }
+ this._topList.editableList(topListOptions)
+
+
if (this.options.data) {
this.data(this.options.data);
}
},
- _addChildren: function(container,children,depth) {
+ _getLastDescendant: function(item) {
+ // Gets the last visible descendant of the item
+ if (!item.children || !item.treeList.container.hasClass("expanded") || item.children.length === 0) {
+ return item;
+ }
+ return this._getLastDescendant(item.children[item.children.length-1]);
+ },
+ _getPreviousSibling: function(item) {
+ var candidates;
+ if (!item.parent) {
+ candidates = this._data;
+ } else {
+ candidates = item.parent.children;
+ }
+ var index = candidates.indexOf(item);
+ if (index === 0) {
+ return null;
+ } else {
+ return candidates[index-1];
+ }
+ },
+ _getNextSibling: function(item) {
+ var candidates;
+ if (!item.parent) {
+ candidates = this._data;
+ } else {
+ candidates = item.parent.children;
+ }
+ var index = candidates.indexOf(item);
+ if (index === candidates.length - 1) {
+ return null;
+ } else {
+ return candidates[index+1];
+ }
+ },
+ _addChildren: function(container,parent,children,depth) {
var that = this;
- var subtree = $('
- ').appendTo(container).editableList({
+ var subtree = $('
- ').appendTo(container).editableList({
+ connectWith: ".red-ui-treeList-sortable",
+ sortable: that.options.sortable,
addButton: false,
scrollOnAdd: false,
height: 'auto',
addItem: function(container,i,item) {
- that._addSubtree(container,item,depth+1);
+ that._addSubtree(subtree,container,item,depth+1);
+ },
+ sortItems: function(data) {
+ var children = [];
+ var reparented = [];
+ data.each(function() {
+ var child = $(this).data('data');
+ children.push(child);
+ var evt = that._fixDepths(parent,child);
+ if (evt) {
+ reparented.push(evt);
+ }
+ })
+ if (Array.isArray(parent.children)) {
+ parent.children = children;
+ }
+ reparented.forEach(function(evt) {
+ that._trigger("changeparent",null,evt);
+ });
+ that._trigger("sort",null,parent);
}
});
+ if (!!that.options.sortable) {
+ subtree.addClass('red-ui-treeList-sortable');
+ }
for (var i=0;i
').css({
- "background-position": (35+depth*15)+'px 50%'
- }).appendTo(container);
}
-
+ done && done();
+ that._trigger("childrenloaded",null,item)
}
- container.toggleClass("expanded");
- })
- } else {
- $('').appendTo(label);
+ if (typeof item.children === 'function') {
+ item.children(completeBuild,item);
+ } else {
+ delete item.deferBuild;
+ completeBuild(item.children);
+ }
+ if (!childrenAdded) {
+ startTime = Date.now();
+ spinner = $('
').css({
+ "background-position": (35+depth*20)+'px 50%'
+ }).appendTo(container);
+ }
+
+ } else {
+ if (that._loadingData) {
+ item.treeList.childList.show();
+ } else {
+ item.treeList.childList.slideDown('fast');
+ }
+ done && done();
+ }
+ container.addClass("expanded");
}
+ item.treeList.collapse = function() {
+ if (!item.children) {
+ return;
+ }
+ item.treeList.childList.slideUp('fast');
+ container.removeClass("expanded");
+ }
+
+ var treeListIcon = $('').appendTo(label);
+ if (item.children) {
+ item.treeList.makeParent();
+ }
+
if (item.hasOwnProperty('selected')) {
var selectWrapper = $('').appendTo(label);
- var cb = $('').prop('checked',item.selected).appendTo(selectWrapper);
+ var cb = $('').prop('checked',item.selected).appendTo(selectWrapper);
+ label.toggleClass("selected",item.selected);
cb.on('click', function(e) {
e.stopPropagation();
});
cb.on('change', function(e) {
item.selected = this.checked;
+ label.toggleClass("selected",this.checked);
that._trigger("select",e,item);
})
- } else if (!item.children) {
- label.click(function(e) {
+ if (!item.children) {
+ label.on("click", function(e) {
+ e.stopPropagation();
+ cb.trigger("click");
+ })
+ }
+ item.treeList.select = function(v) {
+ if (v !== item.selected) {
+ cb.trigger("click");
+ }
+ }
+ } else {
+ label.on("click", function(e) {
+ that._topList.find(".selected").removeClass("selected");
+ label.addClass("selected");
that._trigger("select",e,item)
})
+ label.on("dblclick", function(e) {
+ if (!item.children) {
+ that._trigger("confirm",e,item);
+ }
+ })
}
if (item.icon) {
$('').appendTo(label);
}
- $('').text(item.label).appendTo(label);
+ if (item.hasOwnProperty('label') || item.hasOwnProperty('sublabel')) {
+ if (item.hasOwnProperty('label')) {
+ $('').text(item.label).appendTo(label);
+ }
+ if (item.hasOwnProperty('sublabel')) {
+ $('').text(item.sublabel).appendTo(label);
+ }
+
+ } else if (item.element) {
+ $(item.element).appendTo(label);
+ $(item.element).css({
+ width: "calc(100% - "+(labelPaddingWidth+20+(item.icon?20:0))+"px)"
+ })
+ }
if (item.children) {
- if (Array.isArray(item.children)) {
- that._addChildren(container,item.children,depth);
+ if (Array.isArray(item.children) && !item.deferBuild) {
+ item.treeList.childList = that._addChildren(container,item,item.children,depth).hide();
}
if (item.expanded) {
- label.click();
+ item.treeList.expand();
}
}
},
@@ -162,12 +539,19 @@
this._topList.editableList('empty');
},
data: function(items) {
+ var that = this;
if (items !== undefined) {
this._data = items;
this._topList.editableList('empty');
+ this._loadingData = true;
for (var i=0; i',{class:"red-ui-search-result-node"}).css({
+ "margin-top": "2px",
+ "margin-left": "3px"
+ }).appendTo(container);
+ var nodeLabel = $('').css({
+ "line-height": "32px",
+ "margin-left": "6px"
+ }).appendTo(container);
+ if (node) {
+ var colour = RED.utils.getNodeColor(node.type,node._def);
+ var icon_url = RED.utils.getNodeIcon(node._def,node);
+ if (node.type === 'tab') {
+ colour = "#C0DEED";
+ }
+ nodeDiv.css('backgroundColor',colour);
+ var iconContainer = $('',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
+ RED.utils.createIconElement(icon_url, iconContainer, true);
+ var l = RED.utils.getNodeLabel(node,node.id);
+ nodeLabel.text(l);
+ } else {
+ nodeDiv.css({
+ 'backgroundColor': '#eee',
+ 'border-style' : 'dashed'
+ });
+
+ }
+ },
+ expand: function() {
+ var that = this;
+ RED.tray.hide();
+ RED.view.selectNodes({
+ single: true,
+ selected: [that.value()],
+ onselect: function(selection) {
+ that.value(selection.id);
+ RED.tray.show();
+ },
+ oncancel: function() {
+ RED.tray.show();
+ }
+ })
+ }
}
};
var nlsd = false;
@@ -124,7 +179,7 @@
}
var contextStores = RED.settings.context.stores;
var contextOptions = contextStores.map(function(store) {
- return {value:store,label: store, icon:''}
+ return {value:store,label: store, icon:''}
})
if (contextOptions.length < 2) {
allOptions.flow.options = [];
@@ -138,12 +193,12 @@
var that = this;
this.disarmClick = false;
- this.input = $('');
+ this.input = $('');
this.input.insertAfter(this.element);
this.input.val(this.element.val());
this.element.addClass('red-ui-typedInput');
this.uiWidth = this.element.outerWidth();
- this.elementDiv = this.input.wrap("
").parent().addClass('red-ui-typedInput-input');
+ this.elementDiv = this.input.wrap("
").parent().addClass('red-ui-typedInput-input-wrap');
this.uiSelect = this.elementDiv.wrap( "
" ).parent();
var attrStyle = this.element.attr('style');
var m;
@@ -160,7 +215,7 @@
that.input.css("margin"+d,0);
});
- ["type","placeholder","data-i18n"].forEach(function(d) {
+ ["type","placeholder","autocomplete","data-i18n"].forEach(function(d) {
var m = that.element.attr(d);
that.input.attr(d,m);
});
@@ -171,11 +226,13 @@
this.options.types = this.options.types||Object.keys(allOptions);
- this.selectTrigger = $('').prependTo(this.uiSelect);
- $('').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
+ this.selectTrigger = $('').prependTo(this.uiSelect);
+ $('').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
this.selectLabel = $('').appendTo(this.selectTrigger);
+ this.valueLabelContainer = $('
').appendTo(this.uiSelect)
+
this.types(this.options.types);
if (this.options.typeField) {
@@ -198,9 +255,15 @@
that.validate();
that.element.val(that.value());
that.element.trigger('change',that.propertyType,that.value());
+ });
+ this.input.on('keydown', function(evt) {
+ if (evt.keyCode >= 37 && evt.keyCode <= 40) {
+ evt.stopPropagation();
+ }
})
- this.selectTrigger.click(function(event) {
+ this.selectTrigger.on("click", function(event) {
event.preventDefault();
+ event.stopPropagation();
that._showTypeMenu();
});
this.selectTrigger.on('keydown',function(evt) {
@@ -208,31 +271,35 @@
// Down
that._showTypeMenu();
}
+ evt.stopPropagation();
}).on('focus', function() {
that.uiSelect.addClass('red-ui-typedInput-focus');
})
// explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
- this.optionSelectTrigger = $('').appendTo(this.uiSelect);
+ this.optionSelectTrigger = $('').appendTo(this.uiSelect);
this.optionSelectLabel = $('').prependTo(this.optionSelectTrigger);
RED.popover.tooltip(this.optionSelectLabel,function() {
return that.optionValue;
});
- this.optionSelectTrigger.click(function(event) {
+ this.optionSelectTrigger.on("click", function(event) {
event.preventDefault();
+ event.stopPropagation();
that._showOptionSelectMenu();
}).on('keydown', function(evt) {
if (evt.keyCode === 40) {
// Down
that._showOptionSelectMenu();
}
+ evt.stopPropagation();
}).on('blur', function() {
that.uiSelect.removeClass('red-ui-typedInput-focus');
}).on('focus', function() {
that.uiSelect.addClass('red-ui-typedInput-focus');
});
- this.optionExpandButton = $('').appendTo(this.uiSelect);
+ this.optionExpandButton = $('').appendTo(this.uiSelect);
+ this.optionExpandButtonIcon = $('').appendTo(this.optionExpandButton);
this.type(this.options.default||this.typeList[0].value);
}catch(err) {
console.log(err.stack);
@@ -241,9 +308,12 @@
_showTypeMenu: function() {
if (this.typeList.length > 1) {
this._showMenu(this.menu,this.selectTrigger);
- this.menu.find("[value='"+this.propertyType+"']").focus();
+ var selected = this.menu.find("[value='"+this.propertyType+"']");
+ setTimeout(function() {
+ selected.trigger("focus");
+ },120);
} else {
- this.input.focus();
+ this.input.trigger("focus");
}
},
_showOptionSelectMenu: function() {
@@ -257,25 +327,41 @@
if (selectedOption.length === 0) {
selectedOption = this.optionMenu.children(":first");
}
- selectedOption.focus();
+ selectedOption.trigger("focus");
}
},
_hideMenu: function(menu) {
- $(document).off("mousedown.close-property-select");
+ $(document).off("mousedown.red-ui-typedInput-close-property-select");
menu.hide();
+ menu.css({
+ height: "auto"
+ });
+
+ if (menu.opts.multiple) {
+ var selected = [];
+ menu.find('input[type="checkbox"]').each(function() {
+ if ($(this).prop("checked")) {
+ selected.push($(this).data('value'))
+ }
+ })
+ menu.callback(selected);
+ }
+
if (this.elementDiv.is(":visible")) {
- this.input.focus();
+ this.input.trigger("focus");
} else if (this.optionSelectTrigger.is(":visible")){
- this.optionSelectTrigger.focus();
+ this.optionSelectTrigger.trigger("focus");
} else {
- this.selectTrigger.focus();
+ this.selectTrigger.trigger("focus");
}
},
- _createMenu: function(opts,callback) {
+ _createMenu: function(menuOptions,opts,callback) {
var that = this;
- var menu = $("
").addClass("red-ui-typedInput-options");
- opts.forEach(function(opt) {
+ var menu = $("
").addClass("red-ui-typedInput-options red-ui-editor-dialog");
+ menu.opts = opts;
+ menu.callback = callback;
+ menuOptions.forEach(function(opt) {
if (typeof opt === 'string') {
opt = {value:opt,label:opt};
}
@@ -287,7 +373,7 @@
if (opt.icon.indexOf("<") === 0) {
$(opt.icon).prependTo(op);
} else if (opt.icon.indexOf("/") !== -1) {
- $('![]()
',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+ $('![]()
',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px; height: 18px;"}).prependTo(op);
} else {
$('',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
}
@@ -297,32 +383,43 @@
if (!opt.icon && !opt.label) {
op.text(opt.value);
}
+ var cb;
+ if (opts.multiple) {
+ cb = $('').css("pointer-events","none").data('value',opt.value).prependTo(op).on("mousedown", function(evt) { evt.preventDefault() });
+ }
- op.click(function(event) {
+ op.on("click", function(event) {
event.preventDefault();
- callback(opt.value);
- that._hideMenu(menu);
+ event.stopPropagation();
+ if (!opts.multiple) {
+ callback(opt.value);
+ that._hideMenu(menu);
+ } else {
+ cb.prop("checked",!cb.prop("checked"));
+ }
});
});
menu.css({
- display: "none",
+ display: "none"
});
menu.appendTo(document.body);
menu.on('keydown', function(evt) {
if (evt.keyCode === 40) {
+ evt.preventDefault();
// DOWN
- $(this).children(":focus").next().focus();
+ $(this).children(":focus").next().trigger("focus");
} else if (evt.keyCode === 38) {
+ evt.preventDefault();
// UP
- $(this).children(":focus").prev().focus();
+ $(this).children(":focus").prev().trigger("focus");
} else if (evt.keyCode === 27) {
+ // ESCAPE
+ evt.preventDefault();
that._hideMenu(menu);
}
+ evt.stopPropagation();
})
-
-
-
return menu;
},
@@ -331,22 +428,37 @@
this.disarmClick = false;
return
}
+ if (menu.opts.multiple) {
+ var selected = {};
+ this.value().split(",").forEach(function(f) {
+ selected[f] = true;
+ })
+ menu.find('input[type="checkbox"]').each(function() {
+ $(this).prop("checked",selected[$(this).data('value')])
+ })
+ }
+
+
var that = this;
var pos = relativeTo.offset();
var height = relativeTo.height();
var menuHeight = menu.height();
- var top = (height+pos.top-3);
+ var top = (height+pos.top);
if (top+menuHeight > $(window).height()) {
top -= (top+menuHeight)-$(window).height()+5;
}
+ if (top < 0) {
+ menu.height(menuHeight+top)
+ top = 0;
+ }
menu.css({
top: top+"px",
- left: (2+pos.left)+"px",
+ left: (pos.left)+"px",
});
menu.slideDown(100);
this._delay(function() {
that.uiSelect.addClass('red-ui-typedInput-focus');
- $(document).on("mousedown.close-property-select", function(event) {
+ $(document).on("mousedown.red-ui-typedInput-close-property-select", function(event) {
if(!$(event.target).closest(menu).length) {
that._hideMenu(menu);
}
@@ -357,21 +469,27 @@
})
});
},
- _getLabelWidth: function(label) {
+ _getLabelWidth: function(label, done) {
var labelWidth = label.outerWidth();
if (labelWidth === 0) {
- var container = $('').css({
+ var wrapper = $('').css({
position:"absolute",
- top:0,
- left:-1000
+ "white-space": "nowrap",
+ top:-2000
}).appendTo(document.body);
+ var container = $('').appendTo(wrapper);
var newTrigger = label.clone().appendTo(container);
- labelWidth = newTrigger.outerWidth();
- container.remove();
+ setTimeout(function() {
+ labelWidth = newTrigger.outerWidth();
+ wrapper.remove();
+ done(labelWidth);
+ },50)
+ } else {
+ done(labelWidth);
}
- return labelWidth;
},
_resize: function() {
+ var that = this;
if (this.uiWidth !== null) {
this.uiSelect.width(this.uiWidth);
}
@@ -380,68 +498,78 @@
this.selectTrigger.addClass("red-ui-typedInput-full-width");
} else {
this.selectTrigger.removeClass("red-ui-typedInput-full-width");
- var labelWidth = this._getLabelWidth(this.selectTrigger);
- this.elementDiv.css('left',labelWidth+"px");
- if (this.optionExpandButton.is(":visible")) {
- this.elementDiv.css('right',"22px");
- } else {
- this.elementDiv.css('right','0');
- this.input.css({
- 'border-top-right-radius': '4px',
- 'border-bottom-right-radius': '4px'
- });
- }
-
- // if (this.optionSelectTrigger) {
- // this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
- // }
-
- if (this.optionSelectTrigger) {
- if (type && type.options && type.hasValue === true) {
- this.optionSelectLabel.css({'left':'auto'})
- var lw = this._getLabelWidth(this.optionSelectLabel);
- this.optionSelectTrigger.css({'width':(23+lw)+"px"});
- this.elementDiv.css('right',(23+lw)+"px");
- this.input.css({
- 'border-top-right-radius': 0,
- 'border-bottom-right-radius': 0
- });
+ this._getLabelWidth(this.selectTrigger, function(labelWidth) {
+ that.elementDiv.css('left',labelWidth+"px");
+ that.valueLabelContainer.css('left',labelWidth+"px");
+ if (that.optionExpandButton.shown) {
+ that.elementDiv.css('right',"22px");
+ that.valueLabelContainer.css('right',"22px");
} else {
- this.optionSelectLabel.css({'left':'0'})
- this.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
- if (!this.optionExpandButton.is(":visible")) {
- this.elementDiv.css({'right':0});
- this.input.css({
- 'border-top-right-radius': '4px',
- 'border-bottom-right-radius': '4px'
+ that.elementDiv.css('right','0');
+ that.valueLabelContainer.css('right','0');
+ that.input.css({
+ 'border-top-right-radius': '4px',
+ 'border-bottom-right-radius': '4px'
+ });
+ }
+ if (that.optionSelectTrigger) {
+ if (type && type.options && type.hasValue === true) {
+ that.optionSelectLabel.css({'left':'auto'})
+ that._getLabelWidth(that.optionSelectLabel, function(lw) {
+ that.optionSelectTrigger.css({'width':(23+lw)+"px"});
+ that.elementDiv.css('right',(23+lw)+"px");
+ that.input.css({
+ 'border-top-right-radius': 0,
+ 'border-bottom-right-radius': 0
+ });
});
+ } else {
+ that.optionSelectLabel.css({'left':'0'})
+ that.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
+ if (!that.optionExpandButton.shown) {
+ that.elementDiv.css({'right':0});
+ that.input.css({
+ 'border-top-right-radius': '4px',
+ 'border-bottom-right-radius': '4px'
+ });
+ }
}
}
- }
+ });
}
},
_updateOptionSelectLabel: function(o) {
var opt = this.typeMap[this.propertyType];
this.optionSelectLabel.empty();
- if (o.icon) {
- if (o.icon.indexOf("<") === 0) {
- $(o.icon).prependTo(this.optionSelectLabel);
- } else if (o.icon.indexOf("/") !== -1) {
- // url
- $('![]()
',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+ if (this.typeMap[this.propertyType].valueLabel) {
+ if (opt.multiple) {
+ this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o);
} else {
- // icon class
- $('',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+ this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o.value);
+ }
+ } else if (!opt.multiple) {
+ if (o.icon) {
+ if (o.icon.indexOf("<") === 0) {
+ $(o.icon).prependTo(this.optionSelectLabel);
+ } else if (o.icon.indexOf("/") !== -1) {
+ // url
+ $('![]()
',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+ } else {
+ // icon class
+ $('',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+ }
+ } else if (o.label) {
+ this.optionSelectLabel.text(o.label);
+ } else {
+ this.optionSelectLabel.text(o.value);
+ }
+ if (opt.hasValue) {
+ this.optionValue = o.value;
+ this._resize();
+ this.input.trigger('change',this.propertyType,this.value());
}
- } else if (o.label) {
- this.optionSelectLabel.text(o.label);
} else {
- this.optionSelectLabel.text(o.value);
- }
- if (opt.hasValue) {
- this.optionValue = o.value;
- this._resize();
- this.input.trigger('change',this.propertyType,this.value());
+ this.optionSelectLabel.text(o.length+" selected");
}
},
_destroy: function() {
@@ -449,6 +577,7 @@
this.optionMenu.remove();
}
this.menu.remove();
+ this.uiSelect.remove();
},
types: function(types) {
var that = this;
@@ -465,11 +594,11 @@
return result;
});
this.selectTrigger.toggleClass("disabled", this.typeList.length === 1);
- this.selectTrigger.find(".fa-sort-desc").toggle(this.typeList.length > 1)
+ this.selectTrigger.find(".fa-caret-down").toggle(this.typeList.length > 1)
if (this.menu) {
this.menu.remove();
}
- this.menu = this._createMenu(this.typeList, function(v) { that.type(v) });
+ this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
this.type(this.typeList[0].value);
} else {
@@ -483,33 +612,52 @@
this._resize();
},
value: function(value) {
+ var that = this;
+ var opt = this.typeMap[this.propertyType];
if (!arguments.length) {
var v = this.input.val();
- if (this.typeMap[this.propertyType].export) {
- v = this.typeMap[this.propertyType].export(v,this.optionValue)
+ if (opt.export) {
+ v = opt.export(v,this.optionValue)
}
return v;
} else {
- var selectedOption;
- if (this.typeMap[this.propertyType].options) {
- for (var i=0;i',{src:opt.icon,style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
+ image.src = mapDeprecatedIcon(opt.icon);
+ $('![]()
',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
}
else {
$('',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
}
- } else {
+ }
+ if (opt.hasValue === false || (opt.showLabel !== false && !opt.icon)) {
this.selectLabel.text(opt.label);
}
if (this.optionMenu) {
@@ -549,13 +700,16 @@
if (opt.options) {
if (this.optionExpandButton) {
this.optionExpandButton.hide();
+ this.optionExpandButton.shown = false;
}
if (this.optionSelectTrigger) {
this.optionSelectTrigger.show();
if (!opt.hasValue) {
this.elementDiv.hide();
+ this.valueLabelContainer.hide();
} else {
this.elementDiv.show();
+ this.valueLabelContainer.hide();
}
this.activeOptions = {};
opt.options.forEach(function(o) {
@@ -569,36 +723,50 @@
if (!that.activeOptions.hasOwnProperty(that.optionValue)) {
that.optionValue = null;
}
- this.optionMenu = this._createMenu(opt.options,function(v){
- that._updateOptionSelectLabel(that.activeOptions[v]);
- if (!opt.hasValue) {
- that.value(that.activeOptions[v].value)
- }
- });
+
var op;
if (!opt.hasValue) {
- var currentVal = this.input.val();
var validValue = false;
- for (var i=0;i');
+ var content = opt.expand.content.call(that,container);
+ var panel = RED.popover.panel(container);
+ panel.container.css({
+ width:that.valueLabelContainer.width()
+ });
+ if (opt.expand.minWidth) {
+ panel.container.css({
+ minWidth: opt.expand.minWidth+"px"
+ });
+ }
+ panel.show({
+ target:that.optionExpandButton,
+ onclose:content.onclose,
+ align: "right"
+ });
+ }
})
} else {
+ this.optionExpandButton.shown = false;
this.optionExpandButton.hide();
}
}
+ this._trigger("typechange",null,this.propertyType);
this.input.trigger('change',this.propertyType,this.value());
}
- if (image) {
- image.onload = function() { that._resize(); }
- image.onerror = function() { that._resize(); }
- } else {
+ if (!image) {
this._resize();
}
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
index 96363e21b..cdf84d02f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -17,9 +17,9 @@
RED.deploy = (function() {
var deploymentTypes = {
- "full":{img:"red/images/deploy-full-o.png"},
- "nodes":{img:"red/images/deploy-nodes-o.png"},
- "flows":{img:"red/images/deploy-flows-o.png"}
+ "full":{img:"red/images/deploy-full-o.svg"},
+ "nodes":{img:"red/images/deploy-nodes-o.svg"},
+ "flows":{img:"red/images/deploy-flows-o.svg"}
}
var ignoreDeployWarnings = {
@@ -36,7 +36,7 @@ RED.deploy = (function() {
function changeDeploymentType(type) {
deploymentType = type;
- $("#btn-deploy-icon").attr("src",deploymentTypes[type].img);
+ $("#red-ui-header-button-deploy-icon").attr("src",deploymentTypes[type].img);
}
/**
@@ -44,62 +44,68 @@ RED.deploy = (function() {
* type: "default" - Button with drop-down options - no further customisation available
* type: "simple" - Button without dropdown. Customisations:
* label: the text to display - default: "Deploy"
- * icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.png"
+ * icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.svg"
*/
function init(options) {
options = options || {};
var type = options.type || "default";
if (type == "default") {
- $('
');
$('').appendTo(message);
- var conflictCheck = $('
'+
+ var conflictCheck = $('
'+
'
'+
'
').appendTo(message);
- var conflictAutoMerge = $(''+
''+
- ''+
+ var conflictAutoMerge = $('
'+
+ ''+
'
').hide().appendTo(message);
- var conflictManualMerge = $(''+
- ''+
+ var conflictManualMerge = $('
'+
+ ''+
'
').hide().appendTo(message);
message.i18n();
@@ -196,22 +202,22 @@ RED.deploy = (function() {
}
},
{
- id: "node-dialog-confirm-deploy-review",
+ id: "red-ui-deploy-dialog-confirm-deploy-review",
text: RED._("deploy.confirm.button.review"),
class: "primary disabled",
click: function() {
- if (!$("#node-dialog-confirm-deploy-review").hasClass('disabled')) {
+ if (!$("#red-ui-deploy-dialog-confirm-deploy-review").hasClass('disabled')) {
RED.diff.showRemoteDiff();
conflictNotification.close();
}
}
},
{
- id: "node-dialog-confirm-deploy-merge",
+ id: "red-ui-deploy-dialog-confirm-deploy-merge",
text: RED._("deploy.confirm.button.merge"),
class: "primary disabled",
click: function() {
- if (!$("#node-dialog-confirm-deploy-merge").hasClass('disabled')) {
+ if (!$("#red-ui-deploy-dialog-confirm-deploy-merge").hasClass('disabled')) {
RED.diff.mergeDiff(currentDiff);
conflictNotification.close();
}
@@ -220,7 +226,7 @@ RED.deploy = (function() {
];
if (activeDeploy) {
buttons.push({
- id: "node-dialog-confirm-deploy-overwrite",
+ id: "red-ui-deploy-dialog-confirm-deploy-overwrite",
text: RED._("deploy.confirm.button.overwrite"),
class: "primary",
click: function() {
@@ -245,11 +251,11 @@ RED.deploy = (function() {
var d = Object.keys(diff.conflicts);
if (d.length === 0) {
conflictAutoMerge.show();
- $("#node-dialog-confirm-deploy-merge").removeClass('disabled')
+ $("#red-ui-deploy-dialog-confirm-deploy-merge").removeClass('disabled')
} else {
conflictManualMerge.show();
}
- $("#node-dialog-confirm-deploy-review").removeClass('disabled')
+ $("#red-ui-deploy-dialog-confirm-deploy-review").removeClass('disabled')
},ellapsed);
})
}
@@ -266,15 +272,15 @@ RED.deploy = (function() {
}
function restart() {
var startTime = Date.now();
- $(".deploy-button-content").css('opacity',0);
- $(".deploy-button-spinner").show();
- var deployWasEnabled = !$("#btn-deploy").hasClass("disabled");
- $("#btn-deploy").addClass("disabled");
+ $(".red-ui-deploy-button-content").css('opacity',0);
+ $(".red-ui-deploy-button-spinner").show();
+ var deployWasEnabled = !$("#red-ui-header-button-deploy").hasClass("disabled");
+ $("#red-ui-header-button-deploy").addClass("disabled");
deployInflight = true;
- $("#header-shade").show();
- $("#editor-shade").show();
- $("#palette-shade").show();
- $("#sidebar-shade").show();
+ $("#red-ui-header-shade").show();
+ $("#red-ui-editor-shade").show();
+ $("#red-ui-palette-shade").show();
+ $("#red-ui-sidebar-shade").show();
$.ajax({
url:"flows",
@@ -284,12 +290,12 @@ RED.deploy = (function() {
}
}).done(function(data,textStatus,xhr) {
if (deployWasEnabled) {
- $("#btn-deploy").removeClass("disabled");
+ $("#red-ui-header-button-deploy").removeClass("disabled");
}
RED.notify(''+RED._("deploy.successfulRestart")+'
',"success"); }).fail(function(xhr,textStatus,err) { if (deployWasEnabled) { - $("#btn-deploy").removeClass("disabled"); + $("#red-ui-header-button-deploy").removeClass("disabled"); } if (xhr.status === 401) { RED.notify(RED._("deploy.deployFailed",{message:RED._("user.notAuthorized")}),"error"); @@ -304,17 +310,17 @@ RED.deploy = (function() { deployInflight = false; var delta = Math.max(0,300-(Date.now()-startTime)); setTimeout(function() { - $(".deploy-button-content").css('opacity',1); - $(".deploy-button-spinner").hide(); - $("#header-shade").hide(); - $("#editor-shade").hide(); - $("#palette-shade").hide(); - $("#sidebar-shade").hide(); + $(".red-ui-deploy-button-content").css('opacity',1); + $(".red-ui-deploy-button-spinner").hide(); + $("#red-ui-header-shade").hide(); + $("#red-ui-editor-shade").hide(); + $("#red-ui-palette-shade").hide(); + $("#red-ui-sidebar-shade").hide(); },delta); }); } function save(skipValidation,force) { - if (!$("#btn-deploy").hasClass("disabled")) { + if (!$("#red-ui-header-button-deploy").hasClass("disabled")) { if (!RED.user.hasPermission("flows.write")) { RED.notify(RED._("user.errors.deploy"),"error"); return; @@ -355,13 +361,13 @@ RED.deploy = (function() { if (hasUnknown && !ignoreDeployWarnings.unknown) { showWarning = true; notificationMessage = ""+RED._('deploy.confirm.unknown')+"
"+ - '"+ + '
"+ RED._('deploy.confirm.confirm')+ "
"; notificationButtons= [ { - id: "node-dialog-confirm-deploy-deploy", + id: "red-ui-deploy-dialog-confirm-deploy-deploy", text: RED._("deploy.confirm.button.confirm"), class: "primary", click: function() { @@ -375,12 +381,12 @@ RED.deploy = (function() { invalidNodes.sort(sortNodeInfo); notificationMessage = ""+RED._('deploy.confirm.improperlyConfigured')+"
"+ - '"+ + '
"+ RED._('deploy.confirm.confirm')+ "
"; notificationButtons= [ { - id: "node-dialog-confirm-deploy-deploy", + id: "red-ui-deploy-dialog-confirm-deploy-deploy", text: RED._("deploy.confirm.button.confirm"), class: "primary", click: function() { @@ -411,9 +417,9 @@ RED.deploy = (function() { var nns = RED.nodes.createCompleteNodeSet(); var startTime = Date.now(); - $(".deploy-button-content").css('opacity',0); - $(".deploy-button-spinner").show(); - $("#btn-deploy").addClass("disabled"); + $(".red-ui-deploy-button-content").css('opacity',0); + $(".red-ui-deploy-button-spinner").show(); + $("#red-ui-header-button-deploy").addClass("disabled"); var data = {flows:nns}; @@ -422,10 +428,10 @@ RED.deploy = (function() { } deployInflight = true; - $("#header-shade").show(); - $("#editor-shade").show(); - $("#palette-shade").show(); - $("#sidebar-shade").show(); + $("#red-ui-header-shade").show(); + $("#red-ui-editor-shade").show(); + $("#red-ui-palette-shade").show(); + $("#red-ui-sidebar-shade").show(); $.ajax({ url:"flows", type: "POST", @@ -476,7 +482,7 @@ RED.deploy = (function() { RED.events.emit("deploy"); }).fail(function(xhr,textStatus,err) { RED.nodes.dirty(true); - $("#btn-deploy").removeClass("disabled"); + $("#red-ui-header-button-deploy").removeClass("disabled"); if (xhr.status === 401) { RED.notify(RED._("deploy.deployFailed",{message:RED._("user.notAuthorized")}),"error"); } else if (xhr.status === 409) { @@ -490,12 +496,12 @@ RED.deploy = (function() { deployInflight = false; var delta = Math.max(0,300-(Date.now()-startTime)); setTimeout(function() { - $(".deploy-button-content").css('opacity',1); - $(".deploy-button-spinner").hide(); - $("#header-shade").hide(); - $("#editor-shade").hide(); - $("#palette-shade").hide(); - $("#sidebar-shade").hide(); + $(".red-ui-deploy-button-content").css('opacity',1); + $(".red-ui-deploy-button-spinner").hide(); + $("#red-ui-header-shade").hide(); + $("#red-ui-editor-shade").hide(); + $("#red-ui-palette-shade").hide(); + $("#red-ui-sidebar-shade").hide(); },delta); }); } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js index bef2ffc69..4ebdcdce9 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js @@ -22,7 +22,7 @@ RED.diff = (function() { } function createDiffTable(container,CurrentDiff) { - var diffList = $('',{class:"node-diff-tab"}).appendTo(container);
+ var tabDiv = $('
',{class:"red-ui-diff-list-flow"}).appendTo(container);
tabDiv.addClass('collapsed');
- var titleRow = $('
',{class:"node-diff-tab-title"}).appendTo(tabDiv);
+ var titleRow = $('
',{class:"red-ui-diff-list-flow-title"}).appendTo(tabDiv);
var nodesDiv = $('
').appendTo(tabDiv);
- var originalCell = $('
',{class:"node-diff-node-entry-cell"}).appendTo(titleRow);
- var localCell = $('
',{class:"node-diff-node-entry-cell node-diff-node-local"}).appendTo(titleRow);
+ var originalCell = $('
',{class:"red-ui-diff-list-node-cell"}).appendTo(titleRow);
+ var localCell = $('
',{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-local"}).appendTo(titleRow);
var remoteCell;
var selectState;
if (remoteDiff) {
- remoteCell = $('
',{class:"node-diff-node-entry-cell node-diff-node-remote"}).appendTo(titleRow);
+ remoteCell = $('
',{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-remote"}).appendTo(titleRow);
}
- $('').appendTo(originalCell);
+ $('').appendTo(originalCell);
createNodeIcon(tab,def).appendTo(originalCell);
var tabForLabel = (object.newTab || object.tab).n;
- var titleSpan = $('',{class:"node-diff-tab-title-meta"}).appendTo(originalCell);
+ var titleSpan = $('',{class:"red-ui-diff-list-flow-title-meta"}).appendTo(originalCell);
if (tabForLabel.type === 'tab') {
titleSpan.text(tabForLabel.label||tabForLabel.id);
} else if (tab.type === 'subflow') {
@@ -87,53 +87,53 @@ RED.diff = (function() {
}
}
if (tab.type !== undefined) {
- var div = $("
",{class:"node-diff-node-entry node-diff-node-props collapsed"}).appendTo(nodesDiv);
- var row = $("
",{class:"node-diff-node-entry-header"}).appendTo(div);
- var originalNodeDiv = $("
",{class:"node-diff-node-entry-cell"}).appendTo(row);
- var localNodeDiv = $("
",{class:"node-diff-node-entry-cell node-diff-node-local"}).appendTo(row);
+ var div = $("
",{class:"red-ui-diff-list-node red-ui-diff-list-node-props collapsed"}).appendTo(nodesDiv);
+ var row = $("
",{class:"red-ui-diff-list-node-header"}).appendTo(div);
+ var originalNodeDiv = $("
",{class:"red-ui-diff-list-node-cell"}).appendTo(row);
+ var localNodeDiv = $("
",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-local"}).appendTo(row);
var localChanged = false;
var remoteChanged = false;
if (!localDiff.newConfig.all[tab.id]) {
- localNodeDiv.addClass("node-diff-empty");
+ localNodeDiv.addClass("red-ui-diff-empty");
} else if (localDiff.added[tab.id]) {
- localNodeDiv.addClass("node-diff-node-added");
+ localNodeDiv.addClass("red-ui-diff-status-added");
localChanged = true;
- $(' ').appendTo(localNodeDiv);
+ $(' ').appendTo(localNodeDiv);
} else if (localDiff.changed[tab.id]) {
- localNodeDiv.addClass("node-diff-node-changed");
+ localNodeDiv.addClass("red-ui-diff-status-changed");
localChanged = true;
- $(' ').appendTo(localNodeDiv);
+ $(' ').appendTo(localNodeDiv);
} else {
- localNodeDiv.addClass("node-diff-node-unchanged");
- $(' ').appendTo(localNodeDiv);
+ localNodeDiv.addClass("red-ui-diff-status-unchanged");
+ $(' ').appendTo(localNodeDiv);
}
var remoteNodeDiv;
if (remoteDiff) {
- remoteNodeDiv = $("
",{class:"node-diff-node-entry-cell node-diff-node-remote"}).appendTo(row);
+ remoteNodeDiv = $("
",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-remote"}).appendTo(row);
if (!remoteDiff.newConfig.all[tab.id]) {
- remoteNodeDiv.addClass("node-diff-empty");
+ remoteNodeDiv.addClass("red-ui-diff-empty");
if (remoteDiff.deleted[tab.id]) {
remoteChanged = true;
}
} else if (remoteDiff.added[tab.id]) {
- remoteNodeDiv.addClass("node-diff-node-added");
+ remoteNodeDiv.addClass("red-ui-diff-status-added");
remoteChanged = true;
- $(' ').appendTo(remoteNodeDiv);
+ $(' ').appendTo(remoteNodeDiv);
} else if (remoteDiff.changed[tab.id]) {
- remoteNodeDiv.addClass("node-diff-node-changed");
+ remoteNodeDiv.addClass("red-ui-diff-status-changed");
remoteChanged = true;
- $(' ').appendTo(remoteNodeDiv);
+ $(' ').appendTo(remoteNodeDiv);
} else {
- remoteNodeDiv.addClass("node-diff-node-unchanged");
- $(' ').appendTo(remoteNodeDiv);
+ remoteNodeDiv.addClass("red-ui-diff-status-unchanged");
+ $(' ').appendTo(remoteNodeDiv);
}
}
- $('').appendTo(originalNodeDiv);
+ $('').appendTo(originalNodeDiv);
$('').text(RED._("diff.flowProperties")).appendTo(originalNodeDiv);
- row.click(function(evt) {
+ row.on("click", function(evt) {
evt.preventDefault();
$(this).parent().toggleClass('collapsed');
});
@@ -143,13 +143,13 @@ RED.diff = (function() {
if (conflicts[tab.id]) {
flowStats.conflicts++;
- if (!localNodeDiv.hasClass("node-diff-empty")) {
- $('').prependTo(localNodeDiv);
+ if (!localNodeDiv.hasClass("red-ui-diff-empty")) {
+ $('').prependTo(localNodeDiv);
}
- if (!remoteNodeDiv.hasClass("node-diff-empty")) {
- $('').prependTo(remoteNodeDiv);
+ if (!remoteNodeDiv.hasClass("red-ui-diff-empty")) {
+ $('').prependTo(remoteNodeDiv);
}
- div.addClass("node-diff-node-entry-conflict");
+ div.addClass("red-ui-diff-list-node-conflict");
} else {
selectState = CurrentDiff.resolutions[tab.id];
}
@@ -157,7 +157,7 @@ RED.diff = (function() {
createNodeConflictRadioBoxes(tab,div,localNodeDiv,remoteNodeDiv,true,!conflicts[tab.id],selectState,CurrentDiff);
}
}
- // var stats = $('',{class:"node-diff-tab-stats"}).appendTo(titleRow);
+ // var stats = $('',{class:"red-ui-diff-list-flow-stats"}).appendTo(titleRow);
var localNodeCount = 0;
var remoteNodeCount = 0;
var seen = {};
@@ -182,21 +182,21 @@ RED.diff = (function() {
}
});
}
- titleRow.click(function(evt) {
- // if (titleRow.parent().find(".node-diff-node-entry:not(.hide)").length > 0) {
+ titleRow.on("click", function(evt) {
+ // if (titleRow.parent().find(".red-ui-diff-list-node:not(.hide)").length > 0) {
titleRow.parent().toggleClass('collapsed');
if ($(this).parent().hasClass('collapsed')) {
- $(this).parent().find('.node-diff-node-entry').addClass('collapsed');
- $(this).parent().find('.debug-message-element').addClass('collapsed');
+ $(this).parent().find('.red-ui-diff-list-node').addClass('collapsed');
+ $(this).parent().find('.red-ui-debug-msg-element').addClass('collapsed');
}
// }
})
if (localDiff.deleted[tab.id]) {
- $(' ').appendTo(localCell);
+ $(' ').appendTo(localCell);
} else if (object.newTab) {
if (localDiff.added[tab.id]) {
- $(' ').appendTo(localCell);
+ $(' ').appendTo(localCell);
} else {
if (tab.id) {
if (localDiff.changed[tab.id]) {
@@ -205,37 +205,37 @@ RED.diff = (function() {
flowStats.local.unchangedCount++;
}
}
- var localStats = $('',{class:"node-diff-tab-stats"}).appendTo(localCell);
- $('').text(RED._('diff.nodeCount',{count:localNodeCount})).appendTo(localStats);
+ var localStats = $('',{class:"red-ui-diff-list-flow-stats"}).appendTo(localCell);
+ $('').text(RED._('diff.nodeCount',{count:localNodeCount})).appendTo(localStats);
if (flowStats.conflicts + flowStats.local.addedCount + flowStats.local.changedCount + flowStats.local.deletedCount > 0) {
- $(' [ ').appendTo(localStats);
+ $(' [ ').appendTo(localStats);
if (flowStats.conflicts > 0) {
- $(' '+flowStats.conflicts+'').appendTo(localStats);
+ $(' '+flowStats.conflicts+'').appendTo(localStats);
}
if (flowStats.local.addedCount > 0) {
- $(' '+flowStats.local.addedCount+'').appendTo(localStats);
+ $(' '+flowStats.local.addedCount+'').appendTo(localStats);
}
if (flowStats.local.changedCount > 0) {
- $(' '+flowStats.local.changedCount+'').appendTo(localStats);
+ $(' '+flowStats.local.changedCount+'').appendTo(localStats);
}
if (flowStats.local.deletedCount > 0) {
- $(' '+flowStats.local.deletedCount+'').appendTo(localStats);
+ $(' '+flowStats.local.deletedCount+'').appendTo(localStats);
}
- $(' ] ').appendTo(localStats);
+ $(' ] ').appendTo(localStats);
}
}
} else {
- localCell.addClass("node-diff-empty");
+ localCell.addClass("red-ui-diff-empty");
}
if (remoteDiff) {
if (remoteDiff.deleted[tab.id]) {
- $(' ').appendTo(remoteCell);
+ $(' ').appendTo(remoteCell);
} else if (object.remoteTab) {
if (remoteDiff.added[tab.id]) {
- $(' ').appendTo(remoteCell);
+ $(' ').appendTo(remoteCell);
} else {
if (tab.id) {
if (remoteDiff.changed[tab.id]) {
@@ -244,31 +244,31 @@ RED.diff = (function() {
flowStats.remote.unchangedCount++;
}
}
- var remoteStats = $('',{class:"node-diff-tab-stats"}).appendTo(remoteCell);
- $('').text(RED._('diff.nodeCount',{count:remoteNodeCount})).appendTo(remoteStats);
+ var remoteStats = $('',{class:"red-ui-diff-list-flow-stats"}).appendTo(remoteCell);
+ $('').text(RED._('diff.nodeCount',{count:remoteNodeCount})).appendTo(remoteStats);
if (flowStats.conflicts + flowStats.remote.addedCount + flowStats.remote.changedCount + flowStats.remote.deletedCount > 0) {
- $(' [ ').appendTo(remoteStats);
+ $(' [ ').appendTo(remoteStats);
if (flowStats.conflicts > 0) {
- $(' '+flowStats.conflicts+'').appendTo(remoteStats);
+ $(' '+flowStats.conflicts+'').appendTo(remoteStats);
}
if (flowStats.remote.addedCount > 0) {
- $(' '+flowStats.remote.addedCount+'').appendTo(remoteStats);
+ $(' '+flowStats.remote.addedCount+'').appendTo(remoteStats);
}
if (flowStats.remote.changedCount > 0) {
- $(' '+flowStats.remote.changedCount+'').appendTo(remoteStats);
+ $(' '+flowStats.remote.changedCount+'').appendTo(remoteStats);
}
if (flowStats.remote.deletedCount > 0) {
- $(' '+flowStats.remote.deletedCount+'').appendTo(remoteStats);
+ $(' '+flowStats.remote.deletedCount+'').appendTo(remoteStats);
}
- $(' ] ').appendTo(remoteStats);
+ $(' ] ').appendTo(remoteStats);
}
}
} else {
- remoteCell.addClass("node-diff-empty");
+ remoteCell.addClass("red-ui-diff-empty");
}
selectState = "";
if (flowStats.conflicts > 0) {
- titleRow.addClass("node-diff-node-entry-conflict");
+ titleRow.addClass("red-ui-diff-list-node-conflict");
} else {
selectState = CurrentDiff.resolutions[tab.id];
}
@@ -279,8 +279,8 @@ RED.diff = (function() {
}
}
- if (tabDiv.find(".node-diff-node-entry").length === 0) {
- tabDiv.addClass("node-diff-tab-empty");
+ if (tabDiv.find(".red-ui-diff-list-node").length === 0) {
+ tabDiv.addClass("red-ui-diff-list-flow-empty");
}
container.i18n();
}
@@ -288,10 +288,10 @@ RED.diff = (function() {
return diffList;
}
function buildDiffPanel(container,diff,options) {
- var diffPanel = $('').appendTo(container);
- var diffHeaders = $('').appendTo(diffPanel);
+ var diffPanel = $('').appendTo(container);
+ var diffHeaders = $('').appendTo(diffPanel);
if (options.mode === "merge") {
- diffPanel.addClass("node-dialog-view-diff-panel-merge");
+ diffPanel.addClass("red-ui-diff-panel-merge");
}
var diffList = createDiffTable(diffPanel, diff);
@@ -304,13 +304,13 @@ RED.diff = (function() {
if (remoteDiff !== undefined) {
- diffPanel.addClass('node-diff-three-way');
+ diffPanel.addClass('red-ui-diff-three-way');
var localTitle = options.oldRevTitle || RED._('diff.local');
var remoteTitle = options.newRevTitle || RED._('diff.remote');
$('').text(localTitle).appendTo(diffHeaders);
$('').text(remoteTitle).appendTo(diffHeaders);
} else {
- diffPanel.removeClass('node-diff-three-way');
+ diffPanel.removeClass('red-ui-diff-three-way');
}
return {
@@ -399,7 +399,7 @@ RED.diff = (function() {
diff: localDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -422,7 +422,7 @@ RED.diff = (function() {
diff: localDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -443,7 +443,7 @@ RED.diff = (function() {
remoteDiff: remoteDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -458,7 +458,7 @@ RED.diff = (function() {
};
}
function formatWireProperty(wires,allNodes) {
- var result = $("
",{class:"node-diff-property-wires"})
+ var result = $("
",{class:"red-ui-diff-list-wires"})
var list = $("
",{class:"node-diff-node-entry-node"});
+ var nodeDiv = $("
",{class:"red-ui-diff-list-node-icon"});
var colour = RED.utils.getNodeColor(node.type,def);
var icon_url = RED.utils.getNodeIcon(def,node);
if (node.type === 'tab') {
@@ -497,17 +497,16 @@ RED.diff = (function() {
}
nodeDiv.css('backgroundColor',colour);
- var iconContainer = $('',{class:"palette_icon_container"}).appendTo(nodeDiv);
+ var iconContainer = $('',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
RED.utils.createIconElement(icon_url, iconContainer, false);
return nodeDiv;
}
function createNode(node,def) {
- var nodeTitleDiv = $("
",{class:"node-diff-node-entry-title"})
+ var nodeTitleDiv = $("
",{class:"red-ui-diff-list-node-title"})
createNodeIcon(node,def).appendTo(nodeTitleDiv);
- var contentDiv = $('
',{class:"node-diff-node-description"}).appendTo(nodeTitleDiv);
var nodeLabel = node.label || node.name || node.id;
- $('',{class:"node-diff-node-label"}).text(nodeLabel).appendTo(contentDiv);
+ $('
',{class:"red-ui-diff-list-node-description"}).text(nodeLabel).appendTo(nodeTitleDiv);
return nodeTitleDiv;
}
function createNodeDiffRow(node,stats,CurrentDiff) {
@@ -550,7 +549,7 @@ RED.diff = (function() {
if (def === undefined) {
if (/^subflow:/.test(node.type)) {
def = {
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9",
defaults:{name:{value:""}}
@@ -559,80 +558,80 @@ RED.diff = (function() {
def = {};
}
}
- var div = $("
",{class:"node-diff-node-entry collapsed"});
- var row = $("
",{class:"node-diff-node-entry-header"}).appendTo(div);
+ var div = $("
",{class:"red-ui-diff-list-node collapsed"});
+ var row = $("
",{class:"red-ui-diff-list-node-header"}).appendTo(div);
- var originalNodeDiv = $("
",{class:"node-diff-node-entry-cell"}).appendTo(row);
- var localNodeDiv = $("
",{class:"node-diff-node-entry-cell node-diff-node-local"}).appendTo(row);
+ var originalNodeDiv = $("
",{class:"red-ui-diff-list-node-cell"}).appendTo(row);
+ var localNodeDiv = $("
",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-local"}).appendTo(row);
var remoteNodeDiv;
var chevron;
if (remoteDiff) {
- remoteNodeDiv = $("
",{class:"node-diff-node-entry-cell node-diff-node-remote"}).appendTo(row);
+ remoteNodeDiv = $("
",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-remote"}).appendTo(row);
}
- $('').appendTo(originalNodeDiv);
+ $('').appendTo(originalNodeDiv);
if (unChanged) {
stats.local.unchangedCount++;
createNode(node,def).appendTo(originalNodeDiv);
- localNodeDiv.addClass("node-diff-node-unchanged");
- $(' ').appendTo(localNodeDiv);
+ localNodeDiv.addClass("red-ui-diff-status-unchanged");
+ $(' ').appendTo(localNodeDiv);
if (remoteDiff) {
stats.remote.unchangedCount++;
- remoteNodeDiv.addClass("node-diff-node-unchanged");
- $(' ').appendTo(remoteNodeDiv);
+ remoteNodeDiv.addClass("red-ui-diff-status-unchanged");
+ $(' ').appendTo(remoteNodeDiv);
}
- div.addClass("node-diff-node-unchanged");
+ div.addClass("red-ui-diff-status-unchanged");
} else if (localDiff.added[node.id]) {
- localNodeDiv.addClass("node-diff-node-added");
+ localNodeDiv.addClass("red-ui-diff-status-added");
if (remoteNodeDiv) {
- remoteNodeDiv.addClass("node-diff-empty");
+ remoteNodeDiv.addClass("red-ui-diff-empty");
}
- $(' ').appendTo(localNodeDiv);
+ $(' ').appendTo(localNodeDiv);
createNode(node,def).appendTo(originalNodeDiv);
} else if (remoteDiff && remoteDiff.added[node.id]) {
- localNodeDiv.addClass("node-diff-empty");
- remoteNodeDiv.addClass("node-diff-node-added");
- $(' ').appendTo(remoteNodeDiv);
+ localNodeDiv.addClass("red-ui-diff-empty");
+ remoteNodeDiv.addClass("red-ui-diff-status-added");
+ $(' ').appendTo(remoteNodeDiv);
createNode(node,def).appendTo(originalNodeDiv);
} else {
createNode(node,def).appendTo(originalNodeDiv);
if (localDiff.moved[node.id]) {
var localN = localDiff.newConfig.all[node.id];
if (!localDiff.deleted[node.z] && node.z !== localN.z && node.z !== "" && !localDiff.newConfig.all[node.z]) {
- localNodeDiv.addClass("node-diff-empty");
+ localNodeDiv.addClass("red-ui-diff-empty");
} else {
- localNodeDiv.addClass("node-diff-node-moved");
+ localNodeDiv.addClass("red-ui-diff-status-moved");
var localMovedMessage = "";
if (node.z === localN.z) {
localMovedMessage = RED._("diff.type.movedFrom",{id:(localDiff.currentConfig.all[node.id].z||'global')});
} else {
localMovedMessage = RED._("diff.type.movedTo",{id:(localN.z||'global')});
}
- $(' '+localMovedMessage+'').appendTo(localNodeDiv);
+ $(' '+localMovedMessage+'').appendTo(localNodeDiv);
}
localChanged = true;
} else if (localDiff.deleted[node.z]) {
- localNodeDiv.addClass("node-diff-empty");
+ localNodeDiv.addClass("red-ui-diff-empty");
localChanged = true;
} else if (localDiff.deleted[node.id]) {
- localNodeDiv.addClass("node-diff-node-deleted");
- $(' ').appendTo(localNodeDiv);
+ localNodeDiv.addClass("red-ui-diff-status-deleted");
+ $(' ').appendTo(localNodeDiv);
localChanged = true;
} else if (localDiff.changed[node.id]) {
if (localDiff.newConfig.all[node.id].z !== node.z) {
- localNodeDiv.addClass("node-diff-empty");
+ localNodeDiv.addClass("red-ui-diff-empty");
} else {
- localNodeDiv.addClass("node-diff-node-changed");
- $(' ').appendTo(localNodeDiv);
+ localNodeDiv.addClass("red-ui-diff-status-changed");
+ $(' ').appendTo(localNodeDiv);
localChanged = true;
}
} else {
if (localDiff.newConfig.all[node.id].z !== node.z) {
- localNodeDiv.addClass("node-diff-empty");
+ localNodeDiv.addClass("red-ui-diff-empty");
} else {
stats.local.unchangedCount++;
- localNodeDiv.addClass("node-diff-node-unchanged");
- $(' ').appendTo(localNodeDiv);
+ localNodeDiv.addClass("red-ui-diff-status-unchanged");
+ $(' ').appendTo(localNodeDiv);
}
}
@@ -640,36 +639,36 @@ RED.diff = (function() {
if (remoteDiff.moved[node.id]) {
var remoteN = remoteDiff.newConfig.all[node.id];
if (!remoteDiff.deleted[node.z] && node.z !== remoteN.z && node.z !== "" && !remoteDiff.newConfig.all[node.z]) {
- remoteNodeDiv.addClass("node-diff-empty");
+ remoteNodeDiv.addClass("red-ui-diff-empty");
} else {
- remoteNodeDiv.addClass("node-diff-node-moved");
+ remoteNodeDiv.addClass("red-ui-diff-status-moved");
var remoteMovedMessage = "";
if (node.z === remoteN.z) {
remoteMovedMessage = RED._("diff.type.movedFrom",{id:(remoteDiff.currentConfig.all[node.id].z||'global')});
} else {
remoteMovedMessage = RED._("diff.type.movedTo",{id:(remoteN.z||'global')});
}
- $(' '+remoteMovedMessage+'').appendTo(remoteNodeDiv);
+ $(' '+remoteMovedMessage+'').appendTo(remoteNodeDiv);
}
} else if (remoteDiff.deleted[node.z]) {
- remoteNodeDiv.addClass("node-diff-empty");
+ remoteNodeDiv.addClass("red-ui-diff-empty");
} else if (remoteDiff.deleted[node.id]) {
- remoteNodeDiv.addClass("node-diff-node-deleted");
- $(' ').appendTo(remoteNodeDiv);
+ remoteNodeDiv.addClass("red-ui-diff-status-deleted");
+ $(' ').appendTo(remoteNodeDiv);
} else if (remoteDiff.changed[node.id]) {
if (remoteDiff.newConfig.all[node.id].z !== node.z) {
- remoteNodeDiv.addClass("node-diff-empty");
+ remoteNodeDiv.addClass("red-ui-diff-empty");
} else {
- remoteNodeDiv.addClass("node-diff-node-changed");
- $(' ').appendTo(remoteNodeDiv);
+ remoteNodeDiv.addClass("red-ui-diff-status-changed");
+ $(' ').appendTo(remoteNodeDiv);
}
} else {
if (remoteDiff.newConfig.all[node.id].z !== node.z) {
- remoteNodeDiv.addClass("node-diff-empty");
+ remoteNodeDiv.addClass("red-ui-diff-empty");
} else {
stats.remote.unchangedCount++;
- remoteNodeDiv.addClass("node-diff-node-unchanged");
- $(' ').appendTo(remoteNodeDiv);
+ remoteNodeDiv.addClass("red-ui-diff-status-unchanged");
+ $(' ').appendTo(remoteNodeDiv);
}
}
}
@@ -692,22 +691,22 @@ RED.diff = (function() {
if (conflicted) {
stats.conflicts++;
- if (!localNodeDiv.hasClass("node-diff-empty")) {
- $('').prependTo(localNodeDiv);
+ if (!localNodeDiv.hasClass("red-ui-diff-empty")) {
+ $('').prependTo(localNodeDiv);
}
- if (!remoteNodeDiv.hasClass("node-diff-empty")) {
- $('').prependTo(remoteNodeDiv);
+ if (!remoteNodeDiv.hasClass("red-ui-diff-empty")) {
+ $('').prependTo(remoteNodeDiv);
}
- div.addClass("node-diff-node-entry-conflict");
+ div.addClass("red-ui-diff-list-node-conflict");
} else {
selectState = CurrentDiff.resolutions[node.id];
}
// Node row
createNodeConflictRadioBoxes(node,div,localNodeDiv,remoteNodeDiv,false,!conflicted,selectState,CurrentDiff);
- row.click(function(evt) {
+ row.on("click", function(evt) {
$(this).parent().toggleClass('collapsed');
- if($(this).siblings('.node-diff-node-entry-properties').length === 0) {
+ if($(this).siblings('.red-ui-diff-list-node-properties').length === 0) {
createNodePropertiesTable(def,node,localNode,remoteNode).appendTo(div);
}
});
@@ -722,7 +721,7 @@ RED.diff = (function() {
remoteNode = remoteNodeObj.node;
}
- var nodePropertiesDiv = $("
",{class:"node-diff-node-entry-properties"});
+ var nodePropertiesDiv = $("
",{class:"red-ui-diff-list-node-properties"});
var nodePropertiesTable = $("").appendTo(nodePropertiesDiv);
var nodePropertiesTableCols = $('
| ",{class:"node-diff-property-cell-label"}).text("id").appendTo(row); - localCell = $(" | ",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + $(" | ",{class:"red-ui-diff-list-cell-label"}).text("id").appendTo(row); + localCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { - localCell.addClass("node-diff-node-unchanged"); - $('').appendTo(localCell); - element = $('').appendTo(localCell); + localCell.addClass("red-ui-diff-status-unchanged"); + $('').appendTo(localCell); + element = $('').appendTo(localCell); propertyElements['local.id'] = RED.utils.createObjectElement(localNode.id).appendTo(element); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $(" | ",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); - remoteCell.addClass("node-diff-node-unchanged"); + remoteCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); + remoteCell.addClass("red-ui-diff-status-unchanged"); if (remoteNode) { - $('').appendTo(remoteCell); - element = $('').appendTo(remoteCell); + $('').appendTo(remoteCell); + element = $('').appendTo(remoteCell); propertyElements['remote.id'] = RED.utils.createObjectElement(remoteNode.id).appendTo(element); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } @@ -785,12 +784,12 @@ RED.diff = (function() { conflict = true; } row = $(" |
| ",{class:"node-diff-property-cell-label"}).text("position").appendTo(row); - localCell = $(" | ",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + $(" | ",{class:"red-ui-diff-list-cell-label"}).text("position").appendTo(row); + localCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { - localCell.addClass("node-diff-node-"+(localChanged?"changed":"unchanged")); - $(''+(localChanged?'':'')+'').appendTo(localCell); - element = $('').appendTo(localCell); + localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged")); + $(''+(localChanged?'':'')+'').appendTo(localCell); + element = $('').appendTo(localCell); propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y}, { path: "position", @@ -803,15 +802,15 @@ RED.diff = (function() { } ).appendTo(element); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $(" | ",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); - remoteCell.addClass("node-diff-node-"+(remoteChanged?"changed":"unchanged")); + remoteCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); + remoteCell.addClass("red-ui-diff-status-"+(remoteChanged?"changed":"unchanged")); if (remoteNode) { - $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); - element = $('').appendTo(remoteCell); + $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); + element = $('').appendTo(remoteCell); propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y}, { path: "position", @@ -824,7 +823,7 @@ RED.diff = (function() { } ).appendTo(element); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } } @@ -853,34 +852,34 @@ RED.diff = (function() { conflict = true; } row = $(" |
| ",{class:"node-diff-property-cell-label"}).text("wires").appendTo(row); - localCell = $(" | ",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + $(" | ",{class:"red-ui-diff-list-cell-label"}).text("wires").appendTo(row); + localCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { if (!conflict) { - localCell.addClass("node-diff-node-"+(localChanged?"changed":"unchanged")); - $(''+(localChanged?'':'')+'').appendTo(localCell); + localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged")); + $(''+(localChanged?'':'')+'').appendTo(localCell); } else { - localCell.addClass("node-diff-node-conflict"); - $('').appendTo(localCell); + localCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(localCell); } formatWireProperty(localNode.wires,localNodeObj.all).appendTo(localCell); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $(" | ",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); + remoteCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); if (remoteNode) { if (!conflict) { - remoteCell.addClass("node-diff-node-"+(remoteChanged?"changed":"unchanged")); - $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); + remoteCell.addClass("red-ui-diff-status-"+(remoteChanged?"changed":"unchanged")); + $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); } else { - remoteCell.addClass("node-diff-node-conflict"); - $('').appendTo(remoteCell); + remoteCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(remoteCell); } formatWireProperty(remoteNode.wires,remoteNodeObj.all).appendTo(remoteCell); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } } @@ -926,17 +925,17 @@ RED.diff = (function() { } row = $(" |
| ",{class:"node-diff-property-cell-label"}).text(d).appendTo(row); - localCell = $(" | ",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + var propertyNameCell = $(" | ",{class:"red-ui-diff-list-cell-label"}).text(d).appendTo(row); + localCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { if (!conflict) { - localCell.addClass("node-diff-node-"+(localChanged?"changed":"unchanged")); - $(''+(localChanged?'':'')+'').appendTo(localCell); + localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged")); + $(''+(localChanged?'':'')+'').appendTo(localCell); } else { - localCell.addClass("node-diff-node-conflict"); - $('').appendTo(localCell); + localCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(localCell); } - element = $('').appendTo(localCell); + element = $('').appendTo(localCell); propertyElements['local.'+d] = RED.utils.createObjectElement(localNode[d], { path: d, @@ -949,19 +948,19 @@ RED.diff = (function() { } ).appendTo(element); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $(" | ",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); + remoteCell = $(" | ",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); if (remoteNode) { if (!conflict) { - remoteCell.addClass("node-diff-node-"+(remoteChanged?"changed":"unchanged")); - $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); + remoteCell.addClass("red-ui-diff-status-"+(remoteChanged?"changed":"unchanged")); + $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); } else { - remoteCell.addClass("node-diff-node-conflict"); - $('').appendTo(remoteCell); + remoteCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(remoteCell); } - element = $('').appendTo(remoteCell); + element = $('').appendTo(remoteCell); propertyElements['remote.'+d] = RED.utils.createObjectElement(remoteNode[d], { path: d, @@ -974,12 +973,12 @@ RED.diff = (function() { } ).appendTo(element); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } if (localNode && remoteNode && typeof localNode[d] === "string") { if (/\n/.test(localNode[d]) || /\n/.test(remoteNode[d])) { - $('').click(function() { + $('').on("click", function() { showTextDiff(localNode[d],remoteNode[d]); }).appendTo(propertyNameCell); } @@ -990,10 +989,10 @@ RED.diff = (function() { return nodePropertiesDiv; } function createNodeConflictRadioBoxes(node,row,localDiv,remoteDiv,propertiesTable,hide,state,diff) { - var safeNodeId = "node-diff-selectbox-"+node.id.replace(/\./g,'-')+(propertiesTable?"-props":""); + var safeNodeId = "red-ui-diff-selectbox-"+node.id.replace(/\./g,'-')+(propertiesTable?"-props":""); var className = ""; if (node.z||propertiesTable) { - className = "node-diff-selectbox-tab-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); + className = "red-ui-diff-selectbox-tab-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); } var titleRow = !propertiesTable && (node.type === 'tab' || node.type === 'subflow'); var changeHandler = function(evt) { @@ -1001,44 +1000,44 @@ RED.diff = (function() { if (node.type === undefined) { // TODO: handle globals } else if (titleRow) { - className = "node-diff-selectbox-tab-"+node.id.replace(/\./g,'-'); + className = "red-ui-diff-selectbox-tab-"+node.id.replace(/\./g,'-'); $("."+className+"-"+this.value).prop('checked',true); if (this.value === 'local') { - $("."+className+"-"+this.value).closest(".node-diff-node-entry").addClass("node-diff-select-local"); - $("."+className+"-"+this.value).closest(".node-diff-node-entry").removeClass("node-diff-select-remote"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").addClass("red-ui-diff-select-local"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").removeClass("red-ui-diff-select-remote"); } else { - $("."+className+"-"+this.value).closest(".node-diff-node-entry").removeClass("node-diff-select-local"); - $("."+className+"-"+this.value).closest(".node-diff-node-entry").addClass("node-diff-select-remote"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").removeClass("red-ui-diff-select-local"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").addClass("red-ui-diff-select-remote"); } } else { // Individual node or properties table - var parentId = "node-diff-selectbox-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); + var parentId = "red-ui-diff-selectbox-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); $('#'+parentId+"-local").prop('checked',false); $('#'+parentId+"-remote").prop('checked',false); - var titleRowDiv = $('#'+parentId+"-local").closest(".node-diff-tab").find(".node-diff-tab-title"); - titleRowDiv.removeClass("node-diff-select-local"); - titleRowDiv.removeClass("node-diff-select-remote"); + var titleRowDiv = $('#'+parentId+"-local").closest(".red-ui-diff-list-flow").find(".red-ui-diff-list-flow-title"); + titleRowDiv.removeClass("red-ui-diff-select-local"); + titleRowDiv.removeClass("red-ui-diff-select-remote"); } if (this.value === 'local') { - row.removeClass("node-diff-select-remote"); - row.addClass("node-diff-select-local"); + row.removeClass("red-ui-diff-select-remote"); + row.addClass("red-ui-diff-select-local"); } else if (this.value === 'remote') { - row.addClass("node-diff-select-remote"); - row.removeClass("node-diff-select-local"); + row.addClass("red-ui-diff-select-remote"); + row.removeClass("red-ui-diff-select-local"); } refreshConflictHeader(diff); } - var localSelectDiv = $(' |