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

Update info sidebar as trays open/close

This commit is contained in:
Nick O'Leary 2016-03-21 22:51:48 +00:00
parent 6354b68bae
commit 1790ebf567
4 changed files with 152 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

277
editor/js/ui/editor.js
View File

@ -15,10 +15,6 @@
**/ **/
RED.editor = (function() { RED.editor = (function() {
var editStack = [];
var editing_node = null; var editing_node = null;
var editing_config_node = null; var editing_config_node = null;
var subflowEditor; var subflowEditor;
@ -396,7 +392,6 @@ RED.editor = (function() {
} }
function showEditDialog(node) { function showEditDialog(node) {
editStack.push({node:node});
var editing_node = node; var editing_node = node;
RED.view.state(RED.state.EDITING); RED.view.state(RED.state.EDITING);
var type = node.type; var type = node.type;
@ -421,134 +416,129 @@ RED.editor = (function() {
id: "node-dialog-ok", id: "node-dialog-ok",
text: RED._("common.label.ok"), text: RED._("common.label.ok"),
click: function() { click: function() {
var editElement = editStack.pop(); var changes = {};
if (editElement) { var changed = false;
var editing_node = editElement.node; var wasDirty = RED.nodes.dirty();
var d;
var changes = {}; if (editing_node._def.oneditsave) {
var changed = false; var oldValues = {};
var wasDirty = RED.nodes.dirty(); for (d in editing_node._def.defaults) {
var d; if (editing_node._def.defaults.hasOwnProperty(d)) {
if (typeof editing_node[d] === "string" || typeof editing_node[d] === "number") {
if (editing_node._def.oneditsave) { oldValues[d] = editing_node[d];
var oldValues = {}; } else {
for (d in editing_node._def.defaults) { oldValues[d] = $.extend(true,{},{v:editing_node[d]}).v;
if (editing_node._def.defaults.hasOwnProperty(d)) {
if (typeof editing_node[d] === "string" || typeof editing_node[d] === "number") {
oldValues[d] = editing_node[d];
} else {
oldValues[d] = $.extend(true,{},{v:editing_node[d]}).v;
}
} }
} }
var rc = editing_node._def.oneditsave.call(editing_node); }
if (rc === true) { var rc = editing_node._def.oneditsave.call(editing_node);
changed = true; if (rc === true) {
} changed = true;
}
for (d in editing_node._def.defaults) { for (d in editing_node._def.defaults) {
if (editing_node._def.defaults.hasOwnProperty(d)) { if (editing_node._def.defaults.hasOwnProperty(d)) {
if (oldValues[d] === null || typeof oldValues[d] === "string" || typeof oldValues[d] === "number") { if (oldValues[d] === null || typeof oldValues[d] === "string" || typeof oldValues[d] === "number") {
if (oldValues[d] !== editing_node[d]) { if (oldValues[d] !== editing_node[d]) {
changes[d] = oldValues[d]; changes[d] = oldValues[d];
changed = true; changed = true;
} }
} else { } else {
if (JSON.stringify(oldValues[d]) !== JSON.stringify(editing_node[d])) { if (JSON.stringify(oldValues[d]) !== JSON.stringify(editing_node[d])) {
changes[d] = oldValues[d]; changes[d] = oldValues[d];
changed = true; changed = true;
}
} }
} }
} }
} }
if (editing_node._def.defaults) {
for (d in editing_node._def.defaults) {
if (editing_node._def.defaults.hasOwnProperty(d)) {
var input = $("#node-input-"+d);
var newValue;
if (input.attr('type') === "checkbox") {
newValue = input.prop('checked');
} else {
newValue = input.val();
}
if (newValue != null) {
if (d === "outputs" && (newValue.trim() === "" || isNaN(newValue))) {
continue;
}
if (editing_node[d] != newValue) {
if (editing_node._def.defaults[d].type) {
if (newValue == "_ADD_") {
newValue = "";
}
// Change to a related config node
var configNode = RED.nodes.node(editing_node[d]);
if (configNode) {
var users = configNode.users;
users.splice(users.indexOf(editing_node),1);
}
configNode = RED.nodes.node(newValue);
if (configNode) {
configNode.users.push(editing_node);
}
}
changes[d] = editing_node[d];
editing_node[d] = newValue;
changed = true;
}
}
}
}
}
if (editing_node._def.credentials) {
var prefix = 'node-input';
var credDefinition = editing_node._def.credentials;
var credsChanged = updateNodeCredentials(editing_node,credDefinition,prefix);
changed = changed || credsChanged;
}
var removedLinks = updateNodeProperties(editing_node);
if (changed) {
var wasChanged = editing_node.changed;
editing_node.changed = true;
RED.nodes.dirty(true);
var activeSubflow = RED.nodes.subflow(RED.workspaces.active());
var subflowInstances = null;
if (activeSubflow) {
subflowInstances = [];
RED.nodes.eachNode(function(n) {
if (n.type == "subflow:"+RED.workspaces.active()) {
subflowInstances.push({
id:n.id,
changed:n.changed
});
n.changed = true;
n.dirty = true;
updateNodeProperties(n);
}
});
}
var historyEvent = {
t:'edit',
node:editing_node,
changes:changes,
links:removedLinks,
dirty:wasDirty,
changed:wasChanged
};
if (subflowInstances) {
historyEvent.subflow = {
instances:subflowInstances
}
}
RED.history.push(historyEvent);
}
editing_node.dirty = true;
validateNode(editing_node);
RED.view.redraw(true);
} }
if (editing_node._def.defaults) {
for (d in editing_node._def.defaults) {
if (editing_node._def.defaults.hasOwnProperty(d)) {
var input = $("#node-input-"+d);
var newValue;
if (input.attr('type') === "checkbox") {
newValue = input.prop('checked');
} else {
newValue = input.val();
}
if (newValue != null) {
if (d === "outputs" && (newValue.trim() === "" || isNaN(newValue))) {
continue;
}
if (editing_node[d] != newValue) {
if (editing_node._def.defaults[d].type) {
if (newValue == "_ADD_") {
newValue = "";
}
// Change to a related config node
var configNode = RED.nodes.node(editing_node[d]);
if (configNode) {
var users = configNode.users;
users.splice(users.indexOf(editing_node),1);
}
configNode = RED.nodes.node(newValue);
if (configNode) {
configNode.users.push(editing_node);
}
}
changes[d] = editing_node[d];
editing_node[d] = newValue;
changed = true;
}
}
}
}
}
if (editing_node._def.credentials) {
var prefix = 'node-input';
var credDefinition = editing_node._def.credentials;
var credsChanged = updateNodeCredentials(editing_node,credDefinition,prefix);
changed = changed || credsChanged;
}
var removedLinks = updateNodeProperties(editing_node);
if (changed) {
var wasChanged = editing_node.changed;
editing_node.changed = true;
RED.nodes.dirty(true);
var activeSubflow = RED.nodes.subflow(RED.workspaces.active());
var subflowInstances = null;
if (activeSubflow) {
subflowInstances = [];
RED.nodes.eachNode(function(n) {
if (n.type == "subflow:"+RED.workspaces.active()) {
subflowInstances.push({
id:n.id,
changed:n.changed
});
n.changed = true;
n.dirty = true;
updateNodeProperties(n);
}
});
}
var historyEvent = {
t:'edit',
node:editing_node,
changes:changes,
links:removedLinks,
dirty:wasDirty,
changed:wasChanged
};
if (subflowInstances) {
historyEvent.subflow = {
instances:subflowInstances
}
}
RED.history.push(historyEvent);
}
editing_node.dirty = true;
validateNode(editing_node);
RED.view.redraw(true);
RED.tray.close(); RED.tray.close();
} }
}, },
@ -556,9 +546,7 @@ RED.editor = (function() {
id: "node-dialog-cancel", id: "node-dialog-cancel",
text: RED._("common.label.cancel"), text: RED._("common.label.cancel"),
click: function() { click: function() {
var editElement = editStack.pop(); if (editing_node._def) {
if (editElement && editElement.node._def) {
var editing_node = editElement.node;
if (editing_node._def.oneditcancel) { if (editing_node._def.oneditcancel) {
editing_node._def.oneditcancel.call(editing_node); editing_node._def.oneditcancel.call(editing_node);
} }
@ -588,15 +576,17 @@ RED.editor = (function() {
} }
], ],
resize: function() { resize: function() {
var editing_node = editStack[editStack.length-1]; if (editing_node && editing_node._def.oneditresize) {
if (editing_node && editing_node.node._def.oneditresize) {
setTimeout(function() { setTimeout(function() {
var form = $("#dialog-form"); var form = $("#dialog-form");
editing_node.node._def.oneditresize.call(editing_node.node,{width:form.width(),height:form.height()}); editing_node._def.oneditresize.call(editing_node,{width:form.width(),height:form.height()});
},0); },0);
} }
}, },
open: function(tray) { open: function(tray) {
if (editing_node) {
RED.sidebar.info.refresh(editing_node);
}
var trayBody = tray.find('.editor-tray-body'); var trayBody = tray.find('.editor-tray-body');
RED.keyboard.disable(); RED.keyboard.disable();
var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody); var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody);
@ -653,10 +643,12 @@ RED.editor = (function() {
if (RED.view.state() != RED.state.IMPORT_DRAGGING) { if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
RED.view.state(RED.state.DEFAULT); RED.view.state(RED.state.DEFAULT);
} }
RED.workspaces.refresh();
},
show: function() {
if (editing_node) { if (editing_node) {
RED.sidebar.info.refresh(editing_node); RED.sidebar.info.refresh(editing_node);
} }
RED.workspaces.refresh();
} }
} }
/*).parent().on('keydown', function(evt) { /*).parent().on('keydown', function(evt) {
@ -704,16 +696,14 @@ RED.editor = (function() {
} }
editing_config_node["_"] = node_def._; editing_config_node["_"] = node_def._;
} }
editStack.push({node:editing_config_node});
RED.view.state(RED.state.EDITING); RED.view.state(RED.state.EDITING);
var trayOptions = { var trayOptions = {
title: (adding?RED._("editor.addNewConfig", {type:type}):RED._("editor.editConfig", {type:type})), title: (adding?RED._("editor.addNewConfig", {type:type}):RED._("editor.editConfig", {type:type})),
resize: function() { resize: function() {
var editing_node = editStack[editStack.length-1]; if (editing_config_node && editing_config_node._def.oneditresize) {
if (editing_node && editing_node.node._def.oneditresize) {
setTimeout(function() { setTimeout(function() {
var form = $("#node-config-dialog-edit-form"); var form = $("#node-config-dialog-edit-form");
editing_node.node._def.oneditresize.call(editing_node.node,{width:form.width(),height:form.height()}); editing_config_node._def.oneditresize.call(editing_config_node,{width:form.width(),height:form.height()});
},0); },0);
} }
}, },
@ -801,6 +791,11 @@ RED.editor = (function() {
RED.keyboard.enable(); RED.keyboard.enable();
} }
RED.workspaces.refresh(); RED.workspaces.refresh();
},
show: function() {
if (editing_config_node) {
RED.sidebar.info.refresh(editing_config_node);
}
} }
} }
trayOptions.buttons = [ trayOptions.buttons = [
@ -864,12 +859,11 @@ RED.editor = (function() {
var user = editing_config_node.users[i]; var user = editing_config_node.users[i];
validateNode(user); validateNode(user);
} }
updateConfigNodeSelect(configProperty,configType,editing_config_node.id);
RED.nodes.dirty(true); RED.nodes.dirty(true);
RED.view.redraw(true); RED.view.redraw(true);
RED.tray.close(); RED.tray.close(function() {
updateConfigNodeSelect(configProperty,configType,editing_config_node.id);
});
} }
}, },
{ {
@ -936,11 +930,12 @@ RED.editor = (function() {
} }
validateNode(user); validateNode(user);
} }
updateConfigNodeSelect(configProperty,configType,"");
RED.nodes.dirty(true); RED.nodes.dirty(true);
RED.view.redraw(); RED.view.redraw();
RED.history.push(historyEvent); RED.history.push(historyEvent);
RED.tray.close(); RED.tray.close(function() {
updateConfigNodeSelect(configProperty,configType,"");
});
} }
}); });
} }

13
editor/js/ui/tray.js
View File

@ -56,6 +56,7 @@ RED.tray = (function() {
options.open(el); options.open(el);
} }
$("#header-shade").show();
$("#editor-shade").show(); $("#editor-shade").show();
el.css({ el.css({
right: -(el.width()+10)+"px", right: -(el.width()+10)+"px",
@ -72,6 +73,9 @@ RED.tray = (function() {
if (options.resize) { if (options.resize) {
options.resize(); options.resize();
} }
if (options.show) {
options.show();
}
el.css({right:0}); el.css({right:0});
},0); },0);
} }
@ -106,7 +110,7 @@ RED.tray = (function() {
} }
}, },
close: function close() { close: function close(done) {
if (stack.length > 0) { if (stack.length > 0) {
var tray = stack.pop(); var tray = stack.pop();
tray.tray.css({ tray.tray.css({
@ -122,10 +126,17 @@ RED.tray = (function() {
oldTray.tray.appendTo("#editor-stack"); oldTray.tray.appendTo("#editor-stack");
setTimeout(function() { setTimeout(function() {
oldTray.tray.css({right:0}); oldTray.tray.css({right:0});
if (oldTray.options.show) {
oldTray.options.show();
}
},0); },0);
} }
if (done) {
done();
}
},200) },200)
if (stack.length === 0) { if (stack.length === 0) {
$("#header-shade").hide();
$("#editor-shade").hide(); $("#editor-shade").hide();
} }
} }

4
editor/sass/workspace.scss
View File

@ -105,7 +105,7 @@
} }
} }
#editor-shade { #editor-shade, #header-shade {
position: absolute; position: absolute;
top:0; top:0;
bottom:0; bottom:0;
@ -113,6 +113,8 @@
right:0; right:0;
background: rgba(220,220,220,0.5); background: rgba(220,220,220,0.5);
} }
#workspace-add-tab { #workspace-add-tab {
position: absolute; position: absolute;
box-sizing: border-box; box-sizing: border-box;

1
editor/templates/index.mst
View File

@ -39,6 +39,7 @@
<ul class="header-toolbar hide"> <ul class="header-toolbar hide">
<li><a id="btn-sidemenu" class="button" data-toggle="dropdown" href="#"><i class="fa fa-bars"></i></a></li> <li><a id="btn-sidemenu" class="button" data-toggle="dropdown" href="#"><i class="fa fa-bars"></i></a></li>
</ul> </ul>
<div id="header-shade" class="hide"></div>
</div> </div>
<div id="main-container" class="sidebar-closed hide"> <div id="main-container" class="sidebar-closed hide">
<div id="palette"> <div id="palette">