Skip to content

Commit b00985f

Browse files
knollearyknolleary
committed
Replace palette-edit button with menu option
1 parent 538a16a commit b00985f

5 files changed

Lines changed: 64 additions & 65 deletions

File tree

‎editor/js/main.js‎

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -171,54 +171,60 @@ var RED = (function() {
171171
}
172172

173173
function loadEditor() {
174-
RED.menu.init({id:"btn-sidemenu",
175-
options: [
176-
{id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
177-
{id:"menu-item-view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:RED.view.toggleShowGrid},
178-
{id:"menu-item-view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:RED.view.toggleSnapGrid},
179-
{id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:toggleStatus, selected: true},
180-
null,
181-
{id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
182-
{id:"menu-item-bidi-default",toggle:"text-direction",label:RED._("menu.label.view.defaultDir"),selected: true, onselect:function(s) { if(s){RED.text.bidi.setTextDirection("")}}},
183-
{id:"menu-item-bidi-ltr",toggle:"text-direction",label:RED._("menu.label.view.ltr"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("ltr")}}},
184-
{id:"menu-item-bidi-rtl",toggle:"text-direction",label:RED._("menu.label.view.rtl"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("rtl")}}},
185-
{id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
186-
]},
187-
null,
188-
{id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}
189-
]},
190-
null,
191-
{id:"menu-item-import",label:RED._("menu.label.import"),options:[
192-
{id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:RED.clipboard.import},
193-
{id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
194-
]},
195-
{id:"menu-item-export",label:RED._("menu.label.export"),disabled:true,options:[
196-
{id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:RED.clipboard.export},
197-
{id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:RED.library.export}
198-
]},
199-
null,
200-
{id:"menu-item-search",label:RED._("menu.label.search"),onselect:RED.search.show},
201-
null,
202-
{id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:function() {}},
203-
{id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
204-
{id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:RED.workspaces.add},
205-
{id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:RED.workspaces.edit},
206-
{id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:RED.workspaces.remove},
207-
null
208-
]},
209-
{id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [
210-
{id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:RED.subflow.createSubflow},
211-
{id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:RED.subflow.convertToSubflow},
212-
]},
213-
null,
214-
{id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:RED.keyboard.showHelp},
215-
{id:"menu-item-help",
216-
label: RED.settings.theme("menu.menu-item-help.label","Node-RED Website"),
217-
href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
218-
},
219-
{id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: showAbout }
220-
]
174+
175+
var menuOptions = [];
176+
menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
177+
{id:"menu-item-view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:RED.view.toggleShowGrid},
178+
{id:"menu-item-view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:RED.view.toggleSnapGrid},
179+
{id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:toggleStatus, selected: true},
180+
null,
181+
{id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
182+
{id:"menu-item-bidi-default",toggle:"text-direction",label:RED._("menu.label.view.defaultDir"),selected: true, onselect:function(s) { if(s){RED.text.bidi.setTextDirection("")}}},
183+
{id:"menu-item-bidi-ltr",toggle:"text-direction",label:RED._("menu.label.view.ltr"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("ltr")}}},
184+
{id:"menu-item-bidi-rtl",toggle:"text-direction",label:RED._("menu.label.view.rtl"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("rtl")}}},
185+
{id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
186+
]},
187+
null,
188+
{id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}
189+
]});
190+
menuOptions.push(null);
191+
menuOptions.push({id:"menu-item-import",label:RED._("menu.label.import"),options:[
192+
{id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:RED.clipboard.import},
193+
{id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
194+
]});
195+
menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),disabled:true,options:[
196+
{id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:RED.clipboard.export},
197+
{id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:RED.library.export}
198+
]});
199+
menuOptions.push(null);
200+
menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:RED.search.show});
201+
menuOptions.push(null);
202+
menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:function() {}});
203+
menuOptions.push({id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
204+
{id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:RED.workspaces.add},
205+
{id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:RED.workspaces.edit},
206+
{id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:RED.workspaces.remove},
207+
null
208+
]});
209+
menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [
210+
{id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:RED.subflow.createSubflow},
211+
{id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:RED.subflow.convertToSubflow},
212+
]});
213+
menuOptions.push(null);
214+
if (RED.settings.theme('palette.editable') !== false) {
215+
RED.palette.editor.init();
216+
menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:RED.palette.editor.show});
217+
menuOptions.push(null);
218+
}
219+
220+
menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:RED.keyboard.showHelp});
221+
menuOptions.push({id:"menu-item-help",
222+
label: RED.settings.theme("menu.menu-item-help.label","Node-RED website"),
223+
href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
221224
});
225+
menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: showAbout });
226+
227+
RED.menu.init({id:"btn-sidemenu",options: menuOptions});
222228

223229
RED.user.init();
224230

‎editor/js/ui/palette-editor.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ RED.palette.editor = (function() {
256256

257257
}
258258
function showPaletteEditor() {
259+
if (RED.settings.theme('palette.editable') === false) {
260+
return;
261+
}
259262
$("#header-shade").show();
260263
$("#editor-shade").show();
261264
$("#sidebar-shade").show();
@@ -368,8 +371,9 @@ RED.palette.editor = (function() {
368371
}
369372

370373
function init() {
371-
372-
$(".palette-editor-button").show();
374+
if (RED.settings.theme('palette.editable') === false) {
375+
return;
376+
}
373377

374378
editorTabs = RED.tabs.create({
375379
id:"palette-editor-tabs",
@@ -402,13 +406,7 @@ RED.palette.editor = (function() {
402406
hidePaletteEditor();
403407
}
404408
});
405-
$("#palette-edit").on("click",function(e) {
406-
if ($("#main-container").hasClass("palette-expanded")) {
407-
hidePaletteEditor();
408-
} else {
409-
showPaletteEditor();
410-
}
411-
});
409+
412410
$("#palette-editor-close").on("click", function(e) {
413411
hidePaletteEditor();
414412
})
@@ -737,5 +735,6 @@ RED.palette.editor = (function() {
737735

738736
return {
739737
init: init,
738+
show: showPaletteEditor
740739
}
741740
})();

‎editor/js/ui/palette.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,10 +467,6 @@ RED.palette = (function() {
467467
}
468468
}
469469
});
470-
471-
if (RED.settings.theme('palette.editable') !== false) {
472-
RED.palette.editor.init();
473-
}
474470
}
475471

476472
return {

‎editor/templates/index.mst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
</div>
6767
<div id="palette-container" class="palette-scroll hide"></div>
6868
<div id="palette-footer">
69-
<div style="float:left" class="palette-editor-button hide">
70-
<a class="palette-button palette-button-left" id="palette-edit" href="#"><i class="fa fa-cog"></i></a>
71-
</div>
7269
<a class="palette-button" id="palette-collapse-all" href="#"><i class="fa fa-angle-double-up"></i></a>
7370
<a class="palette-button" id="palette-expand-all" href="#"><i class="fa fa-angle-double-down"></i></a>
7471
</div>

‎red/api/locales/en-US/editor.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@
5050
"add": "Add",
5151
"rename": "Rename",
5252
"delete": "Delete",
53-
"keyboardShortcuts": "Keyboard Shortcuts",
53+
"keyboardShortcuts": "Keyboard shortcuts",
5454
"login": "Login",
55-
"logout": "Logout"
55+
"logout": "Logout",
56+
"editPalette":"Manage palette"
5657
}
5758
},
5859
"user": {

0 commit comments

Comments
 (0)