diff --git a/editor/js/main.js b/editor/js/main.js index 5789d2fb8..8d9ccb492 100644 --- a/editor/js/main.js +++ b/editor/js/main.js @@ -138,36 +138,36 @@ var RED = (function() { function loadEditor() { RED.menu.init({id:"btn-sidemenu", options: [ - {id:"btn-sidebar",label:"Sidebar",toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}, - {id:"btn-node-status",label:"Display node status",toggle:true,onselect:toggleStatus, selected: true}, + {id:"menu-item-sidebar",label:"Sidebar",toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}, + {id:"menu-item-status",label:"Display node status",toggle:true,onselect:toggleStatus, selected: true}, null, - {id:"btn-import-menu",label:"Import",options:[ - {id:"btn-import-clipboard",label:"Clipboard",onselect:RED.clipboard.import}, - {id:"btn-import-library",label:"Library",options:[]} + {id:"menu-item-import",label:"Import",options:[ + {id:"menu-item-import-clipboard",label:"Clipboard",onselect:RED.clipboard.import}, + {id:"menu-item-import-library",label:"Library",options:[]} ]}, - {id:"btn-export-menu",label:"Export",disabled:true,options:[ - {id:"btn-export-clipboard",label:"Clipboard",disabled:true,onselect:RED.clipboard.export}, - {id:"btn-export-library",label:"Library",disabled:true,onselect:RED.library.export} + {id:"menu-item-export",label:"Export",disabled:true,options:[ + {id:"menu-item-export-clipboard",label:"Clipboard",disabled:true,onselect:RED.clipboard.export}, + {id:"menu-item-export-library",label:"Library",disabled:true,onselect:RED.library.export} ]}, null, - {id:"btn-config-nodes",label:"Configuration nodes",onselect:RED.sidebar.config.show}, + {id:"menu-item-config-nodes",label:"Configuration nodes",onselect:RED.sidebar.config.show}, null, - {id:"btn-subflow-menu",label:"Subflows", options: [ - {id:"btn-create-subflow",label:"Create subflow",onselect:RED.subflow.createSubflow}, - {id:"btn-convert-subflow",label:"Selection to subflow",disabled:true,onselect:RED.subflow.convertToSubflow}, + {id:"menu-item-subflow",label:"Subflows", options: [ + {id:"menu-item-subflow-create",label:"Create subflow",onselect:RED.subflow.createSubflow}, + {id:"menu-item-subflow-convert",label:"Selection to subflow",disabled:true,onselect:RED.subflow.convertToSubflow}, ]}, null, - {id:"btn-workspace-menu",label:"Workspaces",options:[ - {id:"btn-workspace-add",label:"Add",onselect:RED.workspaces.add}, - {id:"btn-workspace-edit",label:"Rename",onselect:RED.workspaces.edit}, - {id:"btn-workspace-delete",label:"Delete",onselect:RED.workspaces.remove}, + {id:"menu-item-workspace",label:"Workspaces",options:[ + {id:"menu-item-workspace-add",label:"Add",onselect:RED.workspaces.add}, + {id:"menu-item-workspace-edit",label:"Rename",onselect:RED.workspaces.edit}, + {id:"menu-item-workspace-delete",label:"Delete",onselect:RED.workspaces.remove}, null ]}, null, - {id:"btn-keyboard-shortcuts",label:"Keyboard Shortcuts",onselect:RED.keyboard.showHelp}, - {id:"btn-help", - label: RED.settings.theme("menu.btn-help.label","Node-RED Website"), - href: RED.settings.theme("menu.btn-help.url","http://nodered.org/docs") + {id:"menu-item-keyboard-shortcuts",label:"Keyboard Shortcuts",onselect:RED.keyboard.showHelp}, + {id:"menu-item-help", + label: RED.settings.theme("menu.menu-item-help.label","Node-RED Website"), + href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs") } ] }); diff --git a/editor/js/ui/clipboard.js b/editor/js/ui/clipboard.js index d568c19d3..5a8385ca9 100644 --- a/editor/js/ui/clipboard.js +++ b/editor/js/ui/clipboard.js @@ -129,13 +129,13 @@ RED.clipboard = (function() { init: function() { RED.view.on("selection-changed",function(selection) { if (!selection.nodes) { - RED.menu.setDisabled("btn-export-menu",true); - RED.menu.setDisabled("btn-export-clipboard",true); - RED.menu.setDisabled("btn-export-library",true); + RED.menu.setDisabled("menu-item-export",true); + RED.menu.setDisabled("menu-item-export-clipboard",true); + RED.menu.setDisabled("menu-item-export-library",true); } else { - RED.menu.setDisabled("btn-export-menu",false); - RED.menu.setDisabled("btn-export-clipboard",false); - RED.menu.setDisabled("btn-export-library",false); + RED.menu.setDisabled("menu-item-export",false); + RED.menu.setDisabled("menu-item-export-clipboard",false); + RED.menu.setDisabled("menu-item-export-library",false); } }); RED.keyboard.add(/* e */ 69,{ctrl:true},function(){exportNodes();d3.event.preventDefault();}); diff --git a/editor/js/ui/deploy.js b/editor/js/ui/deploy.js index 4dd9a3a2f..428eb3df3 100644 --- a/editor/js/ui/deploy.js +++ b/editor/js/ui/deploy.js @@ -43,14 +43,14 @@ RED.deploy = (function() { if (type == "default") { $('
  • '+ - ' Deploy'+ + ' Deploy'+ ''+ '
    • ').prependTo(".header-toolbar"); RED.menu.init({id:"btn-deploy-options", options: [ - {id:"btn-deploy-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:"Full",sublabel:"Deploys everything in the workspace",onselect:function(s) { if(s){changeDeploymentType("full")}}}, - {id:"btn-deploy-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:"Modified Flows",sublabel:"Only deploys flows that contain changed nodes", onselect:function(s) {if(s){changeDeploymentType("flows")}}}, - {id:"btn-deploy-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:"Modified Nodes",sublabel:"Only deploys nodes that have changed",onselect:function(s) { if(s){changeDeploymentType("nodes")}}} + {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:"Full",sublabel:"Deploys everything in the workspace",onselect:function(s) { if(s){changeDeploymentType("full")}}}, + {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:"Modified Flows",sublabel:"Only deploys flows that contain changed nodes", onselect:function(s) {if(s){changeDeploymentType("flows")}}}, + {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:"Modified Nodes",sublabel:"Only deploys nodes that have changed",onselect:function(s) { if(s){changeDeploymentType("nodes")}}} ] }); } else if (type == "simple") { @@ -62,7 +62,7 @@ RED.deploy = (function() { $('
  • '+ ''+ - (icon?' ':'')+ + (icon?' ':'')+ ''+label+''+ '
    • ').prependTo(".header-toolbar"); } @@ -137,8 +137,8 @@ RED.deploy = (function() { } var nns = RED.nodes.createCompleteNodeSet(); - $("#btn-icn-deploy").removeClass('fa-download'); - $("#btn-icn-deploy").addClass('spinner'); + $("#btn-deploy-icon").removeClass('fa-download'); + $("#btn-deploy-icon").addClass('spinner'); RED.nodes.dirty(false); $.ajax({ @@ -176,8 +176,8 @@ RED.deploy = (function() { RED.notify("Error: no response from server","error"); } }).always(function() { - $("#btn-icn-deploy").removeClass('spinner'); - $("#btn-icn-deploy").addClass('fa-download'); + $("#btn-deploy-icon").removeClass('spinner'); + $("#btn-deploy-icon").addClass('fa-download'); }); } } diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js index 2dad129b0..cf426cc51 100644 --- a/editor/js/ui/editor.js +++ b/editor/js/ui/editor.js @@ -786,7 +786,7 @@ RED.editor = (function() { changes['name'] = editing_node.name; editing_node.name = newName; changed = true; - $("#btn-workspace-menu-"+editing_node.id.replace(".","-")).text("Subflow: "+newName); + $("#menu-item-workspace-menu-"+editing_node.id.replace(".","-")).text("Subflow: "+newName); } RED.palette.refresh(); diff --git a/editor/js/ui/keyboard.js b/editor/js/ui/keyboard.js index e62b85adc..179702c36 100644 --- a/editor/js/ui/keyboard.js +++ b/editor/js/ui/keyboard.js @@ -62,7 +62,7 @@ RED.keyboard = (function() { var dialog = null; function showKeyboardHelp() { - if (!RED.settings.theme("menu.btn-keyboard-shortcuts",true)) { + if (!RED.settings.theme("menu.menu-item-keyboard-shortcuts",true)) { return; } if (!dialog) { diff --git a/editor/js/ui/library.js b/editor/js/ui/library.js index c313d8797..7a98025f1 100644 --- a/editor/js/ui/library.js +++ b/editor/js/ui/library.js @@ -25,7 +25,7 @@ RED.library = (function() { var li; var a; var ul = document.createElement("ul"); - ul.id = "btn-import-library-submenu"; + ul.id = "menu-item-import-library-submenu"; ul.className = "dropdown-menu"; if (data.d) { for (i in data.d) { @@ -63,7 +63,7 @@ RED.library = (function() { }; var menu = buildMenu(data,""); //TODO: need an api in RED.menu for this - $("#btn-import-library-submenu").replaceWith(menu); + $("#menu-item-import-library-submenu").replaceWith(menu); }); } @@ -392,17 +392,17 @@ RED.library = (function() { init: function() { RED.view.on("selection-changed",function(selection) { if (!selection.nodes) { - RED.menu.setDisabled("btn-export-menu",true); - RED.menu.setDisabled("btn-export-clipboard",true); - RED.menu.setDisabled("btn-export-library",true); + RED.menu.setDisabled("menu-item-export",true); + RED.menu.setDisabled("menu-item-export-clipboard",true); + RED.menu.setDisabled("menu-item-export-library",true); } else { - RED.menu.setDisabled("btn-export-menu",false); - RED.menu.setDisabled("btn-export-clipboard",false); - RED.menu.setDisabled("btn-export-library",false); + RED.menu.setDisabled("menu-item-export",false); + RED.menu.setDisabled("menu-item-export-clipboard",false); + RED.menu.setDisabled("menu-item-export-library",false); } }); - if (RED.settings.theme("menu.btn-import-library") !== false) { + if (RED.settings.theme("menu.menu-item-import-library") !== false) { loadFlowLibrary(); } }, diff --git a/editor/js/ui/sidebar.js b/editor/js/ui/sidebar.js index f23aa1dca..7b723c3a0 100644 --- a/editor/js/ui/sidebar.js +++ b/editor/js/ui/sidebar.js @@ -51,14 +51,14 @@ RED.sidebar = (function() { sidebarSeparator.chartRight = winWidth-$("#workspace").width()-$("#workspace").offset().left-2; - if (!RED.menu.isSelected("btn-sidebar")) { + if (!RED.menu.isSelected("menu-item-sidebar")) { sidebarSeparator.opening = true; var newChartRight = 15; $("#sidebar").addClass("closing"); $("#workspace").css("right",newChartRight); $("#chart-zoom-controls").css("right",newChartRight+20); $("#sidebar").width(0); - RED.menu.setSelected("btn-sidebar",true); + RED.menu.setSelected("menu-item-sidebar",true); eventHandler.emit("resize"); } sidebarSeparator.width = $("#sidebar").width(); @@ -104,7 +104,7 @@ RED.sidebar = (function() { stop:function(event,ui) { if (sidebarSeparator.closing) { $("#sidebar").removeClass("closing"); - RED.menu.setSelected("btn-sidebar",false); + RED.menu.setSelected("menu-item-sidebar",false); if ($("#sidebar").width() < 180) { $("#sidebar").width(180); $("#workspace").css("right",208); @@ -138,7 +138,7 @@ RED.sidebar = (function() { } function init () { - RED.keyboard.add(/* SPACE */ 32,{ctrl:true},function(){RED.menu.setSelected("btn-sidebar",!RED.menu.isSelected("btn-sidebar"));d3.event.preventDefault();}); + RED.keyboard.add(/* SPACE */ 32,{ctrl:true},function(){RED.menu.setSelected("menu-item-sidebar",!RED.menu.isSelected("menu-item-sidebar"));d3.event.preventDefault();}); showSidebar(); RED.sidebar.info.show(); } diff --git a/editor/js/ui/subflow.js b/editor/js/ui/subflow.js index b41d02e54..1a49974da 100644 --- a/editor/js/ui/subflow.js +++ b/editor/js/ui/subflow.js @@ -177,9 +177,9 @@ RED.subflow = (function() { RED.view.on("selection-changed",function(selection) { if (!selection.nodes) { - RED.menu.setDisabled("btn-convert-subflow",true); + RED.menu.setDisabled("menu-item-subflow-convert",true); } else { - RED.menu.setDisabled("btn-convert-subflow",false); + RED.menu.setDisabled("menu-item-subflow-convert",false); } }); diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js index 32cb16df3..3359b2a30 100644 --- a/editor/js/ui/view.js +++ b/editor/js/ui/view.js @@ -259,8 +259,8 @@ RED.view = (function() { $("#workspace-subflow-add-input").toggleClass("disabled",activeSubflow.in.length > 0); } - RED.menu.setDisabled("btn-workspace-edit", activeSubflow); - RED.menu.setDisabled("btn-workspace-delete",RED.workspaces.count() == 1 || activeSubflow); + RED.menu.setDisabled("menu-item-workspace-edit", activeSubflow); + RED.menu.setDisabled("menu-item-workspace-delete",RED.workspaces.count() == 1 || activeSubflow); if (workspaceScrollPositions[event.workspace]) { chart.scrollLeft(workspaceScrollPositions[event.workspace].left); diff --git a/editor/js/ui/workspaces.js b/editor/js/ui/workspaces.js index 4cdeb026b..9f7959e36 100644 --- a/editor/js/ui/workspaces.js +++ b/editor/js/ui/workspaces.js @@ -102,18 +102,18 @@ RED.workspaces = (function() { } }, onadd: function(tab) { - RED.menu.addItem("btn-workspace-menu",{ - id:"btn-workspace-menu-"+tab.id.replace(".","-"), + RED.menu.addItem("menu-item-workspace",{ + id:"menu-item-workspace-menu-"+tab.id.replace(".","-"), label:tab.label, onselect:function() { workspace_tabs.activateTab(tab.id); } }); - RED.menu.setDisabled("btn-workspace-delete",workspace_tabs.count() == 1); + RED.menu.setDisabled("menu-item-workspace-delete",workspace_tabs.count() == 1); }, onremove: function(tab) { - RED.menu.setDisabled("btn-workspace-delete",workspace_tabs.count() == 1); - RED.menu.removeItem("btn-workspace-menu-"+tab.id.replace(".","-")); + RED.menu.setDisabled("menu-item-workspace-delete",workspace_tabs.count() == 1); + RED.menu.removeItem("menu-item-workspace-menu-"+tab.id.replace(".","-")); } }); @@ -141,7 +141,7 @@ RED.workspaces = (function() { if (workspace.label != label) { workspace_tabs.renameTab(workspace.id,label); RED.nodes.dirty(true); - $("#btn-workspace-menu-"+workspace.id.replace(".","-")).text(label); + $("#menu-item-workspace-menu-"+workspace.id.replace(".","-")).text(label); // TODO: update entry in menu } $( this ).dialog( "close" ); @@ -195,7 +195,7 @@ RED.workspaces = (function() { $('#btn-workspace-add-tab').on("click",function(e) {addWorkspace(); e.preventDefault()}); RED.sidebar.on("resize",workspace_tabs.resize); - RED.menu.setAction('btn-workspace-delete',function() { + RED.menu.setAction('menu-item-workspace-delete',function() { deleteWorkspace(RED.nodes.workspace(activeWorkspace)); }); } diff --git a/editor/js/user.js b/editor/js/user.js index e115ce813..58196b351 100644 --- a/editor/js/user.js +++ b/editor/js/user.js @@ -117,10 +117,10 @@ RED.user = (function() { } function updateUserMenu() { - $("#btn-usermenu-submenu li").remove(); + $("#usermenu-submenu li").remove(); if (RED.settings.user.anonymous) { RED.menu.addItem("btn-usermenu",{ - id:"btn-login", + id:"usermenu-item-login", label:"Login", onselect: function() { RED.user.login({cancelable:true},function() { @@ -133,11 +133,11 @@ RED.user = (function() { }); } else { RED.menu.addItem("btn-usermenu",{ - id:"btn-username", + id:"usermenu-item-username", label:""+RED.settings.user.username+"" }); RED.menu.addItem("btn-usermenu",{ - id:"btn-logout", + id:"usermenu-item-logout", label:"Logout", onselect: function() { RED.user.logout(); diff --git a/red/api/theme.js b/red/api/theme.js index da3e9e1f4..04f1ad36d 100644 --- a/red/api/theme.js +++ b/red/api/theme.js @@ -23,22 +23,11 @@ var themeContext = { page: { title: "Node-RED", favicon: "favicon.ico" - //css: [""] }, header: { title: "Node-RED", image: "red/images/node-red.png" - }, - //deployButton: { - ///** - // * options: - // * 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" - // */ - // - //} + } }; var themeSettings = null;