diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index e618c18a0..769fcaa44 100644 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json @@ -27,8 +27,7 @@ "status": "Status", "enabled": "Enabled", "disabled":"Disabled", - "info": "Description", - "tip": "Description accepts Markdown and will appear in the Info tab." + "info": "Description" }, "menu": { "label": { @@ -279,7 +278,6 @@ "deleteSubflow": "delete subflow", "info": "Description", "category": "Category", - "format":"markdown format", "errors": { "noNodesSelected": "Cannot create subflow: no nodes selected", "multipleInputsToSelection": "Cannot create subflow: multiple inputs to selection" @@ -719,7 +717,8 @@ "format": "format JSON" }, "markdownEditor": { - "title": "Markdown editor" + "title": "Markdown editor", + "format": "Formatted with markdown" }, "bufferEditor": { "title": "Buffer editor", diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json index 2b9df9e45..bf5e98520 100644 --- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json @@ -27,8 +27,7 @@ "status": "状態", "enabled": "有効", "disabled": "無効", - "info": "詳細", - "tip": "マークダウン形式で記述した「詳細」は「情報タブ」に表示されます。" + "info": "詳細" }, "menu": { "label": { @@ -278,7 +277,6 @@ "deleteSubflow": "サブフローを削除", "info": "詳細", "category": "カテゴリ", - "format": "マークダウン形式", "errors": { "noNodesSelected": "サブフローを作成できません: ノードが選択されていません", "multipleInputsToSelection": "サブフローを作成できません: 複数の入力が選択されています" diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json index 93cf323ea..975a20448 100644 --- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json @@ -22,8 +22,7 @@ "status": "状态", "enabled": "有效", "disabled": "无效", - "info": "详细描述", - "tip": "详细描述支持Markdown轻量级标记语言,并将出现在信息标签中。" + "info": "详细描述" }, "menu": { "label": { @@ -191,7 +190,6 @@ "output": "输出:", "deleteSubflow": "删除子流程", "info": "详细描述", - "format": "标记格式", "errors": { "noNodesSelected": "无法创建子流程: 未选择节点", "multipleInputsToSelection": "无法创建子流程: 多个输入到了选择" diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js index 5b5057666..50aa5eb83 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js @@ -38,7 +38,7 @@ RED.popover = (function() { var direction = options.direction || "right"; var trigger = options.trigger; var content = options.content; - var delay = options.delay; + var delay = options.delay || { show: 750, hide: 50 }; var autoClose = options.autoClose; var width = options.width||"auto"; var size = options.size||"default"; @@ -172,6 +172,18 @@ RED.popover = (function() { openPopup(); } }); + if (autoClose) { + target.on('mouseleave disabled', function(e) { + if (timer) { + clearTimeout(timer); + } + if (active) { + active = false; + setTimeout(closePopup,autoClose); + } + }); + } + } else if (trigger === 'modal') { $(document).on('mousedown.modal-popover-close', function (event) { var target = event.target; 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 e261fefd4..86d37761e 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 @@ -929,7 +929,7 @@ RED.editor = (function() { function buildDescriptionForm(container,node) { var dialogForm = $('
').appendTo(container); var toolbarRow = $('').appendTo(dialogForm); - var row = $('').appendTo(dialogForm); + var row = $('').appendTo(dialogForm); $('').appendTo(row); var nodeInfoEditor = RED.editor.createEditor({ id: "node-info-input-info-editor", @@ -939,26 +939,6 @@ 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(); - var value = nodeInfoEditor.getValue(); - RED.editor.editMarkdown({ - value: value, - width: "Infinity", - cursor: nodeInfoEditor.getCursorPosition(), - complete: function(v,cursor) { - nodeInfoEditor.setValue(v, -1); - nodeInfoEditor.gotoLine(cursor.row+1,cursor.column,false); - setTimeout(function() { - nodeInfoEditor.focus(); - },300); - } - }) - }); return nodeInfoEditor; } @@ -2206,7 +2186,10 @@ RED.editor = (function() { createEditor: function(options) { - var editor = ace.edit(options.id||options.element); + var el = options.element || $("#"+options.id)[0]; + var toolbarRow = $("