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 9c50927da..7252d0998 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
@@ -63,45 +63,47 @@ RED.tabs = (function() {
var collapsedButtonsRow = $('').appendTo(wrapper);
- var selectButton = $('').appendTo(collapsedButtonsRow);
- selectButton.addClass("red-ui-tab-link-button-menu")
- selectButton.click(function(evt) {
- evt.preventDefault();
- if (!collapsibleMenu) {
- var pinnedOptions = [];
- var options = [];
- ul.children().each(function(i,el) {
- var id = $(el).data('tabId');
- var opt = {
- id:"red-ui-tabs-menu-option-"+id,
- icon: tabs[id].iconClass || defaultTabIcon,
- label: tabs[id].name,
- onselect: function() {
- activateTab(id);
+ if (options.menu !== false) {
+ var selectButton = $('').appendTo(collapsedButtonsRow);
+ selectButton.addClass("red-ui-tab-link-button-menu")
+ selectButton.click(function(evt) {
+ evt.preventDefault();
+ if (!collapsibleMenu) {
+ var pinnedOptions = [];
+ var options = [];
+ ul.children().each(function(i,el) {
+ var id = $(el).data('tabId');
+ var opt = {
+ id:"red-ui-tabs-menu-option-"+id,
+ icon: tabs[id].iconClass || defaultTabIcon,
+ label: tabs[id].name,
+ onselect: function() {
+ activateTab(id);
+ }
+ };
+ if (tabs[id].pinned) {
+ pinnedOptions.push(opt);
+ } else {
+ options.push(opt);
}
- };
- if (tabs[id].pinned) {
- pinnedOptions.push(opt);
- } else {
- options.push(opt);
- }
- });
- options = pinnedOptions.concat(options);
- collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
+ });
+ options = pinnedOptions.concat(options);
+ collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
+ collapsibleMenu.css({
+ position: "absolute"
+ })
+ collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
+ collapsibleMenu.on('mouseup', function() { $(this).hide() });
+ collapsibleMenu.appendTo("body");
+ }
+ var elementPos = selectButton.offset();
collapsibleMenu.css({
- position: "absolute"
+ top: (elementPos.top+selectButton.height()-20)+"px",
+ left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
})
- collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
- collapsibleMenu.on('mouseup', function() { $(this).hide() });
- collapsibleMenu.appendTo("body");
- }
- var elementPos = selectButton.offset();
- collapsibleMenu.css({
- top: (elementPos.top+selectButton.height()-20)+"px",
- left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
+ collapsibleMenu.toggle();
})
- collapsibleMenu.toggle();
- })
+ }
}
@@ -336,7 +338,11 @@ RED.tabs = (function() {
pinnedLink.insertAfter(collapsedButtonsRow.find("a.red-ui-tab-link-button-pinned:last"));
}
} else {
- pinnedLink.insertBefore(collapsedButtonsRow.find("a:last"));
+ if (options.menu !== false) {
+ pinnedLink.insertBefore(collapsedButtonsRow.find("a:last"));
+ } else {
+ pinnedLink.appendTo(collapsedButtonsRow);
+ }
}
pinnedLink.attr('id',li.attr('id')+"-link-button");
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 8bc91561d..3fc0bfedf 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -884,9 +884,9 @@ RED.editor = (function() {
function buildDescriptionForm(container,node) {
var dialogForm = $('').appendTo(container);
- var row = $('').appendTo(dialogForm);
- $('').appendTo(row);
- $('').appendTo(row);
+ var toolbarRow = $('').appendTo(dialogForm);
+ var row = $('').appendTo(dialogForm);
+ $('').appendTo(row);
var nodeInfoEditor = RED.editor.createEditor({
id: "node-info-input-info-editor",
mode: 'ace/mode/markdown',
@@ -895,6 +895,9 @@ RED.editor = (function() {
if (node.info) {
nodeInfoEditor.getSession().setValue(node.info, -1);
}
+ var toolbar = RED.editor.types._markdown.buildToolbar(toolbarRow,nodeInfoEditor);
+
+ $('').appendTo(toolbar);
$('#node-info-input-info-expand').click(function(e) {
e.preventDefault();
@@ -1267,7 +1270,8 @@ RED.editor = (function() {
RED.tray.resize();
}
},
- collapsible: true
+ collapsible: true,
+ menu: false
});
if (editing_node) {
RED.sidebar.info.refresh(editing_node);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
index 3e34591c0..fb7f141d9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -16,37 +16,36 @@
RED.editor.types._markdown = (function() {
+ var toolbarTemplate = ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''+
+ ''
+ '
';
+
var template = '';
+ ''+
+ '';
var panels;
@@ -137,6 +136,11 @@ RED.editor.types._markdown = (function() {
}
});
panels.ratio(1);
+ var toolbar = RED.editor.types._markdown.buildToolbar($("#node-input-markdown-toolbar"), expressionEditor);
+
+ $(''+
+ ''+
+ '').appendTo(toolbar);
$("#node-btn-markdown-preview").click(function(e) {
e.preventDefault();
@@ -149,38 +153,6 @@ RED.editor.types._markdown = (function() {
}
});
- $('#node-input-markdown-toolbar').find('button[data-style]').each(function(el) {
- var style = styleActions[$(this).data('style')];
- $(this).click(function(e) {
- e.preventDefault();
- var current = expressionEditor.getSelectedText();
- var range = expressionEditor.selection.getRange();
- if (style.newline) {
- var offset = 0;
- var beforeOffset = ((style.before||"").match(/\n/g)||[]).length;
- var afterOffset = ((style.after||"").match(/\n/g)||[]).length;
- for (var i = range.start.row; i<= range.end.row+offset; i++) {
- if (style.before) {
- expressionEditor.session.insert({row:i, column:0},style.before);
- offset += beforeOffset;
- i += beforeOffset;
- }
- if (style.after) {
- expressionEditor.session.insert({row:i, column:Infinity},style.after);
- offset += afterOffset;
- i += afterOffset;
- }
- }
- } else {
- expressionEditor.session.replace(expressionEditor.selection.getRange(), (style.before||"")+current+(style.after||""));
- }
- expressionEditor.focus();
- });
- if (style.tooltip) {
- RED.popover.tooltip($(this),style.tooltip);
- }
-
- })
if (options.cursor) {
expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
@@ -197,7 +169,42 @@ RED.editor.types._markdown = (function() {
show: function() {}
}
RED.tray.show(trayOptions);
+ },
+ buildToolbar: function(container, editor) {
+ var toolbar = $(toolbarTemplate).appendTo(container);
+ toolbar.find('button[data-style]').each(function(el) {
+ var style = styleActions[$(this).data('style')];
+ $(this).click(function(e) {
+ e.preventDefault();
+ var current = editor.getSelectedText();
+ var range = editor.selection.getRange();
+ if (style.newline) {
+ var offset = 0;
+ var beforeOffset = ((style.before||"").match(/\n/g)||[]).length;
+ var afterOffset = ((style.after||"").match(/\n/g)||[]).length;
+ for (var i = range.start.row; i<= range.end.row+offset; i++) {
+ if (style.before) {
+ editor.session.insert({row:i, column:0},style.before);
+ offset += beforeOffset;
+ i += beforeOffset;
+ }
+ if (style.after) {
+ editor.session.insert({row:i, column:Infinity},style.after);
+ offset += afterOffset;
+ i += afterOffset;
+ }
+ }
+ } else {
+ editor.session.replace(editor.selection.getRange(), (style.before||"")+current+(style.after||""));
+ }
+ editor.focus();
+ });
+ if (style.tooltip) {
+ RED.popover.tooltip($(this),style.tooltip);
+ }
+ })
+ return toolbar;
}
}
})();
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.html b/packages/node_modules/@node-red/nodes/core/core/80-function.html
index 441edcac8..bb13016b1 100644
--- a/packages/node_modules/@node-red/nodes/core/core/80-function.html
+++ b/packages/node_modules/@node-red/nodes/core/core/80-function.html
@@ -17,7 +17,6 @@
-