frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename menu ids to be logically consistent

This commit is contained in:
Nick O'Leary 2015-04-13 16:48:38 +01:00
parent 0d557094b2
commit 5af6ac3e80
12 changed files with 66 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
editor/js/main.js
View File

@ -138,36 +138,36 @@ var RED = (function() {
function loadEditor() { function loadEditor() {
RED.menu.init({id:"btn-sidemenu", RED.menu.init({id:"btn-sidemenu",
options: [ options: [
{id:"btn-sidebar",label:"Sidebar",toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}, {id:"menu-item-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-status",label:"Display node status",toggle:true,onselect:toggleStatus, selected: true},
null, null,
{id:"btn-import-menu",label:"Import",options:[ {id:"menu-item-import",label:"Import",options:[
{id:"btn-import-clipboard",label:"Clipboard",onselect:RED.clipboard.import}, {id:"menu-item-import-clipboard",label:"Clipboard",onselect:RED.clipboard.import},
{id:"btn-import-library",label:"Library",options:[]} {id:"menu-item-import-library",label:"Library",options:[]}
]}, ]},
{id:"btn-export-menu",label:"Export",disabled:true,options:[ {id:"menu-item-export",label:"Export",disabled:true,options:[
{id:"btn-export-clipboard",label:"Clipboard",disabled:true,onselect:RED.clipboard.export}, {id:"menu-item-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-library",label:"Library",disabled:true,onselect:RED.library.export}
]}, ]},
null, 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, null,
{id:"btn-subflow-menu",label:"Subflows", options: [ {id:"menu-item-subflow",label:"Subflows", options: [
{id:"btn-create-subflow",label:"Create subflow",onselect:RED.subflow.createSubflow}, {id:"menu-item-subflow-create",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-convert",label:"Selection to subflow",disabled:true,onselect:RED.subflow.convertToSubflow},
]}, ]},
null, null,
{id:"btn-workspace-menu",label:"Workspaces",options:[ {id:"menu-item-workspace",label:"Workspaces",options:[
{id:"btn-workspace-add",label:"Add",onselect:RED.workspaces.add}, {id:"menu-item-workspace-add",label:"Add",onselect:RED.workspaces.add},
{id:"btn-workspace-edit",label:"Rename",onselect:RED.workspaces.edit}, {id:"menu-item-workspace-edit",label:"Rename",onselect:RED.workspaces.edit},
{id:"btn-workspace-delete",label:"Delete",onselect:RED.workspaces.remove}, {id:"menu-item-workspace-delete",label:"Delete",onselect:RED.workspaces.remove},
null null
]}, ]},
null, null,
{id:"btn-keyboard-shortcuts",label:"Keyboard Shortcuts",onselect:RED.keyboard.showHelp}, {id:"menu-item-keyboard-shortcuts",label:"Keyboard Shortcuts",onselect:RED.keyboard.showHelp},
{id:"btn-help", {id:"menu-item-help",
label: RED.settings.theme("menu.btn-help.label","Node-RED Website"), label: RED.settings.theme("menu.menu-item-help.label","Node-RED Website"),
href: RED.settings.theme("menu.btn-help.url","http://nodered.org/docs") href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
} }
] ]
}); });

12
editor/js/ui/clipboard.js
View File

@ -129,13 +129,13 @@ RED.clipboard = (function() {
init: function() { init: function() {
RED.view.on("selection-changed",function(selection) { RED.view.on("selection-changed",function(selection) {
if (!selection.nodes) { if (!selection.nodes) {
RED.menu.setDisabled("btn-export-menu",true); RED.menu.setDisabled("menu-item-export",true);
RED.menu.setDisabled("btn-export-clipboard",true); RED.menu.setDisabled("menu-item-export-clipboard",true);
RED.menu.setDisabled("btn-export-library",true); RED.menu.setDisabled("menu-item-export-library",true);
} else { } else {
RED.menu.setDisabled("btn-export-menu",false); RED.menu.setDisabled("menu-item-export",false);
RED.menu.setDisabled("btn-export-clipboard",false); RED.menu.setDisabled("menu-item-export-clipboard",false);
RED.menu.setDisabled("btn-export-library",false); RED.menu.setDisabled("menu-item-export-library",false);
} }
}); });
RED.keyboard.add(/* e */ 69,{ctrl:true},function(){exportNodes();d3.event.preventDefault();}); RED.keyboard.add(/* e */ 69,{ctrl:true},function(){exportNodes();d3.event.preventDefault();});

18
editor/js/ui/deploy.js
View File

@ -43,14 +43,14 @@ RED.deploy = (function() {
if (type == "default") { if (type == "default") {
$('<li><span class="deploy-button-group button-group">'+ $('<li><span class="deploy-button-group button-group">'+
'<a id="btn-deploy" class="action-deploy disabled" href="#"><img id="btn-icn-deploy" src="red/images/deploy-full-o.png"> <span>Deploy</span></a>'+ '<a id="btn-deploy" class="action-deploy disabled" href="#"><img id="btn-deploy-icon" src="red/images/deploy-full-o.png"> <span>Deploy</span></a>'+
'<a id="btn-deploy-options" data-toggle="dropdown" class="" href="#"><i class="fa fa-caret-down"></i></a>'+ '<a id="btn-deploy-options" data-toggle="dropdown" class="" href="#"><i class="fa fa-caret-down"></i></a>'+
'</span></li>').prependTo(".header-toolbar"); '</span></li>').prependTo(".header-toolbar");
RED.menu.init({id:"btn-deploy-options", RED.menu.init({id:"btn-deploy-options",
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:"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:"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:"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:"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-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") { } else if (type == "simple") {
@ -62,7 +62,7 @@ RED.deploy = (function() {
$('<li><span class="deploy-button-group button-group">'+ $('<li><span class="deploy-button-group button-group">'+
'<a id="btn-deploy" class="action-deploy disabled" href="#">'+ '<a id="btn-deploy" class="action-deploy disabled" href="#">'+
(icon?'<img id="btn-icn-deploy" src="'+icon+'"> ':'')+ (icon?'<img id="btn-deploy-icon" src="'+icon+'"> ':'')+
'<span>'+label+'</span></a>'+ '<span>'+label+'</span></a>'+
'</span></li>').prependTo(".header-toolbar"); '</span></li>').prependTo(".header-toolbar");
} }
@ -137,8 +137,8 @@ RED.deploy = (function() {
} }
var nns = RED.nodes.createCompleteNodeSet(); var nns = RED.nodes.createCompleteNodeSet();
$("#btn-icn-deploy").removeClass('fa-download'); $("#btn-deploy-icon").removeClass('fa-download');
$("#btn-icn-deploy").addClass('spinner'); $("#btn-deploy-icon").addClass('spinner');
RED.nodes.dirty(false); RED.nodes.dirty(false);
$.ajax({ $.ajax({
@ -176,8 +176,8 @@ RED.deploy = (function() {
RED.notify("<strong>Error</strong>: no response from server","error"); RED.notify("<strong>Error</strong>: no response from server","error");
} }
}).always(function() { }).always(function() {
$("#btn-icn-deploy").removeClass('spinner'); $("#btn-deploy-icon").removeClass('spinner');
$("#btn-icn-deploy").addClass('fa-download'); $("#btn-deploy-icon").addClass('fa-download');
}); });
} }
} }

2
editor/js/ui/editor.js
View File

@ -786,7 +786,7 @@ RED.editor = (function() {
changes['name'] = editing_node.name; changes['name'] = editing_node.name;
editing_node.name = newName; editing_node.name = newName;
changed = true; 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(); RED.palette.refresh();

2
editor/js/ui/keyboard.js
View File

@ -62,7 +62,7 @@ RED.keyboard = (function() {
var dialog = null; var dialog = null;
function showKeyboardHelp() { function showKeyboardHelp() {
if (!RED.settings.theme("menu.btn-keyboard-shortcuts",true)) { if (!RED.settings.theme("menu.menu-item-keyboard-shortcuts",true)) {
return; return;
} }
if (!dialog) { if (!dialog) {

18
editor/js/ui/library.js
View File

@ -25,7 +25,7 @@ RED.library = (function() {
var li; var li;
var a; var a;
var ul = document.createElement("ul"); var ul = document.createElement("ul");
ul.id = "btn-import-library-submenu"; ul.id = "menu-item-import-library-submenu";
ul.className = "dropdown-menu"; ul.className = "dropdown-menu";
if (data.d) { if (data.d) {
for (i in data.d) { for (i in data.d) {
@ -63,7 +63,7 @@ RED.library = (function() {
}; };
var menu = buildMenu(data,""); var menu = buildMenu(data,"");
//TODO: need an api in RED.menu for this //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() { init: function() {
RED.view.on("selection-changed",function(selection) { RED.view.on("selection-changed",function(selection) {
if (!selection.nodes) { if (!selection.nodes) {
RED.menu.setDisabled("btn-export-menu",true); RED.menu.setDisabled("menu-item-export",true);
RED.menu.setDisabled("btn-export-clipboard",true); RED.menu.setDisabled("menu-item-export-clipboard",true);
RED.menu.setDisabled("btn-export-library",true); RED.menu.setDisabled("menu-item-export-library",true);
} else { } else {
RED.menu.setDisabled("btn-export-menu",false); RED.menu.setDisabled("menu-item-export",false);
RED.menu.setDisabled("btn-export-clipboard",false); RED.menu.setDisabled("menu-item-export-clipboard",false);
RED.menu.setDisabled("btn-export-library",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(); loadFlowLibrary();
} }
}, },

8
editor/js/ui/sidebar.js
View File

@ -51,14 +51,14 @@ RED.sidebar = (function() {
sidebarSeparator.chartRight = winWidth-$("#workspace").width()-$("#workspace").offset().left-2; 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; sidebarSeparator.opening = true;
var newChartRight = 15; var newChartRight = 15;
$("#sidebar").addClass("closing"); $("#sidebar").addClass("closing");
$("#workspace").css("right",newChartRight); $("#workspace").css("right",newChartRight);
$("#chart-zoom-controls").css("right",newChartRight+20); $("#chart-zoom-controls").css("right",newChartRight+20);
$("#sidebar").width(0); $("#sidebar").width(0);
RED.menu.setSelected("btn-sidebar",true); RED.menu.setSelected("menu-item-sidebar",true);
eventHandler.emit("resize"); eventHandler.emit("resize");
} }
sidebarSeparator.width = $("#sidebar").width(); sidebarSeparator.width = $("#sidebar").width();
@ -104,7 +104,7 @@ RED.sidebar = (function() {
stop:function(event,ui) { stop:function(event,ui) {
if (sidebarSeparator.closing) { if (sidebarSeparator.closing) {
$("#sidebar").removeClass("closing"); $("#sidebar").removeClass("closing");
RED.menu.setSelected("btn-sidebar",false); RED.menu.setSelected("menu-item-sidebar",false);
if ($("#sidebar").width() < 180) { if ($("#sidebar").width() < 180) {
$("#sidebar").width(180); $("#sidebar").width(180);
$("#workspace").css("right",208); $("#workspace").css("right",208);
@ -138,7 +138,7 @@ RED.sidebar = (function() {
} }
function init () { 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(); showSidebar();
RED.sidebar.info.show(); RED.sidebar.info.show();
} }

4
editor/js/ui/subflow.js
View File

@ -177,9 +177,9 @@ RED.subflow = (function() {
RED.view.on("selection-changed",function(selection) { RED.view.on("selection-changed",function(selection) {
if (!selection.nodes) { if (!selection.nodes) {
RED.menu.setDisabled("btn-convert-subflow",true); RED.menu.setDisabled("menu-item-subflow-convert",true);
} else { } else {
RED.menu.setDisabled("btn-convert-subflow",false); RED.menu.setDisabled("menu-item-subflow-convert",false);
} }
}); });

4
editor/js/ui/view.js
View File

@ -259,8 +259,8 @@ RED.view = (function() {
$("#workspace-subflow-add-input").toggleClass("disabled",activeSubflow.in.length > 0); $("#workspace-subflow-add-input").toggleClass("disabled",activeSubflow.in.length > 0);
} }
RED.menu.setDisabled("btn-workspace-edit", activeSubflow); RED.menu.setDisabled("menu-item-workspace-edit", activeSubflow);
RED.menu.setDisabled("btn-workspace-delete",RED.workspaces.count() == 1 || activeSubflow); RED.menu.setDisabled("menu-item-workspace-delete",RED.workspaces.count() == 1 || activeSubflow);
if (workspaceScrollPositions[event.workspace]) { if (workspaceScrollPositions[event.workspace]) {
chart.scrollLeft(workspaceScrollPositions[event.workspace].left); chart.scrollLeft(workspaceScrollPositions[event.workspace].left);

14
editor/js/ui/workspaces.js
View File

@ -102,18 +102,18 @@ RED.workspaces = (function() {
} }
}, },
onadd: function(tab) { onadd: function(tab) {
RED.menu.addItem("btn-workspace-menu",{ RED.menu.addItem("menu-item-workspace",{
id:"btn-workspace-menu-"+tab.id.replace(".","-"), id:"menu-item-workspace-menu-"+tab.id.replace(".","-"),
label:tab.label, label:tab.label,
onselect:function() { onselect:function() {
workspace_tabs.activateTab(tab.id); 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) { onremove: function(tab) {
RED.menu.setDisabled("btn-workspace-delete",workspace_tabs.count() == 1); RED.menu.setDisabled("menu-item-workspace-delete",workspace_tabs.count() == 1);
RED.menu.removeItem("btn-workspace-menu-"+tab.id.replace(".","-")); RED.menu.removeItem("menu-item-workspace-menu-"+tab.id.replace(".","-"));
} }
}); });
@ -141,7 +141,7 @@ RED.workspaces = (function() {
if (workspace.label != label) { if (workspace.label != label) {
workspace_tabs.renameTab(workspace.id,label); workspace_tabs.renameTab(workspace.id,label);
RED.nodes.dirty(true); 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 // TODO: update entry in menu
} }
$( this ).dialog( "close" ); $( this ).dialog( "close" );
@ -195,7 +195,7 @@ RED.workspaces = (function() {
$('#btn-workspace-add-tab').on("click",function(e) {addWorkspace(); e.preventDefault()}); $('#btn-workspace-add-tab').on("click",function(e) {addWorkspace(); e.preventDefault()});
RED.sidebar.on("resize",workspace_tabs.resize); 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)); deleteWorkspace(RED.nodes.workspace(activeWorkspace));
}); });
} }

8
editor/js/user.js
View File

@ -117,10 +117,10 @@ RED.user = (function() {
} }
function updateUserMenu() { function updateUserMenu() {
$("#btn-usermenu-submenu li").remove(); $("#usermenu-submenu li").remove();
if (RED.settings.user.anonymous) { if (RED.settings.user.anonymous) {
RED.menu.addItem("btn-usermenu",{ RED.menu.addItem("btn-usermenu",{
id:"btn-login", id:"usermenu-item-login",
label:"Login", label:"Login",
onselect: function() { onselect: function() {
RED.user.login({cancelable:true},function() { RED.user.login({cancelable:true},function() {
@ -133,11 +133,11 @@ RED.user = (function() {
}); });
} else { } else {
RED.menu.addItem("btn-usermenu",{ RED.menu.addItem("btn-usermenu",{
id:"btn-username", id:"usermenu-item-username",
label:"<b>"+RED.settings.user.username+"</b>" label:"<b>"+RED.settings.user.username+"</b>"
}); });
RED.menu.addItem("btn-usermenu",{ RED.menu.addItem("btn-usermenu",{
id:"btn-logout", id:"usermenu-item-logout",
label:"Logout", label:"Logout",
onselect: function() { onselect: function() {
RED.user.logout(); RED.user.logout();

13
red/api/theme.js
View File

@ -23,22 +23,11 @@ var themeContext = {
page: { page: {
title: "Node-RED", title: "Node-RED",
favicon: "favicon.ico" favicon: "favicon.ico"
//css: [""]
}, },
header: { header: {
title: "Node-RED", title: "Node-RED",
image: "red/images/node-red.png" 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; var themeSettings = null;