Add breakpoint editing to debugger

.travis.yml

@@ -16,6 +16,7 @@ node_js:
   - "7"
   - "6"
   - "4"
+  - "0.10"
 script:
   - istanbul cover ./node_modules/.bin/grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js || true ) && rm -rf coverage
 before_script:

CHANGELOG.md

@@ -1,119 +1,3 @@
-#### 0.16.1: Maintenance Release
-
- - Add colour swatches to debug when hex colour matched
- - Nodes with hasUsers set to false should not appear unused
- - Change hard error to verbose warning if using old node.js level
- - Don't filter debug properties starting with _ Fixes #1117
- - Node logged errors not displayed properly in debug pane Fixes #1116
- - Do not look for existing nodes when checking for wires on paste Fixes #1114
- - -v option not enabling verbose mode properly
- - Add node.js version check on startup
-
-#### 0.16.0: Milestone Release
-
-Runtime
- - Drop support for node 0.10 and 0.12
-
-Nodes
-
- - Add option to colourise debug console output Closes #1103
- - Add property validation to nodes using typedInput
- - Add common validator for typedInput fields Closes #1104
- - Update debug node console logging indicator icon Closes #1094
- - Let exec node (spawn) handle commands with spaces in path
- - Add symbol to debug node to indicate debugging also to console.log
- - Change file node to use node 4 syntax (drops support for 0.8)
- - add info for httprequest responseUrl property
- - Add res.responseUrl to httprequest node response
- - Add support for flow and global context in Template node (#1048)
- - Added YAML parser node (#1034)
- - node-red-node-serialport removed as a default node
-
-Editor
-
- - Add install/remove dialog to increase friction Closes #1109
- - Report node catalogue load errors Closes #1009
- - Properly report module remove errors in palette editor Fixes #1043
- - Update rather than hide install button after success install
- - Tweak search box styling
- - Display info tips slightly longer
- - Allow tips to be enabled/disabled via menu option
- - Info-tips update
- - Make typedInput keyboard navigable
- - update Font Awesome to 4.7.0
- - Add expression editor for jsonata
- - Overhaul keyboard handling and introduce editor actions
- - Add Japanese translation file(editor.json) (#1084)
- - Add quick-add node mode with cmd/ctrl-click
- - Add cmd/ctrl-click to quick add wires
- - Use json-stringify-safe to detect circular references in debug msgs
- - debug - format if time if correct length/range
- - Make Debug object explorable
- - Initial debug pop-out window
- - Add proper three-way diff view
- - Focus tray body when edit dialog opened
- - Hit enter to edit first node in selection
- - Add node delete button to edit dialog
- - Add notification when runtime stopped due to missing types Part of #832
-
-Fixes
-
- - Do not tie debug src loading to needsPermission Fixes #1111
- - Initialise nodeApp regardless of httpAdmin setting Closes #1096 #1095
- - Speed up reveal of search dialogs
- - Ensure flows exist before delegating status/error events Fixes #1069
- - Update package dependencies
- - Update MQTT to latest 2.2.1
- - Node status not being refreshed properly in the editor
- - Try to prevent auto-fill of password fields in node edit tray Fixes #1081
- - Fix whitespace in localfilesystem
- - fix bug where savesettings did not honor local settings variables (#1073)
- - Tidy up unused/duplicate editor messages Closes #922
- - Property expressions must not be blank
- - Tidy up merge commit of validatePropertyExpression
- - add port if wires array > number of ports declared.
- - Allow quoted property expressions Fixes #1101
- - Index all node properties for node search
- - Remove node 0.10 from travis config
- - update welcome message to use logger so it can be turned off/on if required (#1083)
- - Fix dynamically loading multiple node-sets from palette editor
- - Allow a node to reorder its outputs and maintain links Fixes #1031
-
-#### 0.15.3: Maintenance Release
-
- - Tcpgetfix: Another small check (#1070)
- - TCPGet: Ensure done() is called only once (#1068)
- - Allow $ and _ at start of property identifiers Fixes #1063
- - TCPGet: Separated the node.connected property for each instance (#1062)
- - Corrected 'overide' typo in XML node help (#1061)
- - TCPGet: Last property check (hopefully) (#1059)
- - Add additional safety checks to avoid acting on non-existent objects (#1057)
- - add --title for process name to command line options
- - add indicator for fire once on inject node
- - reimplement $(env var) replace to share common code.
- - Fix error message for missing node html file, and add test.
- - Let credentials also use $(...) substitutions from ENV
- - Rename insecureRedirect to requireHttps
- - Add setting to cause insecure redirect (#1054)
- - Palette editor fixes (#1033)
- - Close comms on stopServer in test helper (#1020)
- - Tcpgetfix (#1050)
- - TCPget: Store incoming messages alongside the client object to keep reference
- - Merge remote-tracking branch 'upstream/master' into tcpgetfix
- - TCPget can now handle concurrent sessions (#1042)
- - Better scope handling
- - Add security checks
- - small change to udp httpadmin
- - Fix comparison to "" in tcpin
- - Change scope of clients object
- - Works when connection is left open
- - First release of multi connection tcpget
- - Fix node.error() not printing when passed false (#1037)
- - fix test for CSV array input
- - different test for Pi (rather than use serial port name)
- - Fix missing 0 handling for css node with array input
-
-
 #### 0.15.2: Maintenance Release
 
  - Revert bidi changes to nodes and hide menu option until fixed Fixes #1024

CONTRIBUTING.md

@@ -38,13 +38,21 @@ If you want to raise a pull-request with a new feature, or a refactoring
 of existing code, it may well get rejected if you haven't discussed it on
 the [mailing list](https://groups.google.com/forum/#!forum/node-red) first.
 
-All contributors need to sign the JS Foundation's Contributor License Agreement.
-It is an online process and quick to do. You can read the details of the agreement
-here: https://cla.js.foundation/node-red/node-red.
+### Contributor License Agreement
 
-If you raise a pull-request without having signed the CLA, you will be prompted
-to do so automatically.
+In order for us to accept pull-requests, the contributor must first complete
+a Contributor License Agreement (CLA). This clarifies the intellectual
+property license granted with any contribution. It is for your protection as a
+Contributor as well as the protection of IBM and its customers; it does not
+change your rights to use your own Contributions for any other purpose.
 
+You can download the CLAs here:
+
+ - [individual](http://nodered.org/cla/node-red-cla-individual.pdf)
+ - [corporate](http://nodered.org/cla/node-red-cla-corporate.pdf)
+
+If you are an IBMer, please contact us directly as the contribution process is
+slightly different.
 
 ### Coding standards
 

Gruntfile.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,17 +110,15 @@ module.exports = function(grunt) {
                     "editor/js/nodes.js",
                     "editor/js/history.js",
                     "editor/js/validators.js",
-                    "editor/js/ui/utils.js",
+                    "editor/js/debugger.js",
                     "editor/js/ui/common/editableList.js",
                     "editor/js/ui/common/menu.js",
                     "editor/js/ui/common/popover.js",
                     "editor/js/ui/common/searchBox.js",
                     "editor/js/ui/common/tabs.js",
-                    "editor/js/ui/common/stack.js",
                     "editor/js/ui/common/typedInput.js",
-                    "editor/js/ui/actions.js",
+                    "editor/js/ui/utils.js",
                     "editor/js/ui/deploy.js",
-                    "editor/js/ui/diff.js",
                     "editor/js/ui/keyboard.js",
                     "editor/js/ui/workspaces.js",
                     "editor/js/ui/view.js",
@@ -155,10 +153,6 @@ module.exports = function(grunt) {
                     "public/vendor/vendor.css": [
                         // TODO: resolve relative resource paths in
                         //       bootstrap/FA/jquery
-                    ],
-                    "public/vendor/jsonata/jsonata.js": [
-                        "node_modules/jsonata/jsonata.js",
-                        "editor/vendor/jsonata/formatter.js"
                     ]
                 }
             }
@@ -167,11 +161,7 @@ module.exports = function(grunt) {
             build: {
                 files: {
                     'public/red/red.min.js': 'public/red/red.js',
-                    'public/red/main.min.js': 'public/red/main.js',
-                    'public/vendor/jsonata/jsonata.min.js': 'public/vendor/jsonata/jsonata.js',
-                    'public/vendor/ace/mode-jsonata.js': 'editor/vendor/jsonata/mode-jsonata.js',
-                    'public/vendor/ace/worker-jsonata.js': 'editor/vendor/jsonata/worker-jsonata.js',
-                    'public/vendor/ace/snippets/jsonata.js': 'editor/vendor/jsonata/snippets-jsonata.js'
+                    'public/red/main.min.js': 'public/red/main.js'
                 }
             }
         },
@@ -197,11 +187,6 @@ module.exports = function(grunt) {
                     'red/api/locales/en-US/editor.json',
                     'red/runtime/locales/en-US/runtime.json'
                 ]
-            },
-            keymaps: {
-                src: [
-                    'editor/js/keymap.json'
-                ]
             }
         },
         attachCopyright: {
@@ -238,7 +223,7 @@ module.exports = function(grunt) {
                 files: [
                     'editor/js/**/*.js'
                 ],
-                tasks: ['copy:build','concat','uglify','attachCopyright:js']
+                tasks: ['concat','uglify','attachCopyright:js']
             },
             sass: {
                 files: [
@@ -254,12 +239,6 @@ module.exports = function(grunt) {
                 ],
                 tasks: ['jsonlint:messages']
             },
-            keymaps: {
-                files: [
-                    'editor/js/keymap.json'
-                ],
-                tasks: ['jsonlint:keymaps','copy:build']
-            },
             misc: {
                 files: [
                     'CHANGELOG.md'
@@ -298,10 +277,6 @@ module.exports = function(grunt) {
                         src: 'editor/js/main.js',
                         dest: 'public/red/main.js'
                     },
-                    {
-                        src: 'editor/js/keymap.json',
-                        dest: 'public/red/keymap.json'
-                    },
                     {
                         cwd: 'editor/images',
                         src: '**',
@@ -400,7 +375,7 @@ module.exports = function(grunt) {
     grunt.registerMultiTask('attachCopyright', function() {
         var files = this.data.src;
         var copyright = "/**\n"+
-            " * Copyright JS Foundation and other contributors, http://js.foundation\n"+
+            " * Copyright 2013, 2015 IBM Corp.\n"+
             " *\n"+
             " * Licensed under the Apache License, Version 2.0 (the \"License\");\n"+
             " * you may not use this file except in compliance with the License.\n"+
@@ -461,7 +436,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('build',
         'Builds editor content',
-        ['clean:build','jsonlint','concat:build','concat:vendor','copy:build','uglify:build','sass:build','attachCopyright']);
+        ['clean:build','concat:build','concat:vendor','copy:build','uglify:build','sass:build','jsonlint:messages','attachCopyright']);
 
     grunt.registerTask('dev',
         'Developer mode: run node-red, watch for source changes and build/restart',

LICENSE

@@ -1,4 +1,3 @@
-Copyright JS Foundation and other contributors, http://js.foundation
 
                                  Apache License
                            Version 2.0, January 2004

README.md

@@ -60,15 +60,13 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena
 
 ## Authors
 
-Node-RED is a project of the [JS Foundation](http://js.foundation).
-
-It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
+Node-RED is a creation of [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
 
 * Nick O'Leary [@knolleary](http://twitter.com/knolleary)
 * Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
 
-
+For more open-source projects from IBM, head over [here](http://ibm.github.io).
 
 ## Copyright and license
 
-Copyright JS Foundation and other contributors, http://js.foundation under [the Apache 2.0 license](LICENSE).
+Copyright 2013, 2016 IBM Corp. under [the Apache 2.0 license](LICENSE).

bin/node-red-pi

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright JS Foundation and other contributors, http://js.foundation
+# Copyright 2015 IBM Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

editor/js/comms.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/debugger.js

@@ -0,0 +1,4 @@
+RED.debugger = (function() {
+
+
+})();

editor/js/events.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/history.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,289 +16,6 @@
 RED.history = (function() {
     var undo_history = [];
 
-    function undoEvent(ev) {
-        var i;
-        var len;
-        var node;
-        var subflow;
-        var modifiedTabs = {};
-        if (ev) {
-            if (ev.t == 'multi') {
-                len = ev.events.length;
-                for (i=len-1;i>=0;i--) {
-                    undoEvent(ev.events[i]);
-                }
-            } else if (ev.t == 'replace') {
-                RED.nodes.clear();
-                var imported = RED.nodes.import(ev.config);
-                imported[0].forEach(function(n) {
-                    if (ev.changed[n.id]) {
-                        n.changed = true;
-                    }
-                })
-
-                RED.nodes.version(ev.rev);
-            } else if (ev.t == 'add') {
-                if (ev.nodes) {
-                    for (i=0;i<ev.nodes.length;i++) {
-                        node = RED.nodes.node(ev.nodes[i]);
-                        if (node.z) {
-                            modifiedTabs[node.z] = true;
-                        }
-                        RED.nodes.remove(ev.nodes[i]);
-                    }
-                }
-                if (ev.links) {
-                    for (i=0;i<ev.links.length;i++) {
-                        RED.nodes.removeLink(ev.links[i]);
-                    }
-                }
-                if (ev.workspaces) {
-                    for (i=0;i<ev.workspaces.length;i++) {
-                        RED.nodes.removeWorkspace(ev.workspaces[i].id);
-                        RED.workspaces.remove(ev.workspaces[i]);
-                    }
-                }
-                if (ev.subflows) {
-                    for (i=0;i<ev.subflows.length;i++) {
-                        RED.nodes.removeSubflow(ev.subflows[i]);
-                        RED.workspaces.remove(ev.subflows[i]);
-                    }
-                }
-                if (ev.subflow) {
-                    if (ev.subflow.instances) {
-                        ev.subflow.instances.forEach(function(n) {
-                            var node = RED.nodes.node(n.id);
-                            if (node) {
-                                node.changed = n.changed;
-                                node.dirty = true;
-                            }
-                        });
-                    }
-                    if (ev.subflow.hasOwnProperty('changed')) {
-                        subflow = RED.nodes.subflow(ev.subflow.id);
-                        if (subflow) {
-                            subflow.changed = ev.subflow.changed;
-                        }
-                    }
-                }
-                if (ev.removedLinks) {
-                    for (i=0;i<ev.removedLinks.length;i++) {
-                        RED.nodes.addLink(ev.removedLinks[i]);
-                    }
-                }
-
-            } else if (ev.t == "delete") {
-                if (ev.workspaces) {
-                    for (i=0;i<ev.workspaces.length;i++) {
-                        RED.nodes.addWorkspace(ev.workspaces[i]);
-                        RED.workspaces.add(ev.workspaces[i]);
-                    }
-                }
-                if (ev.subflow && ev.subflow.subflow) {
-                    RED.nodes.addSubflow(ev.subflow.subflow);
-                }
-                if (ev.subflowInputs && ev.subflowInputs.length > 0) {
-                    subflow = RED.nodes.subflow(ev.subflowInputs[0].z);
-                    subflow.in.push(ev.subflowInputs[0]);
-                    subflow.in[0].dirty = true;
-                }
-                if (ev.subflowOutputs && ev.subflowOutputs.length > 0) {
-                    subflow = RED.nodes.subflow(ev.subflowOutputs[0].z);
-                    ev.subflowOutputs.sort(function(a,b) { return a.i-b.i});
-                    for (i=0;i<ev.subflowOutputs.length;i++) {
-                        var output = ev.subflowOutputs[i];
-                        subflow.out.splice(output.i,0,output);
-                        for (var j=output.i+1;j<subflow.out.length;j++) {
-                            subflow.out[j].i++;
-                            subflow.out[j].dirty = true;
-                        }
-                        RED.nodes.eachLink(function(l) {
-                            if (l.source.type == "subflow:"+subflow.id) {
-                                if (l.sourcePort >= output.i) {
-                                    l.sourcePort++;
-                                }
-                            }
-                        });
-                    }
-                }
-                if (ev.subflow && ev.subflow.hasOwnProperty('instances')) {
-                    ev.subflow.instances.forEach(function(n) {
-                        var node = RED.nodes.node(n.id);
-                        if (node) {
-                            node.changed = n.changed;
-                            node.dirty = true;
-                        }
-                    });
-                }
-                if (subflow) {
-                    RED.nodes.filterNodes({type:"subflow:"+subflow.id}).forEach(function(n) {
-                        n.inputs = subflow.in.length;
-                        n.outputs = subflow.out.length;
-                        while (n.outputs > n.ports.length) {
-                            n.ports.push(n.ports.length);
-                        }
-                        n.resize = true;
-                        n.dirty = true;
-                    });
-                }
-                if (ev.nodes) {
-                    for (i=0;i<ev.nodes.length;i++) {
-                        RED.nodes.add(ev.nodes[i]);
-                        modifiedTabs[ev.nodes[i].z] = true;
-                    }
-                }
-                if (ev.links) {
-                    for (i=0;i<ev.links.length;i++) {
-                        RED.nodes.addLink(ev.links[i]);
-                    }
-                }
-                if (ev.changes) {
-                    for (i in ev.changes) {
-                        if (ev.changes.hasOwnProperty(i)) {
-                            node = RED.nodes.node(i);
-                            if (node) {
-                                for (var d in ev.changes[i]) {
-                                    if (ev.changes[i].hasOwnProperty(d)) {
-                                        node[d] = ev.changes[i][d];
-                                    }
-                                }
-                                node.dirty = true;
-                            }
-                        }
-                    }
-
-                }
-            } else if (ev.t == "move") {
-                for (i=0;i<ev.nodes.length;i++) {
-                    var n = ev.nodes[i];
-                    n.n.x = n.ox;
-                    n.n.y = n.oy;
-                    n.n.dirty = true;
-                    n.n.changed = n.changed;
-                }
-                // A move could have caused a link splice
-                if (ev.links) {
-                    for (i=0;i<ev.links.length;i++) {
-                        RED.nodes.removeLink(ev.links[i]);
-                    }
-                }
-                if (ev.removedLinks) {
-                    for (i=0;i<ev.removedLinks.length;i++) {
-                        RED.nodes.addLink(ev.removedLinks[i]);
-                    }
-                }
-            } else if (ev.t == "edit") {
-                for (i in ev.changes) {
-                    if (ev.changes.hasOwnProperty(i)) {
-                        if (ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
-                            // This is a config node property
-                            var currentConfigNode = RED.nodes.node(ev.node[i]);
-                            if (currentConfigNode) {
-                                currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
-                            }
-                            var newConfigNode = RED.nodes.node(ev.changes[i]);
-                            if (newConfigNode) {
-                                newConfigNode.users.push(ev.node);
-                            }
-                        }
-                        ev.node[i] = ev.changes[i];
-                    }
-                }
-                if (ev.subflow) {
-                    if (ev.subflow.hasOwnProperty('inputCount')) {
-                        if (ev.node.in.length > ev.subflow.inputCount) {
-                            ev.node.in.splice(ev.subflow.inputCount);
-                        } else if (ev.subflow.inputs.length > 0) {
-                            ev.node.in = ev.node.in.concat(ev.subflow.inputs);
-                        }
-                    }
-                    if (ev.subflow.hasOwnProperty('outputCount')) {
-                        if (ev.node.out.length > ev.subflow.outputCount) {
-                            ev.node.out.splice(ev.subflow.outputCount);
-                        } else if (ev.subflow.outputs.length > 0) {
-                            ev.node.out = ev.node.out.concat(ev.subflow.outputs);
-                        }
-                    }
-                    if (ev.subflow.hasOwnProperty('instances')) {
-                        ev.subflow.instances.forEach(function(n) {
-                            var node = RED.nodes.node(n.id);
-                            if (node) {
-                                node.changed = n.changed;
-                                node.dirty = true;
-                            }
-                        });
-                    }
-                    RED.nodes.filterNodes({type:"subflow:"+ev.node.id}).forEach(function(n) {
-                        n.inputs = ev.node.in.length;
-                        n.outputs = ev.node.out.length;
-                        RED.editor.updateNodeProperties(n);
-                    });
-                } else {
-                    var outputMap;
-                    if (ev.outputMap) {
-                        outputMap = {};
-                        for (var port in ev.outputMap) {
-                            if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== "-1") {
-                                outputMap[ev.outputMap[port]] = port;
-                            }
-                        }
-                    }
-                    RED.editor.updateNodeProperties(ev.node,outputMap);
-                    RED.editor.validateNode(ev.node);
-                }
-                if (ev.links) {
-                    for (i=0;i<ev.links.length;i++) {
-                        RED.nodes.addLink(ev.links[i]);
-                    }
-                }
-                ev.node.dirty = true;
-                ev.node.changed = ev.changed;
-            } else if (ev.t == "createSubflow") {
-                if (ev.nodes) {
-                    RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
-                        n.z = ev.activeWorkspace;
-                        n.dirty = true;
-                    });
-                    for (i=0;i<ev.nodes.length;i++) {
-                        RED.nodes.remove(ev.nodes[i]);
-                    }
-                }
-                if (ev.links) {
-                    for (i=0;i<ev.links.length;i++) {
-                        RED.nodes.removeLink(ev.links[i]);
-                    }
-                }
-
-                RED.nodes.removeSubflow(ev.subflow.subflow);
-                RED.workspaces.remove(ev.subflow.subflow);
-
-                if (ev.removedLinks) {
-                    for (i=0;i<ev.removedLinks.length;i++) {
-                        RED.nodes.addLink(ev.removedLinks[i]);
-                    }
-                }
-            } else if (ev.t == "reorder") {
-                if (ev.order) {
-                    RED.workspaces.order(ev.order);
-                }
-            }
-            Object.keys(modifiedTabs).forEach(function(id) {
-                var subflow = RED.nodes.subflow(id);
-                if (subflow) {
-                    RED.editor.validateNode(subflow);
-                }
-            });
-
-            RED.nodes.dirty(ev.dirty);
-            RED.view.redraw(true);
-            RED.palette.refresh();
-            RED.workspaces.refresh();
-            RED.sidebar.config.refresh();
-        }
-
-    }
-
     return {
         //TODO: this function is a placeholder until there is a 'save' event that can be listened to
         markAllDirty: function() {
@@ -317,7 +34,269 @@ RED.history = (function() {
         },
         pop: function() {
             var ev = undo_history.pop();
-            undoEvent(ev);
+            var i;
+            var node;
+            var subflow;
+            var modifiedTabs = {};
+            if (ev) {
+                if (ev.t == 'add') {
+                    if (ev.nodes) {
+                        for (i=0;i<ev.nodes.length;i++) {
+                            node = RED.nodes.node(ev.nodes[i]);
+                            if (node.z) {
+                                modifiedTabs[node.z] = true;
+                            }
+                            RED.nodes.remove(ev.nodes[i]);
+                        }
+                    }
+                    if (ev.links) {
+                        for (i=0;i<ev.links.length;i++) {
+                            RED.nodes.removeLink(ev.links[i]);
+                        }
+                    }
+                    if (ev.workspaces) {
+                        for (i=0;i<ev.workspaces.length;i++) {
+                            RED.nodes.removeWorkspace(ev.workspaces[i].id);
+                            RED.workspaces.remove(ev.workspaces[i]);
+                        }
+                    }
+                    if (ev.subflows) {
+                        for (i=0;i<ev.subflows.length;i++) {
+                            RED.nodes.removeSubflow(ev.subflows[i]);
+                            RED.workspaces.remove(ev.subflows[i]);
+                        }
+                    }
+                    if (ev.subflow) {
+                        if (ev.subflow.instances) {
+                            ev.subflow.instances.forEach(function(n) {
+                                var node = RED.nodes.node(n.id);
+                                if (node) {
+                                    node.changed = n.changed;
+                                    node.dirty = true;
+                                }
+                            });
+                        }
+                        if (ev.subflow.hasOwnProperty('changed')) {
+                            subflow = RED.nodes.subflow(ev.subflow.id);
+                            if (subflow) {
+                                subflow.changed = ev.subflow.changed;
+                            }
+                        }
+                    }
+                    if (ev.removedLinks) {
+                        for (i=0;i<ev.removedLinks.length;i++) {
+                            RED.nodes.addLink(ev.removedLinks[i]);
+                        }
+                    }
+
+                } else if (ev.t == "delete") {
+                    if (ev.workspaces) {
+                        for (i=0;i<ev.workspaces.length;i++) {
+                            RED.nodes.addWorkspace(ev.workspaces[i]);
+                            RED.workspaces.add(ev.workspaces[i]);
+                        }
+                    }
+                    if (ev.subflow && ev.subflow.subflow) {
+                        RED.nodes.addSubflow(ev.subflow.subflow);
+                    }
+                    if (ev.subflowInputs && ev.subflowInputs.length > 0) {
+                        subflow = RED.nodes.subflow(ev.subflowInputs[0].z);
+                        subflow.in.push(ev.subflowInputs[0]);
+                        subflow.in[0].dirty = true;
+                    }
+                    if (ev.subflowOutputs && ev.subflowOutputs.length > 0) {
+                        subflow = RED.nodes.subflow(ev.subflowOutputs[0].z);
+                        ev.subflowOutputs.sort(function(a,b) { return a.i-b.i});
+                        for (i=0;i<ev.subflowOutputs.length;i++) {
+                            var output = ev.subflowOutputs[i];
+                            subflow.out.splice(output.i,0,output);
+                            for (var j=output.i+1;j<subflow.out.length;j++) {
+                                subflow.out[j].i++;
+                                subflow.out[j].dirty = true;
+                            }
+                            RED.nodes.eachLink(function(l) {
+                                if (l.source.type == "subflow:"+subflow.id) {
+                                    if (l.sourcePort >= output.i) {
+                                        l.sourcePort++;
+                                    }
+                                }
+                            });
+                        }
+                    }
+                    if (ev.subflow && ev.subflow.hasOwnProperty('instances')) {
+                        ev.subflow.instances.forEach(function(n) {
+                            var node = RED.nodes.node(n.id);
+                            if (node) {
+                                node.changed = n.changed;
+                                node.dirty = true;
+                            }
+                        });
+                    }
+                    if (subflow) {
+                        RED.nodes.filterNodes({type:"subflow:"+subflow.id}).forEach(function(n) {
+                            n.inputs = subflow.in.length;
+                            n.outputs = subflow.out.length;
+                            while (n.outputs > n.ports.length) {
+                                n.ports.push(n.ports.length);
+                            }
+                            n.resize = true;
+                            n.dirty = true;
+                        });
+                    }
+                    if (ev.nodes) {
+                        for (i=0;i<ev.nodes.length;i++) {
+                            RED.nodes.add(ev.nodes[i]);
+                            modifiedTabs[ev.nodes[i].z] = true;
+                        }
+                    }
+                    if (ev.links) {
+                        for (i=0;i<ev.links.length;i++) {
+                            RED.nodes.addLink(ev.links[i]);
+                        }
+                    }
+                    if (ev.changes) {
+                        for (i in ev.changes) {
+                            if (ev.changes.hasOwnProperty(i)) {
+                                node = RED.nodes.node(i);
+                                if (node) {
+                                    for (var d in ev.changes[i]) {
+                                        if (ev.changes[i].hasOwnProperty(d)) {
+                                            node[d] = ev.changes[i][d];
+                                        }
+                                    }
+                                    node.dirty = true;
+                                }
+                            }
+                        }
+
+                    }
+                } else if (ev.t == "move") {
+                    for (i=0;i<ev.nodes.length;i++) {
+                        var n = ev.nodes[i];
+                        n.n.x = n.ox;
+                        n.n.y = n.oy;
+                        n.n.dirty = true;
+                        n.n.changed = n.changed;
+                    }
+                    // A move could have caused a link splice
+                    if (ev.links) {
+                        for (i=0;i<ev.links.length;i++) {
+                            RED.nodes.removeLink(ev.links[i]);
+                        }
+                    }
+                    if (ev.removedLinks) {
+                        for (i=0;i<ev.removedLinks.length;i++) {
+                            RED.nodes.addLink(ev.removedLinks[i]);
+                        }
+                    }
+                } else if (ev.t == "edit") {
+                    for (i in ev.changes) {
+                        if (ev.changes.hasOwnProperty(i)) {
+                            if (ev.node._def.defaults[i].type) {
+                                // This is a config node property
+                                var currentConfigNode = RED.nodes.node(ev.node[i]);
+                                if (currentConfigNode) {
+                                    currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
+                                }
+                                var newConfigNode = RED.nodes.node(ev.changes[i]);
+                                if (newConfigNode) {
+                                    newConfigNode.users.push(ev.node);
+                                }
+                            }
+                            ev.node[i] = ev.changes[i];
+                        }
+                    }
+                    if (ev.subflow) {
+                        if (ev.subflow.hasOwnProperty('inputCount')) {
+                            if (ev.node.in.length > ev.subflow.inputCount) {
+                                ev.node.in.splice(ev.subflow.inputCount);
+                            } else if (ev.subflow.inputs.length > 0) {
+                                ev.node.in = ev.node.in.concat(ev.subflow.inputs);
+                            }
+                        }
+                        if (ev.subflow.hasOwnProperty('outputCount')) {
+                            if (ev.node.out.length > ev.subflow.outputCount) {
+                                ev.node.out.splice(ev.subflow.outputCount);
+                            } else if (ev.subflow.outputs.length > 0) {
+                                ev.node.out = ev.node.out.concat(ev.subflow.outputs);
+                            }
+                        }
+                        if (ev.subflow.hasOwnProperty('instances')) {
+                            ev.subflow.instances.forEach(function(n) {
+                                var node = RED.nodes.node(n.id);
+                                if (node) {
+                                    node.changed = n.changed;
+                                    node.dirty = true;
+                                }
+                            });
+                        }
+                        RED.nodes.filterNodes({type:"subflow:"+ev.node.id}).forEach(function(n) {
+                            n.inputs = ev.node.in.length;
+                            n.outputs = ev.node.out.length;
+                            RED.editor.updateNodeProperties(n);
+                        });
+                    } else {
+                        var outputMap;
+                        if (ev.outputMap) {
+                            outputMap = {};
+                            for (var port in ev.outputMap) {
+                                if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== -1) {
+                                    outputMap[ev.outputMap[port]] = port;
+                                }
+                            }
+                        }
+                        RED.editor.updateNodeProperties(ev.node,outputMap);
+                        RED.editor.validateNode(ev.node);
+                    }
+                    if (ev.links) {
+                        for (i=0;i<ev.links.length;i++) {
+                            RED.nodes.addLink(ev.links[i]);
+                        }
+                    }
+                    ev.node.dirty = true;
+                    ev.node.changed = ev.changed;
+                } else if (ev.t == "createSubflow") {
+                    if (ev.nodes) {
+                        RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
+                            n.z = ev.activeWorkspace;
+                            n.dirty = true;
+                        });
+                        for (i=0;i<ev.nodes.length;i++) {
+                            RED.nodes.remove(ev.nodes[i]);
+                        }
+                    }
+                    if (ev.links) {
+                        for (i=0;i<ev.links.length;i++) {
+                            RED.nodes.removeLink(ev.links[i]);
+                        }
+                    }
+
+                    RED.nodes.removeSubflow(ev.subflow.subflow);
+                    RED.workspaces.remove(ev.subflow.subflow);
+
+                    if (ev.removedLinks) {
+                        for (i=0;i<ev.removedLinks.length;i++) {
+                            RED.nodes.addLink(ev.removedLinks[i]);
+                        }
+                    }
+                } else if (ev.t == "reorder") {
+                    if (ev.order) {
+                        RED.workspaces.order(ev.order);
+                    }
+                }
+                Object.keys(modifiedTabs).forEach(function(id) {
+                    var subflow = RED.nodes.subflow(id);
+                    if (subflow) {
+                        RED.editor.validateNode(subflow);
+                    }
+                });
+
+                RED.nodes.dirty(ev.dirty);
+                RED.view.redraw(true);
+                RED.palette.refresh();
+                RED.workspaces.refresh();
+                RED.sidebar.config.refresh();
+            }
         },
         peek: function() {
             return undo_history[undo_history.length-1];

editor/js/i18n.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ RED.i18n = (function() {
                 dynamicLoad: false,
                 load:'current',
                 ns: {
-                    namespaces: ["editor","node-red","jsonata","infotips"],
+                    namespaces: ["editor","node-red"],
                     defaultNs: "editor"
                 },
                 fallbackLng: ['en-US'],

editor/js/keymap.json

@@ -1,38 +0,0 @@
-{
-    "*": {
-        "ctrl-shift-p":"core:manage-palette",
-        "ctrl-f": "core:search",
-        "ctrl-=": "core:zoom-in",
-        "ctrl--": "core:zoom-out",
-        "ctrl-0": "core:zoom-reset",
-        "ctrl-enter": "core:confirm-edit-tray",
-        "ctrl-escape": "core:cancel-edit-tray",
-        "ctrl-g i": "core:show-info-tab",
-        "ctrl-g d": "core:show-debug-tab",
-        "ctrl-g c": "core:show-config-tab",
-        "ctrl-e": "core:show-export-dialog",
-        "ctrl-i": "core:show-import-dialog",
-        "ctrl-space": "core:toggle-sidebar"
-    },
-    "workspace": {
-        "backspace": "core:delete-selection",
-        "delete": "core:delete-selection",
-        "enter": "core:edit-selected-node",
-        "ctrl-c": "core:copy-selection-to-internal-clipboard",
-        "ctrl-x": "core:cut-selection-to-internal-clipboard",
-        "ctrl-v": "core:paste-from-internal-clipboard",
-        "ctrl-z": "core:undo",
-        "ctrl-a": "core:select-all-nodes",
-        "shift-?": "core:show-help",
-        "up": "core:move-selection-up",
-        "right": "core:move-selection-right",
-        "down": "core:move-selection-down",
-        "left": "core:move-selection-left",
-        "shift-up": "core:step-selection-up",
-        "shift-right": "core:step-selection-right",
-        "shift-down": "core:step-selection-down",
-        "shift-left": "core:step-selection-left",
-        "ctrl-shift-j": "core:show-previous-tab",
-        "ctrl-shift-k": "core:show-next-tab"
-     }
-}

editor/js/main.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  **/
 (function() {
 
+
     function loadNodeList() {
         $.ajax({
             headers: {
@@ -24,6 +25,7 @@
             url: 'nodes',
             success: function(data) {
                 RED.nodes.setNodeList(data);
+
                 var nsCount = 0;
                 for (var i=0;i<data.length;i++) {
                     var ns = data[i];
@@ -78,23 +80,6 @@
                 if (/^#flow\/.+$/.test(currentHash)) {
                     RED.workspaces.show(currentHash.substring(6));
                 }
-
-                var persistentNotifications = {};
-                RED.comms.subscribe("notification/#",function(topic,msg) {
-                    var parts = topic.split("/");
-                    var notificationId = parts[1];
-                    if (msg.text) {
-                        var text = RED._(msg.text,{default:msg.text});
-                        if (!persistentNotifications.hasOwnProperty(notificationId)) {
-                            persistentNotifications[notificationId] = RED.notify(text,msg.type,msg.timeout === undefined,msg.timeout);
-                        } else {
-                            persistentNotifications[notificationId].update(text,msg.timeout);
-                        }
-                    } else if (persistentNotifications.hasOwnProperty(notificationId)) {
-                        persistentNotifications[notificationId].close();
-                        delete persistentNotifications[notificationId];
-                    }
-                });
                 RED.comms.subscribe("status/#",function(topic,msg) {
                     var parts = topic.split("/");
                     var node = RED.nodes.node(parts[1]);
@@ -103,17 +88,21 @@
                             msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
                         }
                         node.status = msg;
-                        node.dirty = true;
-                        RED.view.redraw();
+                        if (statusEnabled) {
+                            node.dirty = true;
+                            RED.view.redraw();
+                        }
                     }
                 });
                 RED.comms.subscribe("node/#",function(topic,msg) {
                     var i,m;
                     var typeList;
                     var info;
+
                     if (topic == "node/added") {
                         var addedTypes = [];
-                        msg.forEach(function(m) {
+                        for (i=0;i<msg.length;i++) {
+                            m = msg[i];
                             var id = m.id;
                             RED.nodes.addNodeSet(m);
                             addedTypes = addedTypes.concat(m.types);
@@ -122,7 +111,7 @@
                                     $("body").append(data);
                                 });
                             });
-                        });
+                        }
                         if (addedTypes.length) {
                             typeList = "<ul><li>"+addedTypes.join("</li><li>")+"</li></ul>";
                             RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
@@ -157,9 +146,6 @@
                             typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
                             RED.notify(RED._("palette.event.nodeDisabled", {count:msg.types.length})+typeList,"success");
                         }
-                    } else if (topic == "node/upgraded") {
-                        RED.notify(RED._("palette.event.nodeUpgraded", {module:msg.module,version:msg.version}),"success");
-                        RED.nodes.registry.setModulePendingUpdated(msg.module,msg.version);
                     }
                     // Refresh flow library to ensure any examples are updated
                     RED.library.loadFlowLibrary();
@@ -179,12 +165,19 @@
         });
     }
 
+    var statusEnabled = false;
+    function toggleStatus(state) {
+        statusEnabled = state;
+        RED.view.status(statusEnabled);
+    }
+
     function loadEditor() {
+
         var menuOptions = [];
         menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
-            {id:"menu-item-view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:"core:toggle-show-grid"},
-            {id:"menu-item-view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:"core:toggle-snap-grid"},
-            {id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:"core:toggle-status", selected: true},
+            {id:"menu-item-view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:RED.view.toggleShowGrid},
+            {id:"menu-item-view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:RED.view.toggleSnapGrid},
+            {id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:toggleStatus, selected: true},
             null,
             // {id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
             //     {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("")}}},
@@ -193,47 +186,48 @@
             //     {id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
             // ]},
             // null,
-            {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:"core:toggle-sidebar", selected: true}
+            {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}
         ]});
         menuOptions.push(null);
         menuOptions.push({id:"menu-item-import",label:RED._("menu.label.import"),options:[
-            {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-import-dialog"},
+            {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:RED.clipboard.import},
             {id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
         ]});
         menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),disabled:true,options:[
-            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:"core:show-export-dialog"},
-            {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:"core:library-export"}
+            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:RED.clipboard.export},
+            {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:RED.library.export}
         ]});
         menuOptions.push(null);
-        menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:"core:search"});
+        menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:RED.search.show});
         menuOptions.push(null);
-        menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:"core:show-config-tab"});
+        menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:function() {}});
         menuOptions.push({id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
-            {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:"core:add-flow"},
-            {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:"core:edit-flow"},
-            {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:"core:remove-flow"}
+            {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:RED.workspaces.add},
+            {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:RED.workspaces.edit},
+            {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:RED.workspaces.remove}
         ]});
         menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [
-            {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:"core:create-subflow"},
-            {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:"core:convert-to-subflow"},
+            {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:RED.subflow.createSubflow},
+            {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:RED.subflow.convertToSubflow},
         ]});
         menuOptions.push(null);
         if (RED.settings.theme('palette.editable') !== false) {
             RED.palette.editor.init();
-            menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:"core:manage-palette"});
+            menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:RED.palette.editor.show});
             menuOptions.push(null);
         }
 
-        menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:"core:show-help"});
-        menuOptions.push({id:"menu-item-show-tips",label:RED._("menu.label.showTips"),toggle:true,selected:true,onselect:"core:toggle-show-tips"});
+        menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:RED.keyboard.showHelp});
         menuOptions.push({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")
         });
-        menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: "core:show-about" });
+        menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: showAbout });
 
+        RED.menu.init({id:"btn-sidemenu",options: menuOptions});
 
         RED.user.init();
+
         RED.library.init();
         RED.palette.init();
         RED.sidebar.init();
@@ -243,21 +237,15 @@
         RED.search.init();
         RED.view.init();
         RED.editor.init();
-        RED.keyboard.init();
-        RED.diff.init();
-
-        RED.menu.init({id:"btn-sidemenu",options: menuOptions});
 
         RED.deploy.init(RED.settings.theme("deployButton",null));
 
-        RED.actions.add("core:show-about", showAbout);
-
+        RED.keyboard.add("workspace", /* ? */ 191,{shift:true},function() {RED.keyboard.showHelp();d3.event.preventDefault();});
         RED.comms.connect();
 
         $("#main-container").show();
         $(".header-toolbar").show();
 
-
         loadNodeList();
     }
 

editor/js/nodes.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,13 +24,21 @@ RED.nodes = (function() {
     var workspacesOrder =[];
     var subflows = {};
     var loadedFlowVersion = null;
-
-    var initialLoad;
+    var pending = {
+        deleted: {},
+        added: {}
+    };
 
     var dirty = false;
 
     function setDirty(d) {
         dirty = d;
+        if (!d) {
+            pending = {
+                deleted: {},
+                added: {}
+            };
+        }
         RED.events.emit("nodes:change",{dirty:dirty});
     }
 
@@ -42,10 +50,6 @@ RED.nodes = (function() {
         var nodeDefinitions = {};
 
         var exports = {
-            setModulePendingUpdated: function(module,version) {
-                moduleList[module].pending_version = version;
-                RED.events.emit("registry:module-updated",{module:module,version:version});
-            },
             getModule: function(module) {
                 return moduleList[module];
             },
@@ -82,9 +86,6 @@ RED.nodes = (function() {
                     local:ns.local,
                     sets:{}
                 };
-                if (ns.pending_version) {
-                    moduleList[ns.module].pending_version = ns.pending_version;
-                }
                 moduleList[ns.module].sets[ns.name] = ns;
                 RED.events.emit("registry:node-set-added",ns);
             },
@@ -122,7 +123,6 @@ RED.nodes = (function() {
             },
             registerNodeType: function(nt,def) {
                 nodeDefinitions[nt] = def;
-                def.type = nt;
                 if (def.category != "subflows") {
                     def.set = nodeSets[typeToId[nt]];
                     nodeSets[typeToId[nt]].added = true;
@@ -136,15 +136,10 @@ RED.nodes = (function() {
                     }
                     def["_"] = function() {
                         var args = Array.prototype.slice.call(arguments, 0);
-                        var original = args[0];
                         if (args[0].indexOf(":") === -1) {
                             args[0] = ns+":"+args[0];
                         }
-                        var result = RED._.apply(null,args);
-                        if (result === args[0]) {
-                            result = original;
-                        }
-                        return result;
+                        return RED._.apply(null,args);
                     }
 
                     // TODO: too tightly coupled into palette UI
@@ -173,14 +168,11 @@ RED.nodes = (function() {
     function addNode(n) {
         if (n.type.indexOf("subflow") !== 0) {
             n["_"] = n._def._;
-        } else {
-            n["_"] = RED._;
         }
         if (n._def.category == "config") {
             configNodes[n.id] = n;
         } else {
             n.ports = [];
-            if (n.wires && (n.wires.length > n.outputs)) { n.outputs = n.wires.length; }
             if (n.outputs) {
                 for (var i=0;i<n.outputs;i++) {
                     n.ports.push(i);
@@ -197,6 +189,8 @@ RED.nodes = (function() {
             }
             nodes.push(n);
         }
+        delete pending.deleted[n.id];
+        pending.added[n.id] = true;
         RED.events.emit('nodes:add',n);
     }
     function addLink(l) {
@@ -262,6 +256,12 @@ RED.nodes = (function() {
         if (node && node._def.onremove) {
             node._def.onremove.call(n);
         }
+        delete pending.added[id];
+        pending.deleted[id] = true;
+        removedNodes.forEach(function(node) {
+            delete pending.added[node.id];
+            pending.deleted[node.id] = true;
+        });
         return {links:removedLinks,nodes:removedNodes};
     }
 
@@ -274,6 +274,8 @@ RED.nodes = (function() {
 
     function addWorkspace(ws) {
         workspaces[ws.id] = ws;
+        pending.added[ws.id] = true;
+        delete pending.deleted[ws.id];
         ws._def = {
             defaults: {
                 label: {value:""}
@@ -311,6 +313,8 @@ RED.nodes = (function() {
             var result = removeNode(removedNodes[n].id);
             removedLinks = removedLinks.concat(result.links);
         }
+        pending.deleted[id] = true;
+        delete pending.added[id]
         return {nodes:removedNodes,links:removedLinks};
     }
 
@@ -331,7 +335,17 @@ RED.nodes = (function() {
             });
             sf.name = subflowName;
         }
+        sf._def = {
+            defaults:{},
+            icon:"subflow.png",
+            category: "subflows",
+            color: "#da9",
+            inputs: sf.in.length,
+            outputs: sf.out.length
+        }
         subflows[sf.id] = sf;
+        delete pending.deleted[sf.id];
+        pending.added[sf.id] = true;
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{name:{value:""}},
             info: sf.info,
@@ -343,19 +357,20 @@ RED.nodes = (function() {
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
             labelStyle: function() { return this.name?"node_label_italic":""; },
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
-            inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
-            outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
             set:{
                 module: "node-red"
             }
         });
-        sf._def = RED.nodes.getType("subflow:"+sf.id);
+
+
     }
     function getSubflow(id) {
         return subflows[id];
     }
     function removeSubflow(sf) {
         delete subflows[sf.id];
+        delete pending.added[sf.id];
+        pending.deleted[sf.id] = true;
         registry.removeNodeType("subflow:"+sf.id);
     }
 
@@ -426,7 +441,6 @@ RED.nodes = (function() {
         node.id = n.id;
         node.type = n.type;
         node.z = n.z;
-
         if (node.type == "unknown") {
             for (var p in n._orig) {
                 if (n._orig.hasOwnProperty(p)) {
@@ -474,13 +488,6 @@ RED.nodes = (function() {
                     node.wires[w.sourcePort].push(w.target.id);
                 }
             }
-
-            if (n.inputs > 0 && n.inputLabels && !/^\s*$/.test(n.inputLabels.join("")))  {
-                node.inputLabels = n.inputLabels.slice();
-            }
-            if (n.outputs > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) {
-                node.outputLabels = n.outputLabels.slice();
-            }
         }
         return node;
     }
@@ -518,13 +525,6 @@ RED.nodes = (function() {
             node.out.push(nOut);
         });
 
-        if (node.in.length > 0 && n.inputLabels && !/^\s*$/.test(n.inputLabels.join("")))  {
-            node.inputLabels = n.inputLabels.slice();
-        }
-        if (node.out.length > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) {
-            node.outputLabels = n.outputLabels.slice();
-        }
-
 
         return node;
     }
@@ -697,9 +697,6 @@ RED.nodes = (function() {
         if (!$.isArray(newNodes)) {
             newNodes = [newNodes];
         }
-        if (!initialLoad) {
-            initialLoad = JSON.parse(JSON.stringify(newNodes));
-        }
         var unknownTypes = [];
         for (i=0;i<newNodes.length;i++) {
             n = newNodes[i];
@@ -725,19 +722,17 @@ RED.nodes = (function() {
         }
 
         var activeWorkspace = RED.workspaces.active();
-        //TODO: check the z of the subflow instance and check _that_ if it exists
         var activeSubflow = getSubflow(activeWorkspace);
-        for (i=0;i<newNodes.length;i++) {
-            var m = /^subflow:(.+)$/.exec(newNodes[i].type);
-            if (m) {
-                var subflowId = m[1];
-                var parent = getSubflow(newNodes[i].z || activeWorkspace);
-                if (parent) {
+        if (activeSubflow) {
+            for (i=0;i<newNodes.length;i++) {
+                var m = /^subflow:(.+)$/.exec(newNodes[i].type);
+                if (m) {
+                    var subflowId = m[1];
                     var err;
-                    if (subflowId === parent.id) {
+                    if (subflowId === activeSubflow.id) {
                         err = new Error(RED._("notification.errors.cannotAddSubflowToItself"));
                     }
-                    if (subflowContains(subflowId,parent.id)) {
+                    if (subflowContains(m[1],activeSubflow.id)) {
                         err = new Error(RED._("notification.errors.cannotAddCircularReference"));
                     }
                     if (err) {
@@ -903,17 +898,7 @@ RED.nodes = (function() {
             if (n.type !== "workspace" && n.type !== "tab" && n.type !== "subflow") {
                 def = registry.getNodeType(n.type);
                 if (!def || def.category != "config") {
-                    var node = {
-                        x:n.x,
-                        y:n.y,
-                        z:n.z,
-                        type:0,
-                        wires:n.wires,
-                        inputLabels: n.inputLabels,
-                        outputLabels: n.outputLabels,
-                        changed:false,
-                        _config:{}
-                    };
+                    var node = {x:n.x,y:n.y,z:n.z,type:0,wires:n.wires,changed:false,_config:{}};
                     if (createNewIds) {
                         if (subflow_blacklist[n.z]) {
                             continue;
@@ -1029,6 +1014,7 @@ RED.nodes = (function() {
             "link out":"links"
         }
 
+
         // Remap all wires and config node references
         for (i=0;i<new_nodes.length;i++) {
             n = new_nodes[i];
@@ -1036,7 +1022,7 @@ RED.nodes = (function() {
                 for (var w1=0;w1<n.wires.length;w1++) {
                     var wires = (n.wires[w1] instanceof Array)?n.wires[w1]:[n.wires[w1]];
                     for (var w2=0;w2<wires.length;w2++) {
-                        if (node_map.hasOwnProperty(wires[w2])) {
+                        if (wires[w2] in node_map) {
                             var link = {source:n,sourcePort:w1,target:node_map[wires[w2]]};
                             addLink(link);
                             new_links.push(link);
@@ -1178,38 +1164,6 @@ RED.nodes = (function() {
         }
     }
 
-    function clear() {
-        nodes = [];
-        links = [];
-        configNodes = {};
-        workspacesOrder = [];
-        var subflowIds = Object.keys(subflows);
-        subflowIds.forEach(function(id) {
-            RED.subflow.removeSubflow(id)
-        });
-        var workspaceIds = Object.keys(workspaces);
-        workspaceIds.forEach(function(id) {
-            RED.workspaces.remove(workspaces[id]);
-        });
-        defaultWorkspace = null;
-
-        RED.nodes.dirty(true);
-        RED.view.redraw(true);
-        RED.palette.refresh();
-        RED.workspaces.refresh();
-        RED.sidebar.config.refresh();
-
-        // var node_defs = {};
-        // var nodes = [];
-        // var configNodes = {};
-        // var links = [];
-        // var defaultWorkspace;
-        // var workspaces = {};
-        // var workspacesOrder =[];
-        // var subflows = {};
-        // var loadedFlowVersion = null;
-    }
-
     return {
         registry:registry,
         setNodeList: registry.setNodeList,
@@ -1226,7 +1180,6 @@ RED.nodes = (function() {
 
         add: addNode,
         remove: removeNode,
-        clear: clear,
 
         addLink: addLink,
         removeLink: removeLink,
@@ -1275,19 +1228,14 @@ RED.nodes = (function() {
         node: getNode,
 
         version: flowVersion,
-        originalFlow: function(flow) {
-            if (flow === undefined) {
-                return initialLoad;
-            } else {
-                initialLoad = flow;
-            }
-        },
 
         filterNodes: filterNodes,
         filterLinks: filterLinks,
 
         import: importNodes,
 
+        pending: function() { return pending },
+
         getAllFlowNodes: getAllFlowNodes,
         createExportableNodeSet: createExportableNodeSet,
         createCompleteNodeSet: createCompleteNodeSet,

editor/js/red.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/settings.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014 IBM, Antoine Aflalo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/text/bidi.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/text/format.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/ui/actions.js

@@ -1,35 +0,0 @@
-RED.actions = (function() {
-    var actions = {
-
-    }
-
-    function addAction(name,handler) {
-        actions[name] = handler;
-    }
-    function removeAction(name) {
-        delete actions[name];
-    }
-    function getAction(name) {
-        return actions[name];
-    }
-    function invokeAction(name) {
-        if (actions.hasOwnProperty(name)) {
-            actions[name]();
-        }
-    }
-    function listActions() {
-        var result = [];
-        Object.keys(actions).forEach(function(action) {
-            var shortcut = RED.keyboard.getShortcut(action);
-            result.push({id:action,scope:shortcut?shortcut.scope:undefined,key:shortcut?shortcut.key:undefined})
-        })
-        return result;
-    }
-    return {
-        add: addAction,
-        remove: removeAction,
-        get: getAction,
-        invoke: invokeAction,
-        list: listActions
-    }
-})();

editor/js/ui/clipboard.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ RED.clipboard = (function() {
     var dialogContainer;
     var exportNodesDialog;
     var importNodesDialog;
-    var disabled = false;
 
     function setupDialogs() {
         dialog = $('<div id="clipboard-dialog" class="hide node-red-dialog"><form class="dialog-form form-horizontal"></form></div>')
@@ -129,9 +128,6 @@ RED.clipboard = (function() {
     }
 
     function importNodes() {
-        if (disabled) {
-            return;
-        }
         dialogContainer.empty();
         dialogContainer.append($(importNodesDialog));
         dialogContainer.i18n();
@@ -157,10 +153,6 @@ RED.clipboard = (function() {
     }
 
     function exportNodes() {
-        if (disabled) {
-            return;
-        }
-
         dialogContainer.empty();
         dialogContainer.append($(exportNodesDialog));
         dialogContainer.i18n();
@@ -265,7 +257,7 @@ RED.clipboard = (function() {
 
     function hideDropTarget() {
         $("#dropTarget").hide();
-        RED.keyboard.remove("escape");
+        RED.keyboard.remove(/* ESCAPE */ 27);
     }
 
     return {
@@ -282,32 +274,18 @@ RED.clipboard = (function() {
                     RED.menu.setDisabled("menu-item-export-library",false);
                 }
             });
-
-            RED.actions.add("core:show-export-dialog",exportNodes);
-            RED.actions.add("core:show-import-dialog",importNodes);
-
-
-            RED.events.on("editor:open",function() { disabled = true; });
-            RED.events.on("editor:close",function() { disabled = false; });
-            RED.events.on("search:open",function() { disabled = true; });
-            RED.events.on("search:close",function() { disabled = false; });
-            RED.events.on("type-search:open",function() { disabled = true; });
-            RED.events.on("type-search:close",function() { disabled = false; });
-            RED.events.on("palette-editor:open",function() { disabled = true; });
-            RED.events.on("palette-editor:close",function() { disabled = false; });
-
+            RED.keyboard.add("workspace", /* e */ 69,{ctrl:true},function(){exportNodes();d3.event.preventDefault();});
+            RED.keyboard.add("workspace", /* i */ 73,{ctrl:true},function(){importNodes();d3.event.preventDefault();});
 
             $('#chart').on("dragenter",function(event) {
-                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
-                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
                     $("#dropTarget").css({display:'table'});
-                    RED.keyboard.add("*", "escape" ,hideDropTarget);
+                    RED.keyboard.add("*", /* ESCAPE */ 27,hideDropTarget);
                 }
             });
 
             $('#dropTarget').on("dragover",function(event) {
-                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
-                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
                     event.preventDefault();
                 }
             })
@@ -315,24 +293,10 @@ RED.clipboard = (function() {
                 hideDropTarget();
             })
             .on("drop",function(event) {
-                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
-                    var data = event.originalEvent.dataTransfer.getData("text/plain");
-                    data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
-                    RED.view.importNodes(data);
-                } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
-                    var files = event.originalEvent.dataTransfer.files;
-                    if (files.length === 1) {
-                        var file = files[0];
-                        var reader = new FileReader();
-                        reader.onload = (function(theFile) {
-                            return function(e) {
-                                RED.view.importNodes(e.target.result);
-                            };
-                        })(file);
-                        reader.readAsText(file);
-                    }
-                }
+                var data = event.originalEvent.dataTransfer.getData("text/plain");
                 hideDropTarget();
+                data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
+                RED.view.importNodes(data);
                 event.preventDefault();
             });
 

editor/js/ui/common/editableList.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,6 @@
  *   - removable : boolean - whether to display delete button on items
  *   - addItem : function(row,index,itemData) - when an item is added
  *   - removeItem : function(itemData) - called when an item is removed
- *   - filter : function(itemData) - called for each item to determine if it should be shown
- *   - sort : function(itemDataA,itemDataB) - called to sort items
- *   - scrollOnAdd : boolean - whether to scroll to newly added items
  * methods:
  *   - addItem(itemData)
  *   - removeItem(itemData)
@@ -37,9 +34,6 @@
  *   - height(height)
  *   - items()
  *   - empty()
- *   - filter(filter)
- *   - sort(sort)
- *   - length()
  */
     $.widget( "nodered.editableList", {
         _create: function() {

editor/js/ui/common/menu.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+
+
 RED.menu = (function() {
 
     var menuItems = {};
@@ -31,17 +34,17 @@ RED.menu = (function() {
             var savedStateActive = isSavedStateActive(opt.id);
             if (savedStateActive) {
                 link.addClass("active");
-                triggerAction(opt.id,true);
+                opt.onselect.call(opt, true);
             } else if (savedStateActive === false) {
                 link.removeClass("active");
-                triggerAction(opt.id,false);
+                opt.onselect.call(opt, false);
             } else if (opt.hasOwnProperty("selected")) {
                 if (opt.selected) {
                     link.addClass("active");
                 } else {
                     link.removeClass("active");
                 }
-                triggerAction(opt.id,opt.selected);
+                opt.onselect.call(opt, opt.selected);
             }
         }
 
@@ -104,12 +107,10 @@ RED.menu = (function() {
                             setSelected(opt.id, !selected);
                         }
                     } else {
-                        triggerAction(opt.id);
+                        opt.onselect.call(opt);
                     }
                 });
-                if (opt.toggle) {
-                    setInitialState();
-                }
+                setInitialState();
             } else if (opt.href) {
                 link.attr("target","_blank").attr("href",opt.href);
             } else if (!opt.options) {
@@ -163,19 +164,6 @@ RED.menu = (function() {
         }
     }
 
-    function triggerAction(id, args) {
-        var opt = menuItems[id];
-        var callback = opt.onselect;
-        if (typeof opt.onselect === 'string') {
-            callback = RED.actions.get(opt.onselect);
-        }
-        if (callback) {
-            callback.call(opt,args);
-        } else {
-            console.log("No callback for",id,opt.onselect);
-        }
-    }
-
     function isSavedStateActive(id) {
         return RED.settings.get("menu-" + id);
     }
@@ -199,15 +187,11 @@ RED.menu = (function() {
             $("#"+id).removeClass("active");
         }
         if (opt && opt.onselect) {
-            triggerAction(opt.id,state);
+            opt.onselect.call(opt,state);
         }
         setSavedState(id, state);
     }
 
-    function toggleSelected(id) {
-        setSelected(id,!isSelected(id));
-    }
-
     function setDisabled(id,state) {
         if (state) {
             $("#"+id).parent().addClass("disabled");
@@ -247,6 +231,16 @@ RED.menu = (function() {
         var opt = menuItems[id];
         if (opt) {
             opt.onselect = action;
+            // $("#"+id).click(function() {
+            //     if ($(this).parent().hasClass("disabled")) {
+            //         return;
+            //     }
+            //     if (menuItems[id].toggle) {
+            //         setSelected(id,!isSelected(id));
+            //     } else {
+            //         menuItems[id].onselect.call(menuItems[id]);
+            //     }
+            // });
         }
     }
 
@@ -254,7 +248,6 @@ RED.menu = (function() {
         init: createMenu,
         setSelected: setSelected,
         isSelected: isSelected,
-        toggleSelected: toggleSelected,
         setDisabled: setDisabled,
         addItem: addItem,
         removeItem: removeItem,

editor/js/ui/common/popover.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/ui/common/searchBox.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/ui/common/stack.js

@@ -1,95 +0,0 @@
-/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-RED.stack = (function() {
-    function createStack(options) {
-        var container = options.container;
-
-        var entries = [];
-
-        return {
-            add: function(entry) {
-
-                entries.push(entry);
-                var entryContainer = $('<div class="palette-category">').appendTo(container);
-
-                var header = $('<div class="palette-header"></div>').appendTo(entryContainer);
-                var icon = $('<i class="fa fa-angle-down"></i>').appendTo(header);
-                $('<span></span>').html(entry.title).appendTo(header);
-                entry.content = $('<div class="editor-tray-content"></div>').appendTo(entryContainer);
-
-                if (entry.expanded) {
-                    icon.addClass("expanded");
-                } else {
-                    entry.content.hide();
-                }
-
-                header.click(function() {
-                    if (options.singleExpanded) {
-                        if (!entry.isExpanded()) {
-                            for (var i=0;i<entries.length;i++) {
-                                if (entries[i].isExpanded()) {
-                                    entries[i].collapse();
-                                }
-                            }
-                            entry.expand();
-                        }
-                    } else {
-                        entry.toggle();
-                    }
-                });
-                entry.toggle = function() {
-                    if (entry.isExpanded()) {
-                        entry.collapse();
-                        return false;
-                    } else {
-                        entry.expand();
-                        return true;
-                    }
-                };
-                entry.expand = function() {
-                    if (!entry.isExpanded()) {
-                        if (entry.onexpand) {
-                            entry.onexpand.call(entry);
-                        }
-                        icon.addClass("expanded");
-                        entry.content.slideDown(200);
-                        return true;
-                    }
-                };
-                entry.collapse = function() {
-                    if (entry.isExpanded()) {
-                        icon.removeClass("expanded");
-                        entry.content.slideUp(200);
-                        return true;
-                    }
-                };
-                entry.isExpanded = function() {
-                    return icon.hasClass("expanded");
-                };
-
-                return entry;
-
-            },
-
-        }
-
-    }
-
-    return {
-        create: createStack
-    }
-})();

editor/js/ui/common/tabs.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,9 +73,6 @@ RED.tabs = (function() {
         ul.children().addClass("red-ui-tab");
 
         function onTabClick() {
-            if (options.onclick) {
-                options.onclick(tabs[$(this).attr('href').slice(1)]);
-            }
             activateTab($(this));
             return false;
         }
@@ -108,9 +105,6 @@ RED.tabs = (function() {
             if (typeof link === "string") {
                 link = ul.find("a[href='#"+link+"']");
             }
-            if (link.length === 0) {
-                return;
-            }
             if (!link.parent().hasClass("active")) {
                 ul.children().removeClass("active");
                 ul.children().css({"transition": "width 100ms"});
@@ -132,18 +126,6 @@ RED.tabs = (function() {
                 },100);
             }
         }
-        function activatePreviousTab() {
-            var previous = ul.find("li.active").prev();
-            if (previous.length > 0) {
-                activateTab(previous.find("a"));
-            }
-        }
-        function activateNextTab() {
-            var next = ul.find("li.active").next();
-            if (next.length > 0) {
-                activateTab(next.find("a"));
-            }
-        }
 
         function updateTabWidths() {
             var tabs = ul.find("li.red-ui-tab");
@@ -321,8 +303,6 @@ RED.tabs = (function() {
             },
             removeTab: removeTab,
             activateTab: activateTab,
-            nextTab: activateNextTab,
-            previousTab: activatePreviousTab,
             resize: updateTabWidths,
             count: function() {
                 return ul.find("li.red-ui-tab").size();

editor/js/ui/common/typedInput.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,31 +14,87 @@
  * limitations under the License.
  **/
 (function($) {
+    function validateExpression(str) {
+        var length = str.length;
+        var start = 0;
+        var inString = false;
+        var inBox = false;
+        var quoteChar;
+        var v;
+        for (var i=0;i<length;i++) {
+            var c = str[i];
+            if (!inString) {
+                if (c === "'" || c === '"') {
+                    if (!inBox) {
+                        return false;
+                    }
+                    inString = true;
+                    quoteChar = c;
+                    start = i+1;
+                } else if (c === '.') {
+                    if (i===0 || i===length-1) {
+                        return false;
+                    }
+                    // Next char is a-z
+                    if (!/[a-z0-9]/i.test(str[i+1])) {
+                        return false;
+                    }
+                    start = i+1;
+                } else if (c === '[') {
+                    if (i === 0) {
+                        return false;
+                    }
+                    if (i===length-1) {
+                        return false;
+                    }
+                    // Next char is either a quote or a number
+                    if (!/["'\d]/.test(str[i+1])) {
+                        return false;
+                    }
+                    start = i+1;
+                    inBox = true;
+                } else if (c === ']') {
+                    if (!inBox) {
+                        return false;
+                    }
+                    if (start != i) {
+                        v = str.substring(start,i);
+                        if (!/^\d+$/.test(v)) {
+                            return false;
+                        }
+                    }
+                    start = i+1;
+                    inBox = false;
+                } else if (c === ' ') {
+                    return false;
+                }
+            } else {
+                if (c === quoteChar) {
+                    // Next char must be a ]
+                    if (!/\]/.test(str[i+1])) {
+                        return false;
+                    }
+                    start = i+1;
+                    inString = false;
+                }
+            }
+
+        }
+        if (inBox || inString) {
+            return false;
+        }
+        return true;
+    }
     var allOptions = {
-        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
-        flow: {value:"flow",label:"flow.",validate:RED.utils.validatePropertyExpression},
-        global: {value:"global",label:"global.",validate:RED.utils.validatePropertyExpression},
+        msg: {value:"msg",label:"msg.",validate:validateExpression},
+        flow: {value:"flow",label:"flow.",validate:validateExpression},
+        global: {value:"global",label:"global.",validate:validateExpression},
         str: {value:"str",label:"string",icon:"red/images/typedInput/az.png"},
         num: {value:"num",label:"number",icon:"red/images/typedInput/09.png",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
         bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.png",options:["true","false"]},
         json: {value:"json",label:"JSON",icon:"red/images/typedInput/json.png", validate: function(v) { try{JSON.parse(v);return true;}catch(e){return false;}}},
         re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.png"},
-        date: {value:"date",label:"timestamp",hasValue:false},
-        jsonata: {
-            value: "jsonata",
-            label: "expression",
-            icon: "red/images/typedInput/expr.png",
-            validate: function(v) { try{jsonata(v);return true;}catch(e){return false;}},
-            expand:function() {
-                var that = this;
-                RED.editor.editExpression({
-                    value: this.value().replace(/\t/g,"\n"),
-                    complete: function(v) {
-                        that.value(v.replace(/\n/g,"\t"));
-                    }
-                })
-            }
-        }
+        date: {value:"date",label:"timestamp",hasValue:false}
     };
     var nlsd = false;
 
@@ -132,7 +188,7 @@
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
 
-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
+
 
 
             this.type(this.options.default||this.typeList[0].value);
@@ -266,16 +322,11 @@
                 this.uiSelect.width(this.uiWidth);
             }
             if (this.typeMap[this.propertyType] && this.typeMap[this.propertyType].hasValue === false) {
-                this.selectTrigger.addClass("red-ui-typedInput-full-width");
+                this.selectTrigger.css('width',"100%");
             } else {
-                this.selectTrigger.removeClass("red-ui-typedInput-full-width");
+                this.selectTrigger.width('auto');
                 var labelWidth = this._getLabelWidth(this.selectTrigger);
                 this.elementDiv.css('left',labelWidth+"px");
-                if (this.optionExpandButton.is(":visible")) {
-                    this.elementDiv.css('right',"22px");
-                } else {
-                    this.elementDiv.css('right','0');
-                }
                 if (this.optionSelectTrigger) {
                     this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
                 }
@@ -345,9 +396,6 @@
                         this.selectLabel.text(opt.label);
                     }
                     if (opt.options) {
-                        if (this.optionExpandButton) {
-                            this.optionExpandButton.hide();
-                        }
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.show();
                             this.elementDiv.hide();
@@ -381,16 +429,6 @@
                             }
                             this.elementDiv.show();
                         }
-                        if (opt.expand && typeof opt.expand === 'function') {
-                            this.optionExpandButton.show();
-                            this.optionExpandButton.off('click');
-                            this.optionExpandButton.on('click',function(evt) {
-                                evt.preventDefault();
-                                opt.expand.call(that);
-                            })
-                        } else {
-                            this.optionExpandButton.hide();
-                        }
                         this.element.trigger('change',this.propertyType,this.value());
                     }
                     if (image) {

editor/js/ui/deploy.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,13 +30,13 @@ RED.deploy = (function() {
 
     var deploymentType = "full";
 
-    var currentDiff = null;
-
     function changeDeploymentType(type) {
         deploymentType = type;
         $("#btn-deploy-icon").attr("src",deploymentTypes[type].img);
     }
 
+    var currentDiff = null;
+
     /**
      * options:
      *   type: "default" - Button with drop-down options - no further customisation available
@@ -90,8 +90,6 @@ RED.deploy = (function() {
 
         $('#btn-deploy').click(function() { save(); });
 
-        RED.actions.add("core:deploy-flows",save);
-
         $( "#node-dialog-confirm-deploy" ).dialog({
                 title: RED._('deploy.confirm.button.confirm'),
                 modal: true,
@@ -100,33 +98,21 @@ RED.deploy = (function() {
                 height: "auto",
                 buttons: [
                     {
-                        text: RED._("common.label.cancel"),
+                        text: RED._("deploy.confirm.button.cancel"),
                         click: function() {
                             $( this ).dialog( "close" );
                         }
                     },
+                    // {
+                    //     id: "node-dialog-confirm-deploy-review",
+                    //     text: RED._("deploy.confirm.button.review"),
+                    //     class: "primary",
+                    //     click: function() {
+                    //         showDiff();
+                    //         $( this ).dialog( "close" );
+                    //     }
+                    // },
                     {
-                        id: "node-dialog-confirm-deploy-review",
-                        text: RED._("deploy.confirm.button.review"),
-                        class: "primary disabled",
-                        click: function() {
-                            if (!$("#node-dialog-confirm-deploy-review").hasClass('disabled')) {
-                                RED.diff.showRemoteDiff();
-                                $( this ).dialog( "close" );
-                            }
-                        }
-                    },
-                    {
-                        id: "node-dialog-confirm-deploy-merge",
-                        text: RED._("deploy.confirm.button.merge"),
-                        class: "primary disabled",
-                        click: function() {
-                            RED.diff.mergeDiff(currentDiff);
-                            $( this ).dialog( "close" );
-                        }
-                    },
-                    {
-                        id: "node-dialog-confirm-deploy-deploy",
                         text: RED._("deploy.confirm.button.confirm"),
                         class: "primary",
                         click: function() {
@@ -150,37 +136,10 @@ RED.deploy = (function() {
                 },
                 open: function() {
                     if ($( "#node-dialog-confirm-deploy-type" ).val() === "conflict") {
-                        $("#node-dialog-confirm-deploy-deploy").hide();
-                        $("#node-dialog-confirm-deploy-review").addClass('disabled').show();
-                        $("#node-dialog-confirm-deploy-merge").addClass('disabled').show();
-                        currentDiff = null;
-                        $("#node-dialog-confirm-deploy-conflict-checking").show();
-                        $("#node-dialog-confirm-deploy-conflict-auto-merge").hide();
-                        $("#node-dialog-confirm-deploy-conflict-manual-merge").hide();
-
-                        var now = Date.now();
-                        RED.diff.getRemoteDiff(function(diff) {
-                            var ellapsed = Math.max(1000 - (Date.now()-now), 0);
-                            currentDiff = diff;
-                            setTimeout(function() {
-                                $("#node-dialog-confirm-deploy-conflict-checking").hide();
-                                var d = Object.keys(diff.conflicts);
-                                if (d.length === 0) {
-                                    $("#node-dialog-confirm-deploy-conflict-auto-merge").show();
-                                    $("#node-dialog-confirm-deploy-merge").removeClass('disabled')
-                                } else {
-                                    $("#node-dialog-confirm-deploy-conflict-manual-merge").show();
-                                }
-                                $("#node-dialog-confirm-deploy-review").removeClass('disabled')
-                            },ellapsed);
-                        })
-
-
+                        // $("#node-dialog-confirm-deploy-review").show();
                         $("#node-dialog-confirm-deploy-hide").parent().hide();
                     } else {
-                        $("#node-dialog-confirm-deploy-deploy").show();
-                        $("#node-dialog-confirm-deploy-review").hide();
-                        $("#node-dialog-confirm-deploy-merge").hide();
+                        // $("#node-dialog-confirm-deploy-review").hide();
                         $("#node-dialog-confirm-deploy-hide").parent().show();
                     }
                 }
@@ -198,7 +157,198 @@ RED.deploy = (function() {
             }
         });
 
+        // $("#node-dialog-view-diff").dialog({
+        //     title: RED._('deploy.confirm.button.review'),
+        //     modal: true,
+        //     autoOpen: false,
+        //     buttons: [
+        //         {
+        //             text: RED._("deploy.confirm.button.cancel"),
+        //             click: function() {
+        //                 $( this ).dialog( "close" );
+        //             }
+        //         },
+        //         {
+        //             text: RED._("deploy.confirm.button.merge"),
+        //             class: "primary",
+        //             click: function() {
+        //                 $( this ).dialog( "close" );
+        //             }
+        //         }
+        //     ],
+        //     open: function() {
+        //         $(this).dialog({width:Math.min($(window).width(),900),height:Math.min($(window).height(),600)});
+        //     }
+        // });
 
+        // $("#node-dialog-view-diff-diff").editableList({
+        //     addButton: false,
+        //     scrollOnAdd: false,
+        //     addItem: function(container,i,object) {
+        //         var tab = object.tab.n;
+        //         var tabDiv = $('<div>',{class:"node-diff-tab collapsed"}).appendTo(container);
+        //
+        //         var titleRow = $('<div>',{class:"node-diff-tab-title"}).appendTo(tabDiv);
+        //         titleRow.click(function(evt) {
+        //             evt.preventDefault();
+        //             titleRow.parent().toggleClass('collapsed');
+        //         })
+        //         var chevron = $('<i class="fa fa-angle-down node-diff-chevron ">').appendTo(titleRow);
+        //         var title = $('<span>').html(tab.label||tab.id).appendTo(titleRow);
+        //
+        //         var stats = $('<span>',{class:"node-diff-tab-stats"}).appendTo(titleRow);
+        //
+        //         var addedCount = 0;
+        //         var deletedCount = 0;
+        //         var changedCount = 0;
+        //         var conflictedCount = 0;
+        //
+        //         object.tab.nodes.forEach(function(node) {
+        //             var realNode = RED.nodes.node(node.id);
+        //             var hasChanges = false;
+        //             if (currentDiff.added[node.id]) {
+        //                 addedCount++;
+        //                 hasChanges = true;
+        //             }
+        //             if (currentDiff.deleted[node.id]) {
+        //                 deletedCount++;
+        //                 hasChanges = true;
+        //             }
+        //             if (currentDiff.changed[node.id]) {
+        //                 changedCount++;
+        //                 hasChanges = true;
+        //             }
+        //             if (currentDiff.conflicted[node.id]) {
+        //                 conflictedCount++;
+        //                 hasChanges = true;
+        //             }
+        //
+        //             if (hasChanges) {
+        //                 var def = RED.nodes.getType(node.type)||{};
+        //                 var div = $("<div>",{class:"node-diff-node-entry collapsed"}).appendTo(tabDiv);
+        //                 var nodeTitleDiv = $("<div>",{class:"node-diff-node-entry-title"}).appendTo(div);
+        //                 nodeTitleDiv.click(function(evt) {
+        //                     evt.preventDefault();
+        //                     $(this).parent().toggleClass('collapsed');
+        //                 })
+        //                 var newNode = currentDiff.newConfig.all[node.id];
+        //                 var nodePropertiesDiv = $("<div>",{class:"node-diff-node-entry-properties"}).appendTo(div);
+        //
+        //                 var nodePropertiesTable = $("<table>").appendTo(nodePropertiesDiv);
+        //
+        //                 if (node.hasOwnProperty('x')) {
+        //                     if (newNode.x !== node.x || newNode.y !== node.y) {
+        //                         var currentPosition = node.x+", "+node.y
+        //                         var newPosition = newNode.x+", "+newNode.y;
+        //                         $("<tr><td>position</td><td>"+currentPosition+"</td><td>"+newPosition+"</td></tr>").appendTo(nodePropertiesTable);
+        //                     }
+        //                 }
+        //                 var properties = Object.keys(node).filter(function(p) { return p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
+        //                 if (def.defaults) {
+        //                     properties = properties.concat(Object.keys(def.defaults));
+        //                 }
+        //                 properties.forEach(function(d) {
+        //                     var localValue = JSON.stringify(node[d]);
+        //                     var remoteValue = JSON.stringify(newNode[d]);
+        //                     var originalValue = realNode._config[d];
+        //
+        //                     if (remoteValue !== originalValue) {
+        //                         var formattedProperty = formatNodeProperty(node[d]);
+        //                         var newFormattedProperty = formatNodeProperty(newNode[d]);
+        //                         if (localValue === originalValue) {
+        //                             // no conflict change
+        //                         } else {
+        //                             // conflicting change
+        //                         }
+        //                         $("<tr><td>"+d+'</td><td class="">'+formattedProperty+'</td><td class="node-diff-property-changed">'+newFormattedProperty+"</td></tr>").appendTo(nodePropertiesTable);
+        //                     }
+        //
+        //                 })
+        //                 var nodeChevron = $('<i class="fa fa-angle-down node-diff-chevron">').appendTo(nodeTitleDiv);
+        //
+        //
+        //                 // var leftColumn = $('<div>',{class:"node-diff-column"}).appendTo(div);
+        //                 // var rightColumn = $('<div>',{class:"node-diff-column"}).appendTo(div);
+        //                 // rightColumn.html("&nbsp");
+        //
+        //
+        //
+        //                 var nodeDiv = $("<div>",{class:"node-diff-node-entry-node"}).appendTo(nodeTitleDiv);
+        //                 var colour = def.color;
+        //                 var icon_url = "arrow-in.png";
+        //                 if (node.type === 'tab') {
+        //                     colour = "#C0DEED";
+        //                     icon_url = "subflow.png";
+        //                 } else if (def.category === 'config') {
+        //                     icon_url = "cog.png";
+        //                 } else if (node.type === 'unknown') {
+        //                     icon_url = "alert.png";
+        //                 } else {
+        //                     icon_url = def.icon;
+        //                 }
+        //                 nodeDiv.css('backgroundColor',colour);
+        //
+        //                 var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
+        //                 $('<div/>',{class:"palette_icon",style:"background-image: url(icons/"+icon_url+")"}).appendTo(iconContainer);
+        //
+        //
+        //
+        //                 var contentDiv = $('<div>',{class:"node-diff-node-description"}).appendTo(nodeTitleDiv);
+        //
+        //                 $('<span>',{class:"node-diff-node-label"}).html(node.label || node.name || node.id).appendTo(contentDiv);
+        //                 //$('<div>',{class:"red-ui-search-result-node-type"}).html(node.type).appendTo(contentDiv);
+        //                 //$('<div>',{class:"red-ui-search-result-node-id"}).html(node.id).appendTo(contentDiv);
+        //             }
+        //
+        //         });
+        //
+        //         var statsInfo = '<span class="node-diff-count">'+object.tab.nodes.length+" nodes"+
+        //                         (addedCount+deletedCount+changedCount+conflictedCount > 0 ? " : ":"")+
+        //                         "</span> "+
+        //                         ((addedCount > 0)?'<span class="node-diff-added">'+addedCount+' added</span> ':'')+
+        //                         ((deletedCount > 0)?'<span class="node-diff-deleted">'+deletedCount+' deleted</span> ':'')+
+        //                         ((changedCount > 0)?'<span class="node-diff-changed">'+changedCount+' changed</span> ':'')+
+        //                         ((conflictedCount > 0)?'<span class="node-diff-conflicted">'+conflictedCount+' conflicts</span>':'');
+        //         stats.html(statsInfo);
+        //
+        //
+        //
+        //         //
+        //         //
+        //         //
+        //         // var node = object.node;
+        //         // var realNode = RED.nodes.node(node.id);
+        //         // var def = RED.nodes.getType(object.node.type)||{};
+        //         // var l = "";
+        //         // if (def && def.label && realNode) {
+        //         //     l = def.label;
+        //         //     try {
+        //         //         l = (typeof l === "function" ? l.call(realNode) : l);
+        //         //     } catch(err) {
+        //         //         console.log("Definition error: "+node.type+".label",err);
+        //         //     }
+        //         // }
+        //         // l = l||node.label||node.name||node.id||"";
+        //         // console.log(node);
+        //         // var div = $('<div>').appendTo(container);
+        //         // div.html(l);
+        //     }
+        // });
+    }
+
+    function formatNodeProperty(prop) {
+        var formattedProperty = prop;
+        if (formattedProperty === null) {
+            formattedProperty = 'null';
+        } else if (formattedProperty === undefined) {
+            formattedProperty = 'undefined';
+        } else if (typeof formattedProperty === 'object') {
+            formattedProperty = JSON.stringify(formattedProperty);
+        }
+        if (/\n/.test(formattedProperty)) {
+            formattedProperty = "<pre>"+formattedProperty+"</pre>"
+        }
+        return formattedProperty;
     }
 
     function getNodeInfo(node) {
@@ -232,8 +382,145 @@ RED.deploy = (function() {
         $( "#node-dialog-confirm-deploy-conflict" ).show();
         $( "#node-dialog-confirm-deploy-type" ).val("conflict");
         $( "#node-dialog-confirm-deploy" ).dialog( "open" );
+
+        // $("#node-dialog-confirm-deploy-review").append($('<img src="red/images/spin.svg" style="background: rgba(255,255,255,0.8); margin-top: -16px; margin-left: -8px; height:16px; position: absolute; "/>'));
+        // $("#node-dialog-confirm-deploy-review .ui-button-text").css("opacity",0.4);
+        // $("#node-dialog-confirm-deploy-review").attr("disabled",true).addClass("disabled");
+        // $.ajax({
+        //     headers: {
+        //         "Accept":"application/json",
+        //     },
+        //     cache: false,
+        //     url: 'flows',
+        //     success: function(nodes) {
+        //         var newNodes = nodes.flows;
+        //         var newRevision = nodes.rev;
+        //         generateDiff(currentNodes,newNodes);
+        //         $("#node-dialog-confirm-deploy-review").attr("disabled",false).removeClass("disabled");
+        //         $("#node-dialog-confirm-deploy-review img").remove();
+        //         $("#node-dialog-confirm-deploy-review .ui-button-text").css("opacity",1);
+        //     }
+        // });
     }
 
+    // function parseNodes(nodeList) {
+    //     var tabOrder = [];
+    //     var tabs = {};
+    //     var subflows = {};
+    //     var globals = [];
+    //     var all = {};
+    //
+    //     nodeList.forEach(function(node) {
+    //         all[node.id] = node;
+    //         if (node.type === 'tab') {
+    //             tabOrder.push(node.id);
+    //             tabs[node.id] = {n:node,nodes:[]};
+    //         } else if (node.type === 'subflow') {
+    //             subflows[node.id] = {n:node,nodes:[]};
+    //         }
+    //     });
+    //
+    //     nodeList.forEach(function(node) {
+    //         if (node.type !== 'tab' && node.type !== 'subflow') {
+    //             if (tabs[node.z]) {
+    //                 tabs[node.z].nodes.push(node);
+    //             } else if (subflows[node.z]) {
+    //                 subflows[node.z].nodes.push(node);
+    //             } else {
+    //                 globals.push(node);
+    //             }
+    //         }
+    //     });
+    //
+    //     return {
+    //         all: all,
+    //         tabOrder: tabOrder,
+    //         tabs: tabs,
+    //         subflows: subflows,
+    //         globals: globals
+    //     }
+    // }
+
+    // function generateDiff(currentNodes,newNodes) {
+    //     var currentConfig = parseNodes(currentNodes);
+    //     var newConfig = parseNodes(newNodes);
+    //     var pending = RED.nodes.pending();
+    //     var added = {};
+    //     var deleted = {};
+    //     var changed = {};
+    //     var conflicted = {};
+    //
+    //
+    //     Object.keys(currentConfig.all).forEach(function(id) {
+    //         var node = RED.nodes.workspace(id)||RED.nodes.subflow(id)||RED.nodes.node(id);
+    //         if (!newConfig.all.hasOwnProperty(id)) {
+    //             if (!pending.added.hasOwnProperty(id)) {
+    //                 deleted[id] = true;
+    //                 conflicted[id] = node.changed;
+    //             }
+    //         } else if (JSON.stringify(currentConfig.all[id]) !== JSON.stringify(newConfig.all[id])) {
+    //             changed[id] = true;
+    //             conflicted[id] = node.changed;
+    //         }
+    //     });
+    //     Object.keys(newConfig.all).forEach(function(id) {
+    //         if (!currentConfig.all.hasOwnProperty(id) && !pending.deleted.hasOwnProperty(id)) {
+    //             added[id] = true;
+    //         }
+    //     });
+    //
+    //     // console.log("Added",added);
+    //     // console.log("Deleted",deleted);
+    //     // console.log("Changed",changed);
+    //     // console.log("Conflicted",conflicted);
+    //
+    //     var formatString = function(id) {
+    //         return conflicted[id]?"!":(added[id]?"+":(deleted[id]?"-":(changed[id]?"~":" ")));
+    //     }
+    //     newConfig.tabOrder.forEach(function(tabId) {
+    //         var tab = newConfig.tabs[tabId];
+    //         console.log(formatString(tabId),"Flow:",tab.n.label, "("+tab.n.id+")");
+    //         tab.nodes.forEach(function(node) {
+    //             console.log(" ",formatString(node.id),node.type,node.name || node.id);
+    //         })
+    //         if (currentConfig.tabs[tabId]) {
+    //             currentConfig.tabs[tabId].nodes.forEach(function(node) {
+    //                 if (deleted[node.id]) {
+    //                     console.log(" ",formatString(node.id),node.type,node.name || node.id);
+    //                 }
+    //             })
+    //         }
+    //     });
+    //     currentConfig.tabOrder.forEach(function(tabId) {
+    //         if (deleted[tabId]) {
+    //             console.log(formatString(tabId),"Flow:",tab.n.label, "("+tab.n.id+")");
+    //         }
+    //     });
+    //
+    //     currentDiff = {
+    //         currentConfig: currentConfig,
+    //         newConfig: newConfig,
+    //         added: added,
+    //         deleted: deleted,
+    //         changed: changed,
+    //         conflicted: conflicted
+    //     }
+    // }
+
+    // function showDiff() {
+    //     if (currentDiff) {
+    //         var list = $("#node-dialog-view-diff-diff");
+    //         list.editableList('empty');
+    //         var currentConfig = currentDiff.currentConfig;
+    //         currentConfig.tabOrder.forEach(function(tabId) {
+    //             var tab = currentConfig.tabs[tabId];
+    //             list.editableList('addItem',{tab:tab})
+    //         });
+    //     }
+    //     $("#node-dialog-view-diff").dialog("open");
+    // }
+
+
     function save(skipValidation,force) {
         if (!$("#btn-deploy").hasClass("disabled")) {
             if (!skipValidation) {
@@ -326,7 +613,6 @@ RED.deploy = (function() {
             }).done(function(data,textStatus,xhr) {
                 RED.nodes.dirty(false);
                 RED.nodes.version(data.rev);
-                RED.nodes.originalFlow(nns);
                 if (hasUnusedConfig) {
                     RED.notify(
                     '<p>'+RED._("deploy.successfulDeploy")+'</p>'+

editor/js/ui/editor.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -191,7 +191,7 @@ RED.editor = (function() {
             if (outputMap) {
                 RED.nodes.eachLink(function(l) {
                     if (l.source === node && outputMap.hasOwnProperty(l.sourcePort)) {
-                        if (outputMap[l.sourcePort] === "-1") {
+                        if (outputMap[l.sourcePort] === -1) {
                             removedLinks.push(l);
                         } else {
                             l.sourcePort = outputMap[l.sourcePort];
@@ -485,13 +485,12 @@ RED.editor = (function() {
     }
 
     function getEditStackTitle() {
+
         var title = '<ul class="editor-tray-breadcrumbs">';
         for (var i=0;i<editStack.length;i++) {
             var node = editStack[i];
             var label = node.type;
-            if (node.type === '_expression') {
-                label = "Expression editor";
-            } else if (node.type === 'subflow') {
+            if (node.type === 'subflow') {
                 label = RED._("subflow.editSubflow",{name:node.name})
             } else if (node.type.indexOf("subflow:")===0) {
                 var subflow = RED.nodes.subflow(node.type.substring(8));
@@ -518,148 +517,6 @@ RED.editor = (function() {
         return title;
     }
 
-    function buildEditForm(container,formId,type,ns) {
-        var dialogForm = $('<form id="'+formId+'" class="form-horizontal" autocomplete="off"></form>').appendTo(container);
-        dialogForm.html($("script[data-template-name='"+type+"']").html());
-        ns = ns||"node-red";
-        dialogForm.find('[data-i18n]').each(function() {
-            var current = $(this).attr("data-i18n");
-            var keys = current.split(";");
-            for (var i=0;i<keys.length;i++) {
-                var key = keys[i];
-                if (key.indexOf(":") === -1) {
-                    var prefix = "";
-                    if (key.indexOf("[")===0) {
-                        var parts = key.split("]");
-                        prefix = parts[0]+"]";
-                        key = parts[1];
-                    }
-                    keys[i] = prefix+ns+":"+key;
-                }
-            }
-            $(this).attr("data-i18n",keys.join(";"));
-        });
-        // Add dummy fields to prevent 'Enter' submitting the form in some
-        // cases, and also prevent browser auto-fill of password
-        // Add in reverse order as they are prepended...
-        $('<input type="password" style="display: none;" />').prependTo(dialogForm);
-        $('<input type="text" style="display: none;" />').prependTo(dialogForm);
-        dialogForm.submit(function(e) { e.preventDefault();});
-        return dialogForm;
-    }
-
-    function refreshLabelForm(container,node) {
-
-        var inputPlaceholder = node._def.inputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
-        var outputPlaceholder = node._def.outputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
-
-        var inputsDiv = $("#node-label-form-inputs");
-        var outputsDiv = $("#node-label-form-outputs");
-
-        var inputCount = node.inputs || node._def.inputs || 0;
-        var children = inputsDiv.children();
-        if (children.length < inputCount) {
-            for (i = children.length;i<inputCount;i++) {
-                buildLabelRow("input",i,"",inputPlaceholder).appendTo(inputsDiv);
-            }
-        } else if (children.length > inputCount) {
-            for (i=inputCount;i<children.length;i++) {
-                $(children[i]).remove();
-            }
-        }
-
-        var outputCount;
-        var i;
-        var formOutputs = $("#node-input-outputs").val();
-
-        if (formOutputs === undefined) {
-            outputCount = node.outputs || node._def.outputs || 0;
-        } else if (isNaN(formOutputs)) {
-            var outputMap = JSON.parse(formOutputs);
-            var keys = Object.keys(outputMap);
-            outputCount = 0;
-            var rows = [];
-            keys.forEach(function(p) {
-                var row = $("#node-label-form-output-"+p).parent();
-                if (row.length === 0 && outputMap[p] !== -1) {
-                    row = buildLabelRow("output",p,"",outputPlaceholder);
-                }
-                if (outputMap[p] !== -1) {
-                    outputCount++;
-                    rows.push({i:parseInt(outputMap[p]),r:row});
-                }
-            });
-            rows.sort(function(A,B) {
-                return A.i-B.i;
-            })
-            outputsDiv.children().detach();
-            rows.forEach(function(r,i) {
-                r.r.find("label").html((i+1)+".");
-                r.r.appendTo(outputsDiv);
-            })
-        } else {
-            outputCount = Math.max(0,parseInt(formOutputs));
-        }
-        children = outputsDiv.children();
-        if (children.length < outputCount) {
-            for (i = children.length;i<outputCount;i++) {
-                buildLabelRow("output",i,"").appendTo(outputsDiv);
-            }
-        } else if (children.length > outputCount) {
-            for (i=outputCount;i<children.length;i++) {
-                $(children[i]).remove();
-            }
-        }
-    }
-    function buildLabelRow(type, index, value, placeHolder) {
-        var result = $('<div>',{style:"margin: 5px 0px"});
-        var id = "node-label-form-"+type+"-"+index;
-        $('<label>',{for:id,style:"margin-right: 20px; text-align: right; width: 30px;"}).html((index+1)+".").appendTo(result);
-        var input = $('<input>',{type:"text",id:id, placeholder: placeHolder}).val(value).appendTo(result);
-        var clear = $('<button class="editor-button editor-button-small" style="margin-left: 10px"><i class="fa fa-times"></i></button>').appendTo(result);
-        clear.click(function(evt) {
-            evt.preventDefault();
-            input.val("");
-        })
-        return result;
-    }
-    function buildLabelForm(container,node) {
-        var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
-
-        var inputCount = node.inputs || node._def.inputs || 0;
-        var outputCount = node.outputs || node._def.outputs || 0;
-        if (node.type === 'subflow') {
-            inputCount = node.in.length;
-            outputCount = node.out.length;
-        }
-
-        var inputLabels = node.inputLabels || [];
-        var outputLabels = node.outputLabels || [];
-
-        var inputPlaceholder = node._def.inputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
-        var outputPlaceholder = node._def.outputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
-
-        var i,row;
-        $('<div class="form-row"><i class="fa fa-tag"></i> <span data-i18n="editor.labelInputs"></span><div id="node-label-form-inputs"></div></div>').appendTo(dialogForm);
-        var inputsDiv = $("#node-label-form-inputs");
-        if (inputCount > 0) {
-            for (i=0;i<inputCount;i++) {
-                buildLabelRow("input",i,inputLabels[i],inputPlaceholder).appendTo(inputsDiv);
-            }
-        } else {
-
-        }
-        $('<div class="form-row"><i class="fa fa-tag"></i> <span data-i18n="editor.labelOutputs"></span><div id="node-label-form-outputs"></div></div>').appendTo(dialogForm);
-        var outputsDiv = $("#node-label-form-outputs");
-        if (outputCount > 0) {
-            for (i=0;i<outputCount;i++) {
-                buildLabelRow("output",i,outputLabels[i],outputPlaceholder).appendTo(outputsDiv);
-            }
-        } else {
-
-        }
-    }
-
     function showEditDialog(node) {
         var editing_node = node;
         editStack.push(node);
@@ -782,11 +639,11 @@ RED.editor = (function() {
                             }
                         }
 
-                        var newValue;
                         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 if ("format" in editing_node._def.defaults[d] && editing_node._def.defaults[d].format !== "" && input[0].nodeName === "DIV") {
@@ -795,42 +652,8 @@ RED.editor = (function() {
                                         newValue = input.val();
                                     }
                                     if (newValue != null) {
-                                        if (d === "outputs") {
-                                            if  (newValue.trim() === "") {
-                                                continue;
-                                            }
-                                            if (isNaN(newValue)) {
-                                                outputMap = JSON.parse(newValue);
-                                                var outputCount = 0;
-                                                var outputsChanged = false;
-                                                var keys = Object.keys(outputMap);
-                                                keys.forEach(function(p) {
-                                                    if (isNaN(p)) {
-                                                        // New output;
-                                                        outputCount ++;
-                                                        delete outputMap[p];
-                                                    } else {
-                                                        outputMap[p] = outputMap[p]+"";
-                                                        if (outputMap[p] !== "-1") {
-                                                            outputCount++;
-                                                            if (outputMap[p] !== p) {
-                                                                // Output moved
-                                                                outputsChanged = true;
-                                                            } else {
-                                                                delete outputMap[p];
-                                                            }
-                                                        } else {
-                                                            // Output removed
-                                                            outputsChanged = true;
-                                                        }
-                                                    }
-                                                });
-
-                                                newValue = outputCount;
-                                                if (outputsChanged) {
-                                                    changed = true;
-                                                }
-                                            }
+                                        if (d === "outputs" && (newValue.trim() === "" || isNaN(newValue))) {
+                                            continue;
                                         }
                                         if (editing_node[d] != newValue) {
                                             if (editing_node._def.defaults[d].type) {
@@ -862,31 +685,14 @@ RED.editor = (function() {
                             var credsChanged = updateNodeCredentials(editing_node,credDefinition,prefix);
                             changed = changed || credsChanged;
                         }
-                        // if (editing_node.hasOwnProperty("_outputs")) {
-                        //     outputMap = editing_node._outputs;
-                        //     delete editing_node._outputs;
-                        //     if (Object.keys(outputMap).length > 0) {
-                        //         changed = true;
-                        //     }
-                        // }
+                        if (editing_node.hasOwnProperty("_outputs")) {
+                            outputMap = editing_node._outputs;
+                            delete editing_node._outputs;
+                            if (Object.keys(outputMap).length > 0) {
+                                changed = true;
+                            }
+                        }
                         var removedLinks = updateNodeProperties(editing_node,outputMap);
-
-                        var inputLabels = $("#node-label-form-inputs").children().find("input");
-                        var outputLabels = $("#node-label-form-outputs").children().find("input");
-
-                        newValue = inputLabels.map(function() { return $(this).val();}).toArray().slice(0,editing_node.inputs);
-                        if (JSON.stringify(newValue) !== JSON.stringify(editing_node.inputLabels)) {
-                            changes.inputLabels = editing_node.inputLabels;
-                            editing_node.inputLabels = newValue;
-                            changed = true;
-                        }
-                        newValue = outputLabels.map(function() { return $(this).val();}).toArray().slice(0,editing_node.outputs);
-                        if (JSON.stringify(newValue) !== JSON.stringify(editing_node.outputLabels)) {
-                            changes.outputLabels = editing_node.outputLabels;
-                            editing_node.outputLabels = newValue;
-                            changed = true;
-                        }
-
                         if (changed) {
                             var wasChanged = editing_node.changed;
                             editing_node.changed = true;
@@ -935,9 +741,8 @@ RED.editor = (function() {
             ],
             resize: function(dimensions) {
                 editTrayWidthCache[type] = dimensions.width;
-                $(".editor-tray-content").height(dimensions.height - 78);
-                var form = $(".editor-tray-content form").height(dimensions.height - 78 - 40);
                 if (editing_node && editing_node._def.oneditresize) {
+                    var form = $("#dialog-form");
                     try {
                         editing_node._def.oneditresize.call(editing_node,{width:form.width(),height:form.height()});
                     } catch(err) {
@@ -946,39 +751,38 @@ RED.editor = (function() {
                 }
             },
             open: function(tray) {
-                var trayFooter = tray.find(".editor-tray-footer");
-                var trayBody = tray.find('.editor-tray-body');
-                trayBody.parent().css('overflow','hidden');
-
-                var stack = RED.stack.create({
-                    container: trayBody,
-                    singleExpanded: true
-                });
-                var nodeProperties = stack.add({
-                    title: RED._("editor.nodeProperties"),
-                    expanded: true
-                });
-                var portLabels = stack.add({
-                    title: RED._("editor.portLabels"),
-                    onexpand: function() {
-                        refreshLabelForm(this.content,node);
-                    }
-                });
-
                 if (editing_node) {
                     RED.sidebar.info.refresh(editing_node);
                 }
+                var trayBody = tray.find('.editor-tray-body');
+                var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody);
+                dialogForm.html($("script[data-template-name='"+type+"']").html());
                 var ns;
                 if (node._def.set.module === "node-red") {
                     ns = "node-red";
                 } else {
                     ns = node._def.set.id;
                 }
-                buildEditForm(nodeProperties.content,"dialog-form",type,ns);
-                buildLabelForm(portLabels.content,node);
-
+                dialogForm.find('[data-i18n]').each(function() {
+                    var current = $(this).attr("data-i18n");
+                    var keys = current.split(";");
+                    for (var i=0;i<keys.length;i++) {
+                        var key = keys[i];
+                        if (key.indexOf(":") === -1) {
+                            var prefix = "";
+                            if (key.indexOf("[")===0) {
+                                var parts = key.split("]");
+                                prefix = parts[0]+"]";
+                                key = parts[1];
+                            }
+                            keys[i] = prefix+ns+":"+key;
+                        }
+                    }
+                    $(this).attr("data-i18n",keys.join(";"));
+                });
+                $('<input type="text" style="display: none;" />').prependTo(dialogForm);
                 prepareEditDialog(node,node._def,"node-input");
-                trayBody.i18n();
+                dialogForm.i18n();
             },
             close: function() {
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
@@ -1069,6 +873,7 @@ RED.editor = (function() {
             },
             open: function(tray) {
                 var trayHeader = tray.find(".editor-tray-header");
+                var trayBody = tray.find(".editor-tray-body");
                 var trayFooter = tray.find(".editor-tray-footer");
 
                 if (node_def.hasUsers !== false) {
@@ -1076,8 +881,21 @@ RED.editor = (function() {
                 }
                 trayFooter.append('<span id="node-config-dialog-scope-container"><span id="node-config-dialog-scope-warning" data-i18n="[title]editor.errors.scopeChange"><i class="fa fa-warning"></i></span><select id="node-config-dialog-scope"></select></span>');
 
-                var dialogForm = buildEditForm(tray.find('.editor-tray-body'),"node-config-dialog-edit-form",type,ns);
-
+                var dialogForm = $('<form id="node-config-dialog-edit-form" class="form-horizontal"></form>').appendTo(trayBody);
+                dialogForm.html($("script[data-template-name='"+type+"']").html());
+                dialogForm.find('[data-i18n]').each(function() {
+                    var current = $(this).attr("data-i18n");
+                    if (current.indexOf(":") === -1) {
+                        var prefix = "";
+                        if (current.indexOf("[")===0) {
+                            var parts = current.split("]");
+                            prefix = parts[0]+"]";
+                            current = parts[1];
+                        }
+                        $(this).attr("data-i18n",prefix+ns+":"+current);
+                    }
+                });
+                $('<input type="text" style="display: none;" />').prependTo(dialogForm);
                 prepareEditDialog(editing_config_node,node_def,"node-config-input");
                 if (editing_config_node._def.exclusive) {
                     $("#node-config-dialog-scope").hide();
@@ -1449,21 +1267,6 @@ RED.editor = (function() {
                             editing_node.info = newDescription;
                             changed = true;
                         }
-                        var inputLabels = $("#node-label-form-inputs").children().find("input");
-                        var outputLabels = $("#node-label-form-outputs").children().find("input");
-
-                        var newValue = inputLabels.map(function() { return $(this).val();}).toArray().slice(0,editing_node.inputs);
-                        if (JSON.stringify(newValue) !== JSON.stringify(editing_node.inputLabels)) {
-                            changes.inputLabels = editing_node.inputLabels;
-                            editing_node.inputLabels = newValue;
-                            changed = true;
-                        }
-                        newValue = outputLabels.map(function() { return $(this).val();}).toArray().slice(0,editing_node.outputs);
-                        if (JSON.stringify(newValue) !== JSON.stringify(editing_node.outputLabels)) {
-                            changes.outputLabels = editing_node.outputLabels;
-                            editing_node.outputLabels = newValue;
-                            changed = true;
-                        }
 
                         RED.palette.refresh();
 
@@ -1501,10 +1304,7 @@ RED.editor = (function() {
                     }
                 }
             ],
-            resize: function(dimensions) {
-                $(".editor-tray-content").height(dimensions.height - 78);
-                var form = $(".editor-tray-content form").height(dimensions.height - 78 - 40);
-
+            resize: function() {
                 var rows = $("#dialog-form>div:not(.node-text-editor-row)");
                 var editorRow = $("#dialog-form>div.node-text-editor-row");
                 var height = $("#dialog-form").height();
@@ -1516,28 +1316,33 @@ RED.editor = (function() {
                 subflowEditor.resize();
             },
             open: function(tray) {
-                var trayFooter = tray.find(".editor-tray-footer");
-                var trayBody = tray.find('.editor-tray-body');
-                trayBody.parent().css('overflow','hidden');
-
-                var stack = RED.stack.create({
-                    container: trayBody,
-                    singleExpanded: true
-                });
-                var nodeProperties = stack.add({
-                    title: RED._("editor.nodeProperties"),
-                    expanded: true
-                });
-                var portLabels = stack.add({
-                    title: RED._("editor.portLabels")
-                });
-
-
-
                 if (editing_node) {
                     RED.sidebar.info.refresh(editing_node);
                 }
-                var dialogForm = buildEditForm(nodeProperties.content,"dialog-form","subflow-template");
+                var trayBody = tray.find('.editor-tray-body');
+                var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody);
+                dialogForm.html($("script[data-template-name='subflow-template']").html());
+                var ns = "node-red";
+                dialogForm.find('[data-i18n]').each(function() {
+                    var current = $(this).attr("data-i18n");
+                    var keys = current.split(";");
+                    for (var i=0;i<keys.length;i++) {
+                        var key = keys[i];
+                        if (key.indexOf(":") === -1) {
+                            var prefix = "";
+                            if (key.indexOf("[")===0) {
+                                var parts = key.split("]");
+                                prefix = parts[0]+"]";
+                                key = parts[1];
+                            }
+                            keys[i] = prefix+ns+":"+key;
+                        }
+                    }
+                    $(this).attr("data-i18n",keys.join(";"));
+                });
+                $('<input type="text" style="display: none;" />').prependTo(dialogForm);
+
+                dialogForm.submit(function(e) { e.preventDefault();});
                 subflowEditor = RED.editor.createEditor({
                     id: 'subflow-input-info-editor',
                     mode: 'ace/mode/markdown',
@@ -1556,9 +1361,7 @@ RED.editor = (function() {
                     }
                 });
                 $("#subflow-dialog-user-count").html(RED._("subflow.subflowInstances", {count:userCount})).show();
-
-                buildLabelForm(portLabels.content,subflow);
-                trayBody.i18n();
+                dialogForm.i18n();
             },
             close: function() {
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
@@ -1575,183 +1378,22 @@ RED.editor = (function() {
         RED.tray.show(trayOptions);
     }
 
-
-    function editExpression(options) {
-        var value = options.value;
-        var onComplete = options.complete;
-        var type = "_expression"
-        editStack.push({type:type});
-        RED.view.state(RED.state.EDITING);
-        var expressionEditor;
-
-        var trayOptions = {
-            title: getEditStackTitle(),
-            buttons: [
-                {
-                    id: "node-dialog-cancel",
-                    text: RED._("common.label.cancel"),
-                    click: function() {
-                        RED.tray.close();
-                    }
-                },
-                {
-                    id: "node-dialog-ok",
-                    text: RED._("common.label.done"),
-                    class: "primary",
-                    click: function() {
-                        $("#node-input-expression-help").html("");
-                        onComplete(expressionEditor.getValue());
-                        RED.tray.close();
-                    }
-                }
-            ],
-            resize: function(dimensions) {
-                editTrayWidthCache[type] = dimensions.width;
-
-                var rows = $("#dialog-form>div:not(.node-text-editor-row)");
-                var editorRow = $("#dialog-form>div.node-text-editor-row");
-                var height = $("#dialog-form").height();
-                for (var i=0;i<rows.size();i++) {
-                    height -= $(rows[i]).outerHeight(true);
-                }
-                height -= (parseInt($("#dialog-form").css("marginTop"))+parseInt($("#dialog-form").css("marginBottom")));
-                $(".node-text-editor").css("height",height+"px");
-                expressionEditor.resize();
-            },
-            open: function(tray) {
-                var trayBody = tray.find('.editor-tray-body');
-                var dialogForm = buildEditForm(tray.find('.editor-tray-body'),'dialog-form','_expression','editor');
-                var funcSelect = $("#node-input-expression-func");
-                Object.keys(jsonata.functions).forEach(function(f) {
-                    funcSelect.append($("<option></option>").val(f).text(f));
-                })
-                funcSelect.change(function(e) {
-                    var f = $(this).val();
-                    var args = RED._('jsonata:'+f+".args",{defaultValue:''});
-                    var title = "<h5>"+f+"("+args+")</h5>";
-                    var body = marked(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
-                    $("#node-input-expression-help").html(title+"<p>"+body+"</p>");
-
-                })
-                expressionEditor = RED.editor.createEditor({
-                    id: 'node-input-expression',
-                    value: "",
-                    mode:"ace/mode/jsonata",
-                    options: {
-                        enableBasicAutocompletion:true,
-                        enableSnippets:true,
-                        enableLiveAutocompletion: true
-                    }
-                });
-                var currentToken = null;
-                var currentTokenPos = -1;
-                var currentFunctionMarker = null;
-
-                expressionEditor.getSession().setValue(value||"",-1);
-                expressionEditor.on("changeSelection", function() {
-                    var c = expressionEditor.getCursorPosition();
-                    var token = expressionEditor.getSession().getTokenAt(c.row,c.column);
-                    if (token !== currentToken || (token && /paren/.test(token.type) && c.column !== currentTokenPos)) {
-                        currentToken = token;
-                        var r,p;
-                        var scopedFunction = null;
-                        if (token && token.type === 'keyword') {
-                            r = c.row;
-                            scopedFunction = token;
-                        } else {
-                            var depth = 0;
-                            var next = false;
-                            if (token) {
-                                if (token.type === 'paren.rparen') {
-                                    // If this is a block of parens ')))', set
-                                    // depth to offset against the cursor position
-                                    // within the block
-                                    currentTokenPos = c.column;
-                                    depth = c.column - (token.start + token.value.length);
-                                }
-                                r = c.row;
-                                p = token.index;
-                            } else {
-                                r = c.row-1;
-                                p = -1;
-                            }
-                            while ( scopedFunction === null && r > -1) {
-                                var rowTokens = expressionEditor.getSession().getTokens(r);
-                                if (p === -1) {
-                                    p = rowTokens.length-1;
-                                }
-                                while (p > -1) {
-                                    var type = rowTokens[p].type;
-                                    if (next) {
-                                        if (type === 'keyword') {
-                                            scopedFunction = rowTokens[p];
-                                            // console.log("HIT",scopedFunction);
-                                            break;
-                                        }
-                                        next = false;
-                                    }
-                                    if (type === 'paren.lparen') {
-                                        depth-=rowTokens[p].value.length;
-                                    } else if (type === 'paren.rparen') {
-                                        depth+=rowTokens[p].value.length;
-                                    }
-                                    if (depth < 0) {
-                                        next = true;
-                                        depth = 0;
-                                    }
-                                    // console.log(r,p,depth,next,rowTokens[p]);
-                                    p--;
-                                }
-                                if (!scopedFunction) {
-                                    r--;
-                                }
-                            }
-                        }
-                        expressionEditor.session.removeMarker(currentFunctionMarker);
-                        if (scopedFunction) {
-                        //console.log(token,.map(function(t) { return t.type}));
-                            funcSelect.val(scopedFunction.value).change();
-                        }
-                    }
-                });
-
-                dialogForm.i18n();
-                $("#node-input-expression-func-insert").click(function(e) {
-                    e.preventDefault();
-                    var pos = expressionEditor.getCursorPosition();
-                    var f = funcSelect.val();
-                    var snippet = jsonata.getFunctionSnippet(f);
-                    expressionEditor.insertSnippet(snippet);
-                    expressionEditor.focus();
-                })
-            },
-            close: function() {
-                editStack.pop();
-            },
-            show: function() {}
-        }
-        if (editTrayWidthCache.hasOwnProperty(type)) {
-            trayOptions.width = editTrayWidthCache[type];
-        }
-        RED.tray.show(trayOptions);
-    }
-
     return {
         init: function() {
             RED.tray.init();
-            RED.actions.add("core:confirm-edit-tray", function() {
-                $("#node-dialog-ok").click();
-                $("#node-config-dialog-ok").click();
-            });
-            RED.actions.add("core:cancel-edit-tray", function() {
-                $("#node-dialog-cancel").click();
-                $("#node-config-dialog-cancel").click();
+            $(window).on('keydown', function(evt) {
+                if (evt.keyCode === $.ui.keyCode.ESCAPE && (evt.metaKey || evt.ctrlKey)) {
+                    $("#node-dialog-cancel").click();
+                    $("#node-config-dialog-cancel").click();
+                } else if (evt.keyCode === $.ui.keyCode.ENTER && (evt.metaKey || evt.ctrlKey)) {
+                    $("#node-dialog-ok").click();
+                    $("#node-config-dialog-ok").click();
+                }
             });
         },
         edit: showEditDialog,
         editConfig: showEditConfigNodeDialog,
         editSubflow: showEditSubflowDialog,
-        editExpression: editExpression,
         validateNode: validateNode,
         updateNodeProperties: updateNodeProperties, // TODO: only exposed for edit-undo
 
@@ -1786,6 +1428,7 @@ RED.editor = (function() {
                     }
                 },100);
             }
+
             return editor;
         }
     }

editor/js/ui/keyboard.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,101 +15,10 @@
  **/
 RED.keyboard = (function() {
 
-    var isMac = /Mac/i.test(window.navigator.platform);
-
     var handlers = {};
-    var partialState;
-
-    var keyMap = {
-        "left":37,
-        "up":38,
-        "right":39,
-        "down":40,
-        "escape":27,
-        "enter": 13,
-        "backspace": 8,
-        "delete": 46,
-        "space": 32,
-        ";":186,
-        "=":187,
-        ",":188,
-        "-":189,
-        ".":190,
-        "/":191,
-        "\\":220,
-        "'":222,
-        "?":191 // <- QWERTY specific
-    }
-    var metaKeyCodes = {
-        16:true,
-        17:true,
-        18: true,
-        91:true,
-        93: true
-    }
-    var actionToKeyMap = {}
-
-    // FF generates some different keycodes because reasons.
-    var firefoxKeyCodeMap = {
-        59:186,
-        61:187,
-        173:189
-    }
-
-    function init() {
-        $.getJSON("red/keymap.json",function(data) {
-            for (var scope in data) {
-                if (data.hasOwnProperty(scope)) {
-                    var keys = data[scope];
-                    for (var key in keys) {
-                        if (keys.hasOwnProperty(key)) {
-                            addHandler(scope,key,keys[key]);
-                        }
-                    }
-                }
-            }
-        })
-        RED.actions.add("core:show-help", showKeyboardHelp);
-
-    }
-    function parseKeySpecifier(key) {
-        var parts = key.toLowerCase().split("-");
-        var modifiers = {};
-        var keycode;
-        var blank = 0;
-        for (var i=0;i<parts.length;i++) {
-            switch(parts[i]) {
-                case "ctrl":
-                case "cmd":
-                    modifiers.ctrl = true;
-                    modifiers.meta = true;
-                    break;
-                case "alt":
-                    modifiers.alt = true;
-                    break;
-                case "shift":
-                    modifiers.shift = true;
-                    break;
-                case "":
-                    blank++;
-                    keycode = keyMap["-"];
-                    break;
-                default:
-                    if (keyMap.hasOwnProperty(parts[i])) {
-                        keycode = keyMap[parts[i]];
-                    } else if (parts[i].length > 1) {
-                        return null;
-                    } else {
-                        keycode = parts[i].toUpperCase().charCodeAt(0);
-                    }
-                    break;
-            }
-        }
-        return [keycode,modifiers];
-    }
 
     function resolveKeyEvent(evt) {
-        var slot = partialState||handlers;
+        var slot = handlers;
         if (evt.ctrlKey || evt.metaKey) {
             slot = slot.ctrl;
         }
@@ -119,19 +28,9 @@ RED.keyboard = (function() {
         if (slot && evt.altKey) {
             slot = slot.alt;
         }
-        var keyCode = firefoxKeyCodeMap[evt.keyCode] || evt.keyCode;
-        if (slot && slot[keyCode]) {
-            var handler = slot[keyCode];
-            if (!handler.scope) {
-                if (partialState) {
-                    partialState = null;
-                    return resolveKeyEvent(evt);
-                } else {
-                    partialState = handler;
-                    evt.preventDefault();
-                    return null;
-                }
-            } else if (handler.scope && handler.scope !== "*") {
+        if (slot && slot[evt.keyCode]) {
+            var handler = slot[evt.keyCode];
+            if (handler.scope && handler.scope !== "*") {
                 var target = evt.target;
                 while (target.nodeName !== 'BODY' && target.id !== handler.scope) {
                     target = target.parentElement;
@@ -140,206 +39,118 @@ RED.keyboard = (function() {
                     handler = null;
                 }
             }
-            partialState = null;
             return handler;
-        } else if (partialState) {
-            partialState = null;
-            return resolveKeyEvent(evt);
         }
     }
     d3.select(window).on("keydown",function() {
-        if (metaKeyCodes[d3.event.keyCode]) {
-            return;
-        }
         var handler = resolveKeyEvent(d3.event);
         if (handler && handler.ondown) {
-            if (typeof handler.ondown === "string") {
-                RED.actions.invoke(handler.ondown);
-            } else {
-                handler.ondown();
-            }
-            d3.event.preventDefault();
+            handler.ondown();
+        }
+    });
+    d3.select(window).on("keyup",function() {
+        var handler = resolveKeyEvent(d3.event);
+        if (handler && handler.onup) {
+            handler.onup();
         }
     });
 
-    function addHandler(scope,key,modifiers,ondown) {
+    function addHandler(scope,key,modifiers,ondown,onup) {
         var mod = modifiers;
         var cbdown = ondown;
-        if (typeof modifiers == "function" || typeof modifiers === "string") {
+        var cbup = onup;
+        if (typeof modifiers == "function") {
             mod = {};
             cbdown = modifiers;
-        }
-        var keys = [];
-        var i=0;
-        if (typeof key === 'string') {
-            if (typeof cbdown === 'string') {
-                actionToKeyMap[cbdown] = {scope:scope,key:key};
-            }
-            var parts = key.split(" ");
-            for (i=0;i<parts.length;i++) {
-                var parsedKey = parseKeySpecifier(parts[i]);
-                if (parsedKey) {
-                    keys.push(parsedKey);
-                } else {
-                    console.log("Unrecognised key specifier:",key)
-                    return;
-                }
-            }
-        } else {
-            keys.push([key,mod])
+            cbup = ondown;
         }
         var slot = handlers;
-        for (i=0;i<keys.length;i++) {
-            key = keys[i][0];
-            mod = keys[i][1];
-            if (mod.ctrl) {
-                slot.ctrl = slot.ctrl||{};
-                slot = slot.ctrl;
-            }
-            if (mod.shift) {
-                slot.shift = slot.shift||{};
-                slot = slot.shift;
-            }
-            if (mod.alt) {
-                slot.alt = slot.alt||{};
-                slot = slot.alt;
-            }
-            slot[key] = slot[key] || {};
-            slot = slot[key];
-            //slot[key] = {scope: scope, ondown:cbdown};
+        if (mod.ctrl) {
+            slot.ctrl = slot.ctrl||{};
+            slot = slot.ctrl;
         }
-        slot.scope = scope;
-        slot.ondown = cbdown;
+        if (mod.shift) {
+            slot.shift = slot.shift||{};
+            slot = slot.shift;
+        }
+        if (mod.alt) {
+            slot.alt = slot.alt||{};
+            slot = slot.alt;
+        }
+        slot[key] = {scope: scope, ondown:cbdown, onup:cbup};
     }
 
     function removeHandler(key,modifiers) {
         var mod = modifiers || {};
-        var keys = [];
-        var i=0;
-        if (typeof key === 'string') {
-            delete actionToKeyMap[key];
-            var parts = key.split(" ");
-            for (i=0;i<parts.length;i++) {
-                var parsedKey = parseKeySpecifier(parts[i]);
-                if (parsedKey) {
-                    keys.push(parsedKey);
-                } else {
-                    console.log("Unrecognised key specifier:",key)
-                    return;
-                }
-            }
-        } else {
-            keys.push([key,mod])
-        }
         var slot = handlers;
-        for (i=0;i<keys.length;i++) {
-            key = keys[i][0];
-            mod = keys[i][1];
-            if (mod.ctrl) {
-                slot = slot.ctrl;
-            }
-            if (slot && mod.shift) {
-                slot = slot.shift;
-            }
-            if (slot && mod.alt) {
-                slot = slot.alt;
-            }
-            if (!slot[key]) {
-                return;
-            }
-            slot = slot[key];
+        if (mod.ctrl) {
+            slot = slot.ctrl;
+        }
+        if (slot && mod.shift) {
+            slot = slot.shift;
+        }
+        if (slot && mod.alt) {
+            slot = slot.alt;
+        }
+        if (slot) {
+            delete slot[key];
         }
-        delete slot.scope;
-        delete slot.ondown;
     }
 
-    var shortcutDialog = null;
-
-    var cmdCtrlKey = '<span class="help-key">'+(isMac?'&#8984;':'Ctrl')+'</span>';
+    var dialog = null;
 
     function showKeyboardHelp() {
         if (!RED.settings.theme("menu.menu-item-keyboard-shortcuts",true)) {
             return;
         }
-        if (!shortcutDialog) {
-            shortcutDialog = $('<div id="keyboard-help-dialog" class="hide">'+
-                '<div class="keyboard-shortcut-entry keyboard-shortcut-list-header">'+
-                    '<div class="keyboard-shortcut-entry-key">shortcut</div>'+
-                    '<div class="keyboard-shortcut-entry-key">action</div>'+
-                    '<div class="keyboard-shortcut-entry-scope">scope</div>'+
+        if (!dialog) {
+            dialog = $('<div id="keyboard-help-dialog" class="hide">'+
+                '<div style="vertical-align: top;display:inline-block; box-sizing: border-box; width:50%; padding: 10px;">'+
+                    '<table class="keyboard-shortcuts">'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">a</span></td><td>'+RED._("keyboard.selectAll")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Shift</span> + <span class="help-key">Click</span></td><td>'+RED._("keyboard.selectAllConnected")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">Click</span></td><td>'+RED._("keyboard.addRemoveNode")+'</td></tr>'+
+                        '<tr><td>&nbsp;</td><td></td></tr>'+
+                        '<tr><td><span class="help-key">Enter</span></td><td>'+RED._("keyboard.editSelected")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Delete</span> / <span class="help-key">Backspace</span></td><td>'+RED._("keyboard.deleteSelected")+'</td></tr>'+
+                        '<tr><td>&nbsp;</td><td></td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">i</span></td><td>'+RED._("keyboard.importNode")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">e</span></td><td>'+RED._("keyboard.exportNode")+'</td></tr>'+
+                    '</table>'+
+                '</div>'+
+                '<div style="vertical-align: top;display:inline-block; box-sizing: border-box; width:50%; padding: 10px;">'+
+                    '<table class="keyboard-shortcuts">'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">Space</span></td><td>'+RED._("keyboard.toggleSidebar")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">.</span></td><td>'+RED._("keyboard.searchBox")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">Shift</span> + <span class="help-key">p</span></td><td>'+RED._("keyboard.managePalette")+'</td></tr>'+
+                        '<tr><td>&nbsp;</td><td></td></tr>'+
+                        '<tr><td><span class="help-key">&#x2190;</span> <span class="help-key">&#x2191;</span> <span class="help-key">&#x2192;</span> <span class="help-key">&#x2193;</span></td><td>'+RED._("keyboard.nudgeNode")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Shift</span> + <span class="help-key">&#x2190;</span> <span class="help-key">&#x2191;</span> <span class="help-key">&#x2192;</span> <span class="help-key">&#x2193;</span></td><td>'+RED._("keyboard.moveNode")+'</td></tr>'+
+                        '<tr><td>&nbsp;</td><td></td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">c</span></td><td>'+RED._("keyboard.copyNode")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">x</span></td><td>'+RED._("keyboard.cutNode")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">v</span></td><td>'+RED._("keyboard.pasteNode")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">z</span></td><td>'+RED._("keyboard.undoChange")+'</td></tr>'+
+                    '</table>'+
                 '</div>'+
-                '<ol id="keyboard-shortcut-list"></ol>'+
                 '</div>')
-            .appendTo("body");
-
-            var shortcutList = $('#keyboard-shortcut-list').editableList({
-                addButton: false,
-                scrollOnAdd: false,
-                addItem: function(container,i,object) {
-                    var item = $('<div class="keyboard-shortcut-entry">').appendTo(container);
-
-                    var key = $('<div class="keyboard-shortcut-entry-key">').appendTo(item);
-                    if (object.key) {
-                        key.append(formatKey(object.key));
-                    } else {
-                        item.addClass("keyboard-shortcut-entry-unassigned");
-                        key.html(RED._('keyboard.unassigned'));
-                    }
-
-                    var text = object.id.replace(/(^.+:([a-z]))|(-([a-z]))/g,function() {
-                        if (arguments[5] === 0) {
-                            return arguments[2].toUpperCase();
-                        } else {
-                            return " "+arguments[4].toUpperCase();
-                        }
-                    });
-                    var label = $('<div>').html(text).appendTo(item);
-                    if (object.scope) {
-                        $('<div class="keyboard-shortcut-entry-scope">').html(object.scope).appendTo(item);
-                    }
-
-
-                },
-            });
-            var shortcuts = RED.actions.list();
-            shortcuts.sort(function(A,B) {
-                return A.id.localeCompare(B.id);
-            });
-            shortcuts.forEach(function(s) {
-                shortcutList.editableList('addItem',s);
-            })
-
-            shortcutDialog.dialog({
+            .appendTo("body")
+            .dialog({
                 modal: true,
                 autoOpen: false,
                 width: "800",
-                height: "400",
-                title:RED._("keyboard.title"),
+                title:"Keyboard shortcuts",
                 resizable: false
             });
         }
 
-        shortcutDialog.dialog("open");
-    }
-    function formatKey(key) {
-        var formattedKey = isMac?key.replace(/ctrl-?/,"&#8984;"):key;
-        formattedKey = isMac?formattedKey.replace(/alt-?/,"&#8997;"):key;
-        formattedKey = formattedKey.replace(/shift-?/,"&#8679;")
-        formattedKey = formattedKey.replace(/left/,"&#x2190;")
-        formattedKey = formattedKey.replace(/up/,"&#x2191;")
-        formattedKey = formattedKey.replace(/right/,"&#x2192;")
-        formattedKey = formattedKey.replace(/down/,"&#x2193;")
-        return '<span class="help-key-block"><span class="help-key">'+formattedKey.split(" ").join('</span> <span class="help-key">')+'</span></span>';
+        dialog.dialog("open");
     }
 
     return {
-        init: init,
         add: addHandler,
         remove: removeHandler,
-        getShortcut: function(actionName) {
-            return actionToKeyMap[actionName];
-        },
-        formatKey: formatKey
+        showHelp: showKeyboardHelp
     }
 
 })();

editor/js/ui/library.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -410,9 +410,6 @@ RED.library = (function() {
 
     return {
         init: function() {
-
-            RED.actions.add("core:library-export",exportFlow);
-
             RED.events.on("view:selection-changed",function(selection) {
                 if (!selection.nodes) {
                     RED.menu.setDisabled("menu-item-export",true);

editor/js/ui/notifications.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,17 +51,11 @@ RED.notify = (function() {
 
         n.update = (function() {
             var nn = n;
-            return function(msg,timeout) {
+            return function(msg) {
                 nn.innerHTML = msg;
-                if (timeout !== undefined && timeout > 0) {
-                    window.clearTimeout(nn.timeoutid);
-                    nn.timeoutid = window.setTimeout(nn.close,timeout);
-                } else {
-                    window.clearTimeout(nn.timeoutid);
-                }
             }
         })();
-
+        
         if (!fixed) {
             $(n).click((function() {
                 var nn = n;

editor/js/ui/palette-editor.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,17 +31,6 @@ RED.palette.editor = (function() {
     var eventTimers = {};
     var activeFilter = "";
 
-    function semVerCompare(A,B) {
-        var aParts = A.split(".").map(function(m) { return parseInt(m);});
-        var bParts = B.split(".").map(function(m) { return parseInt(m);});
-        for (var i=0;i<3;i++) {
-            var j = aParts[i]-bParts[i];
-            if (j<0) { return -1 }
-            if (j>0) { return 1 }
-        }
-        return 0;
-    }
-
     function delayCallback(start,callback) {
         var delta = Date.now() - start;
         if (delta < 300) {
@@ -75,21 +64,14 @@ RED.palette.editor = (function() {
             });
         })
     }
-    function installNodeModule(id,version,shade,callback) {
-        var requestBody = {
-            module: id
-        };
-        if (callback === undefined) {
-            callback = shade;
-            shade = version;
-        } else {
-            requestBody.version = version;
-        }
+    function installNodeModule(id,shade,callback) {
         shade.show();
         $.ajax({
             url:"nodes",
             type: "POST",
-            data: JSON.stringify(requestBody),
+            data: JSON.stringify({
+                module: id
+            }),
             contentType: "application/json; charset=utf-8"
         }).done(function(data,textStatus,xhr) {
             shade.hide();
@@ -273,9 +255,7 @@ RED.palette.editor = (function() {
                     nodeEntry.removeButton.hide();
                 } else {
                     nodeEntry.enableButton.removeClass('disabled');
-                    if (moduleInfo.local) {
-                        nodeEntry.removeButton.show();
-                    }
+                    nodeEntry.removeButton.show();
                     if (activeTypeCount === 0) {
                         nodeEntry.enableButton.html(RED._('palette.editor.enableall'));
                     } else {
@@ -284,19 +264,19 @@ RED.palette.editor = (function() {
                     nodeEntry.container.toggleClass("disabled",(activeTypeCount === 0));
                 }
             }
-            if (moduleInfo.pending_version) {
-                nodeEntry.versionSpan.html(moduleInfo.version+' <i class="fa fa-long-arrow-right"></i> '+moduleInfo.pending_version).appendTo(nodeEntry.metaRow)
-                nodeEntry.updateButton.html(RED._('palette.editor.updated')).addClass('disabled').show();
-            } else if (loadedIndex.hasOwnProperty(module)) {
-                if (semVerCompare(loadedIndex[module].version,moduleInfo.version) === 1) {
-                    nodeEntry.updateButton.show();
-                    nodeEntry.updateButton.html(RED._('palette.editor.update',{version:loadedIndex[module].version}));
-                } else {
-                    nodeEntry.updateButton.hide();
-                }
-            } else {
-                nodeEntry.updateButton.hide();
-            }
+
+            nodeEntry.updateButton.hide();
+            // if (loadedIndex.hasOwnProperty(module)) {
+            //     if (moduleInfo.version !== loadedIndex[module].version) {
+            //         nodeEntry.updateButton.show();
+            //         nodeEntry.updateButton.html(RED._('palette.editor.update',{version:loadedIndex[module].version}));
+            //     } else {
+            //         nodeEntry.updateButton.hide();
+            //     }
+            //
+            // } else {
+            //     nodeEntry.updateButton.hide();
+            // }
         }
 
     }
@@ -322,10 +302,10 @@ RED.palette.editor = (function() {
             filterInput.focus();
         },250);
         RED.events.emit("palette-editor:open");
-        RED.keyboard.add("*","escape",function(){hidePaletteEditor()});
+        RED.keyboard.add("*",/* ESCAPE */ 27,function(){hidePaletteEditor();d3.event.preventDefault();});
     }
     function hidePaletteEditor() {
-        RED.keyboard.remove("escape");
+        RED.keyboard.remove("*");
         $("#main-container").removeClass("palette-expanded");
         $("#header-shade").hide();
         $("#editor-shade").hide();
@@ -356,45 +336,36 @@ RED.palette.editor = (function() {
     var catalogueCount;
     var catalogueLoadStatus = [];
     var catalogueLoadStart;
-    var catalogueLoadErrors = false;
 
     var activeSort = sortModulesAZ;
 
-    function handleCatalogResponse(err,catalog,index,v) {
-        catalogueLoadStatus.push(err||v);
-        if (!err) {
-            if (v.modules) {
-                v.modules.forEach(function(m) {
-                    loadedIndex[m.id] = m;
-                    m.index = [m.id];
-                    if (m.keywords) {
-                        m.index = m.index.concat(m.keywords);
-                    }
-                    if (m.updated_at) {
-                        m.timestamp = new Date(m.updated_at).getTime();
-                    } else {
-                        m.timestamp = 0;
-                    }
-                    m.index = m.index.join(",").toLowerCase();
-                })
-                loadedList = loadedList.concat(v.modules);
-            }
-            searchInput.searchBox('count',loadedList.length);
-        } else {
-            catalogueLoadErrors = true;
+    function handleCatalogResponse(catalog,index,v) {
+        catalogueLoadStatus.push(v);
+        if (v.modules) {
+            v.modules.forEach(function(m) {
+                loadedIndex[m.id] = m;
+                m.index = [m.id];
+                if (m.keywords) {
+                    m.index = m.index.concat(m.keywords);
+                }
+                if (m.updated_at) {
+                    m.timestamp = new Date(m.updated_at).getTime();
+                } else {
+                    m.timestamp = 0;
+                }
+                m.index = m.index.join(",").toLowerCase();
+            })
+            loadedList = loadedList.concat(v.modules);
         }
+        searchInput.searchBox('count',loadedList.length);
         if (catalogueCount > 1) {
             $(".palette-module-shade-status").html(RED._('palette.editor.loading')+"<br>"+catalogueLoadStatus.length+"/"+catalogueCount);
         }
         if (catalogueLoadStatus.length === catalogueCount) {
-            if (catalogueLoadErrors) {
-                RED.notify(RED._('palette.editor.errors.catalogLoadFailed',{url: catalog}),"error",false,8000);
-            }
             var delta = 250-(Date.now() - catalogueLoadStart);
             setTimeout(function() {
                 $("#palette-module-install-shade").hide();
             },Math.max(delta,0));
-
         }
     }
 
@@ -406,7 +377,6 @@ RED.palette.editor = (function() {
             $(".palette-module-shade-status").html(RED._('palette.editor.loading'));
             var catalogues = RED.settings.theme('palette.catalogues')||['https://catalogue.nodered.org/catalogue.json'];
             catalogueLoadStatus = [];
-            catalogueLoadErrors = false;
             catalogueCount = catalogues.length;
             if (catalogues.length > 1) {
                 $(".palette-module-shade-status").html(RED._('palette.editor.loading')+"<br>0/"+catalogues.length);
@@ -415,10 +385,8 @@ RED.palette.editor = (function() {
             catalogueLoadStart = Date.now();
             catalogues.forEach(function(catalog,index) {
                 $.getJSON(catalog, {_: new Date().getTime()},function(v) {
-                    handleCatalogResponse(null,catalog,index,v);
+                    handleCatalogResponse(catalog,index,v);
                     refreshNodeModuleList();
-                }).fail(function(jqxhr, textStatus, error) {
-                    handleCatalogResponse(jqxhr,catalog,index);
                 })
             });
         }
@@ -457,7 +425,7 @@ RED.palette.editor = (function() {
         RED.events.on("type-search:open",function() { disabled = true; });
         RED.events.on("type-search:close",function() { disabled = false; });
 
-        RED.actions.add("core:manage-palette",RED.palette.editor.show);
+        RED.keyboard.add("*", /* p */ 80,{shift:true,ctrl:true},function() {RED.palette.editor.show();d3.event.preventDefault();});
 
         editorTabs = RED.tabs.create({
             id:"palette-editor-tabs",
@@ -533,7 +501,7 @@ RED.palette.editor = (function() {
                     var titleRow = $('<div class="palette-module-meta palette-module-name"><i class="fa fa-cube"></i></div>').appendTo(headerRow);
                     $('<span>').html(entry.name).appendTo(titleRow);
                     var metaRow = $('<div class="palette-module-meta palette-module-version"><i class="fa fa-tag"></i></div>').appendTo(headerRow);
-                    var versionSpan = $('<span>').html(entry.version).appendTo(metaRow);
+                    $('<span>').html(entry.version).appendTo(metaRow);
                     var buttonRow = $('<div>',{class:"palette-module-meta"}).appendTo(headerRow);
                     var setButton = $('<a href="#" class="editor-button editor-button-small palette-module-set-button"><i class="fa fa-angle-right palette-module-node-chevron"></i> </a>').appendTo(buttonRow);
                     var setCount = $('<span>').appendTo(setButton);
@@ -542,43 +510,16 @@ RED.palette.editor = (function() {
                     var updateButton = $('<a href="#" class="editor-button editor-button-small"></a>').html(RED._('palette.editor.update')).appendTo(buttonGroup);
                     updateButton.click(function(evt) {
                         evt.preventDefault();
-                        if ($(this).hasClass('disabled')) {
-                            return;
-                        }
-                        $("#palette-module-install-confirm").data('module',entry.name);
-                        $("#palette-module-install-confirm").data('version',loadedIndex[entry.name].version);
-                        $("#palette-module-install-confirm").data('shade',shade);
-
-                        $("#palette-module-install-confirm-body").html(entry.local?
-                            RED._("palette.editor.confirm.update.body"):
-                            RED._("palette.editor.confirm.cannotUpdate.body")
-                        );
-                        $(".palette-module-install-confirm-button-install").hide();
-                        $(".palette-module-install-confirm-button-remove").hide();
-                        if (entry.local) {
-                            $(".palette-module-install-confirm-button-update").show();
-                        } else {
-                            $(".palette-module-install-confirm-button-update").hide();
-                        }
-                        $("#palette-module-install-confirm")
-                            .dialog('option', 'title',RED._("palette.editor.confirm.update.title"))
-                            .dialog('open');
                     })
 
 
                     var removeButton = $('<a href="#" class="editor-button editor-button-small"></a>').html(RED._('palette.editor.remove')).appendTo(buttonGroup);
                     removeButton.click(function(evt) {
                         evt.preventDefault();
-
-                        $("#palette-module-install-confirm").data('module',entry.name);
-                        $("#palette-module-install-confirm").data('shade',shade);
-                        $("#palette-module-install-confirm-body").html(RED._("palette.editor.confirm.remove.body"));
-                        $(".palette-module-install-confirm-button-install").hide();
-                        $(".palette-module-install-confirm-button-remove").show();
-                        $(".palette-module-install-confirm-button-update").hide();
-                        $("#palette-module-install-confirm")
-                            .dialog('option', 'title', RED._("palette.editor.confirm.remove.title"))
-                            .dialog('open');
+                        shade.show();
+                        removeNodeModule(entry.name, function(xhr) {
+                            console.log(xhr);
+                        })
                     })
                     if (!entry.local) {
                         removeButton.hide();
@@ -595,7 +536,6 @@ RED.palette.editor = (function() {
                         setCount: setCount,
                         container: container,
                         shade: shade,
-                        versionSpan: versionSpan,
                         sets: {}
                     }
                     setButton.click(function(evt) {
@@ -728,157 +668,70 @@ RED.palette.editor = (function() {
         })
 
         packageList = $('<ol>',{style:"position: absolute;top: 78px;bottom: 0;left: 0;right: 0px;"}).appendTo(installTab).editableList({
-            addButton: false,
-            scrollOnAdd: false,
-            addItem: function(container,i,object) {
+           addButton: false,
+           scrollOnAdd: false,
+           addItem: function(container,i,object) {
 
-                if (object.more) {
-                    container.addClass('palette-module-more');
-                    var moreRow = $('<div>',{class:"palette-module-header palette-module"}).appendTo(container);
-                    var moreLink = $('<a href="#"></a>').html(RED._('palette.editor.more',{count:object.more})).appendTo(moreRow);
-                    moreLink.click(function(e) {
-                        e.preventDefault();
-                        packageList.editableList('removeItem',object);
-                        for (var i=object.start;i<Math.min(object.start+10,object.start+object.more);i++) {
-                            packageList.editableList('addItem',filteredList[i]);
-                        }
-                        if (object.more > 10) {
-                            packageList.editableList('addItem',{start:object.start+10, more:object.more-10})
-                        }
-                    })
-                    return;
-                }
-                if (object.info) {
-                    var entry = object.info;
-                    var headerRow = $('<div>',{class:"palette-module-header"}).appendTo(container);
-                    var titleRow = $('<div class="palette-module-meta"><i class="fa fa-cube"></i></div>').appendTo(headerRow);
-                    $('<span>',{class:"palette-module-name"}).html(entry.name||entry.id).appendTo(titleRow);
-                    $('<a target="_blank" class="palette-module-link"><i class="fa fa-external-link"></i></a>').attr('href',entry.url).appendTo(titleRow);
-                    var descRow = $('<div class="palette-module-meta"></div>').appendTo(headerRow);
-                    $('<div>',{class:"palette-module-description"}).html(entry.description).appendTo(descRow);
+               if (object.more) {
+                   container.addClass('palette-module-more');
+                   var moreRow = $('<div>',{class:"palette-module-header palette-module"}).appendTo(container);
+                   var moreLink = $('<a href="#"></a>').html(RED._('palette.editor.more',{count:object.more})).appendTo(moreRow);
+                   moreLink.click(function(e) {
+                       e.preventDefault();
+                       packageList.editableList('removeItem',object);
+                       for (var i=object.start;i<Math.min(object.start+10,object.start+object.more);i++) {
+                           packageList.editableList('addItem',filteredList[i]);
+                       }
+                       if (object.more > 10) {
+                           packageList.editableList('addItem',{start:object.start+10, more:object.more-10})
+                       }
+                   })
+                   return;
+               }
+               if (object.info) {
+                   var entry = object.info;
+                   var headerRow = $('<div>',{class:"palette-module-header"}).appendTo(container);
+                   var titleRow = $('<div class="palette-module-meta"><i class="fa fa-cube"></i></div>').appendTo(headerRow);
+                   $('<span>',{class:"palette-module-name"}).html(entry.name||entry.id).appendTo(titleRow);
+                   $('<a target="_blank" class="palette-module-link"><i class="fa fa-external-link"></i></a>').attr('href',entry.url).appendTo(titleRow);
+                   var descRow = $('<div class="palette-module-meta"></div>').appendTo(headerRow);
+                   $('<div>',{class:"palette-module-description"}).html(entry.description).appendTo(descRow);
 
-                    var metaRow = $('<div class="palette-module-meta"></div>').appendTo(headerRow);
-                    $('<span class="palette-module-version"><i class="fa fa-tag"></i> '+entry.version+'</span>').appendTo(metaRow);
-                    $('<span class="palette-module-updated"><i class="fa fa-calendar"></i> '+formatUpdatedAt(entry.updated_at)+'</span>').appendTo(metaRow);
-                    var buttonRow = $('<div>',{class:"palette-module-meta"}).appendTo(headerRow);
-                    var buttonGroup = $('<div>',{class:"palette-module-button-group"}).appendTo(buttonRow);
-                    var shade = $('<div class="palette-module-shade hide"><img src="red/images/spin.svg" class="palette-spinner"/></div>').appendTo(container);
-                    var installButton = $('<a href="#" class="editor-button editor-button-small"></a>').html(RED._('palette.editor.install')).appendTo(buttonGroup);
-                    installButton.click(function(e) {
-                        e.preventDefault();
-                        if (!$(this).hasClass('disabled')) {
-                            $("#palette-module-install-confirm").data('module',entry.id);
-                            $("#palette-module-install-confirm").data('version',entry.version);
-                            $("#palette-module-install-confirm").data('url',entry.url);
-                            $("#palette-module-install-confirm").data('shade',shade);
-                            $("#palette-module-install-confirm-body").html(RED._("palette.editor.confirm.install.body"));
-                            $(".palette-module-install-confirm-button-install").show();
-                            $(".palette-module-install-confirm-button-remove").hide();
-                            $(".palette-module-install-confirm-button-update").hide();
-                            $("#palette-module-install-confirm")
-                                .dialog('option', 'title', RED._("palette.editor.confirm.install.title"))
-                                .dialog('open');
-                        }
-                    })
-                    if (nodeEntries.hasOwnProperty(entry.id)) {
-                        installButton.addClass('disabled');
-                        installButton.html(RED._('palette.editor.installed'));
-                    }
+                   var metaRow = $('<div class="palette-module-meta"></div>').appendTo(headerRow);
+                   $('<span class="palette-module-version"><i class="fa fa-tag"></i> '+entry.version+'</span>').appendTo(metaRow);
+                   $('<span class="palette-module-updated"><i class="fa fa-calendar"></i> '+formatUpdatedAt(entry.updated_at)+'</span>').appendTo(metaRow);
+                   var buttonRow = $('<div>',{class:"palette-module-meta"}).appendTo(headerRow);
+                   var buttonGroup = $('<div>',{class:"palette-module-button-group"}).appendTo(buttonRow);
+                   var shade = $('<div class="palette-module-shade hide"><img src="red/images/spin.svg" class="palette-spinner"/></div>').appendTo(container);
+                   var installButton = $('<a href="#" class="editor-button editor-button-small"></a>').html(RED._('palette.editor.install')).appendTo(buttonGroup);
+                   installButton.click(function(e) {
+                       e.preventDefault();
+                       if (!$(this).hasClass('disabled')) {
+                           installNodeModule(entry.id,shade,function(xhr) {
+                               if (xhr) {
+                                   if (xhr.responseJSON) {
+                                       RED.notify(RED._('palette.editor.errors.installFailed',{module: entry.id,message:xhr.responseJSON.message}));
+                                   }
+                               }
+                           })
+                       }
+                   })
+                   if (nodeEntries.hasOwnProperty(entry.id)) {
+                       installButton.addClass('disabled');
+                       installButton.html(RED._('palette.editor.installed'));
+                   }
 
-                    object.elements = {
-                        installButton:installButton
-                    }
-                } else {
-                    $('<div>',{class:"red-ui-search-empty"}).html(RED._('search.empty')).appendTo(container);
-                }
-            }
-        });
+                   object.elements = {
+                       installButton:installButton
+                   }
+               } else {
+                   $('<div>',{class:"red-ui-search-empty"}).html(RED._('search.empty')).appendTo(container);
+               }
+           }
+       });
 
-        $('<div id="palette-module-install-shade" class="palette-module-shade hide"><div class="palette-module-shade-status"></div><img src="red/images/spin.svg" class="palette-spinner"/></div>').appendTo(installTab);
+       $('<div id="palette-module-install-shade" class="palette-module-shade hide"><div class="palette-module-shade-status"></div><img src="red/images/spin.svg" class="palette-spinner"/></div>').appendTo(installTab);
 
-        $('<div id="palette-module-install-confirm" class="hide"><form class="form-horizontal"><div id="palette-module-install-confirm-body" class="node-dialog-confirm-row"></div></form></div>').appendTo(document.body);
-        $("#palette-module-install-confirm").dialog({
-            title: RED._('palette.editor.confirm.title'),
-            modal: true,
-            autoOpen: false,
-            width: 550,
-            height: "auto",
-            buttons: [
-                {
-                    text: RED._("common.label.cancel"),
-                    click: function() {
-                        $( this ).dialog( "close" );
-                    }
-                },
-                {
-                    text: RED._("palette.editor.confirm.button.review"),
-                    class: "primary palette-module-install-confirm-button-install",
-                    click: function() {
-                        var url = $(this).data('url');
-                        window.open(url);
-                    }
-                },
-                {
-                    text: RED._("palette.editor.confirm.button.install"),
-                    class: "primary palette-module-install-confirm-button-install",
-                    click: function() {
-                        var id = $(this).data('module');
-                        var version = $(this).data('version');
-                        var shade = $(this).data('shade');
-                        installNodeModule(id,version,shade,function(xhr) {
-                             if (xhr) {
-                                 if (xhr.responseJSON) {
-                                     RED.notify(RED._('palette.editor.errors.installFailed',{module: id,message:xhr.responseJSON.message}));
-                                 }
-                             }
-                        });
-                        $( this ).dialog( "close" );
-                    }
-                },
-                {
-                    text: RED._("palette.editor.confirm.button.remove"),
-                    class: "primary palette-module-install-confirm-button-remove",
-                    click: function() {
-                        var id = $(this).data('module');
-                        var shade = $(this).data('shade');
-                        shade.show();
-                        removeNodeModule(id, function(xhr) {
-                            shade.hide();
-                            if (xhr) {
-                                if (xhr.responseJSON) {
-                                    RED.notify(RED._('palette.editor.errors.removeFailed',{module: id,message:xhr.responseJSON.message}));
-                                }
-                            }
-                        })
-
-                        $( this ).dialog( "close" );
-                    }
-                },
-                {
-                    text: RED._("palette.editor.confirm.button.update"),
-                    class: "primary palette-module-install-confirm-button-update",
-                    click: function() {
-                        var id = $(this).data('module');
-                        var version = $(this).data('version');
-                        var shade = $(this).data('shade');
-                        shade.show();
-                        installNodeModule(id,version,shade,function(xhr) {
-                             if (xhr) {
-                                 if (xhr.responseJSON) {
-                                     RED.notify(RED._('palette.editor.errors.updateFailed',{module: id,message:xhr.responseJSON.message}));
-                                 }
-                             }
-                        });
-                        $( this ).dialog( "close" );
-                    }
-                }
-            ]
-        })
-
-
-        RED.events.on('registry:module-updated', function(ns) {
-            refreshNodeModule(ns.module);
-        });
         RED.events.on('registry:node-set-enabled', function(ns) {
             refreshNodeModule(ns.module);
         });
@@ -901,9 +754,7 @@ RED.palette.editor = (function() {
             refreshNodeModule(ns.module);
             for (var i=0;i<filteredList.length;i++) {
                 if (filteredList[i].info.id === ns.module) {
-                    var installButton = filteredList[i].elements.installButton;
-                    installButton.addClass('disabled');
-                    installButton.html(RED._('palette.editor.installed'));
+                    filteredList[i].elements.installButton.hide();
                     break;
                 }
             }
@@ -917,9 +768,7 @@ RED.palette.editor = (function() {
                     delete nodeEntries[ns.module];
                     for (var i=0;i<filteredList.length;i++) {
                         if (filteredList[i].info.id === ns.module) {
-                            var installButton = filteredList[i].elements.installButton;
-                            installButton.removeClass('disabled');
-                            installButton.html(RED._('palette.editor.install'));
+                            filteredList[i].elements.installButton.show();
                             break;
                         }
                     }

editor/js/ui/palette.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -149,9 +149,14 @@ RED.palette = (function() {
 
 
             if (def.icon) {
-                var icon_url = RED.utils.getNodeIcon(def);
+                var icon_url = "arrow-in.png";
+                try {
+                    icon_url = (typeof def.icon === "function" ? def.icon.call({}) : def.icon);
+                } catch(err) {
+                    console.log("Definition error: "+nt+".icon",err);
+                }
                 var iconContainer = $('<div/>',{class:"palette_icon_container"+(def.align=="right"?" palette_icon_container_right":"")}).appendTo(d);
-                $('<div/>',{class:"palette_icon",style:"background-image: url("+icon_url+")"}).appendTo(iconContainer);
+                $('<div/>',{class:"palette_icon",style:"background-image: url(icons/"+icon_url+")"}).appendTo(iconContainer);
             }
 
             d.style.backgroundColor = def.color;
@@ -231,7 +236,7 @@ RED.palette = (function() {
                     // it here makes me sad
                     //console.log(ui.helper.position());
                     ui.position.left += 17.5;
-
+                    
                     if (def.inputs > 0 && def.outputs > 0) {
                         mouseX = ui.position.left+(ui.helper.width()/2) - chartOffset.left + chart.scrollLeft();
                         mouseY = ui.position.top+(ui.helper.height()/2) - chartOffset.top + chart.scrollTop();

editor/js/ui/search.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,9 +37,6 @@ RED.search = (function() {
 
 
         var properties = ['id','type','name','label','info'];
-        if (n._def && n._def.defaults) {
-            properties = properties.concat(Object.keys(n._def.defaults));
-        }
         for (var i=0;i<properties.length;i++) {
             if (n.hasOwnProperty(properties[i])) {
                 var v = n[properties[i]];
@@ -181,14 +178,25 @@ RED.search = (function() {
 
                     var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
                     var colour = def.color;
-                    var icon_url = RED.utils.getNodeIcon(def,node);
+                    var icon_url = "arrow-in.png";
                     if (node.type === 'tab') {
                         colour = "#C0DEED";
+                        icon_url = "subflow.png";
+                    } else if (def.category === 'config') {
+                        icon_url = "cog.png";
+                    } else if (node.type === 'unknown') {
+                        icon_url = "alert.png";
+                    } else {
+                        try {
+                            icon_url = (typeof def.icon === "function" ? def.icon.call({}) : def.icon);
+                        } catch(err) {
+                            console.log("Definition error: "+nt+".icon",err);
+                        }
                     }
                     nodeDiv.css('backgroundColor',colour);
 
                     var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
-                    $('<div/>',{class:"palette_icon",style:"background-image: url("+icon_url+")"}).appendTo(iconContainer);
+                    $('<div/>',{class:"palette_icon",style:"background-image: url(icons/"+icon_url+")"}).appendTo(iconContainer);
 
                     var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
                     if (node.z) {
@@ -222,11 +230,8 @@ RED.search = (function() {
     }
 
     function show() {
-        if (disabled) {
-            return;
-        }
         if (!visible) {
-            RED.keyboard.add("*","escape",function(){hide()});
+            RED.keyboard.add("*",/* ESCAPE */ 27,function(){hide();d3.event.preventDefault();});
             $("#header-shade").show();
             $("#editor-shade").show();
             $("#palette-shade").show();
@@ -236,7 +241,7 @@ RED.search = (function() {
             if (dialog === null) {
                 createDialog();
             }
-            dialog.slideDown(300);
+            dialog.slideDown();
             RED.events.emit("search:open");
             visible = true;
         }
@@ -244,7 +249,7 @@ RED.search = (function() {
     }
     function hide() {
         if (visible) {
-            RED.keyboard.remove("escape");
+            RED.keyboard.remove(/* ESCAPE */ 27);
             visible = false;
             $("#header-shade").hide();
             $("#editor-shade").hide();
@@ -261,8 +266,7 @@ RED.search = (function() {
     }
 
     function init() {
-        RED.actions.add("core:search",show);
-
+        RED.keyboard.add("*",/* . */ 190,{ctrl:true},function(){if (!disabled) { show(); } d3.event.preventDefault();});
         RED.events.on("editor:open",function() { disabled = true; });
         RED.events.on("editor:close",function() { disabled = false; });
         RED.events.on("palette-editor:open",function() { disabled = true; });

editor/js/ui/sidebar.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -202,18 +202,12 @@ RED.sidebar = (function() {
     }
 
     function init () {
-        RED.actions.add("core:toggle-sidebar",function(state){
-            if (state === undefined) {
-                RED.menu.toggleSelected("menu-item-sidebar");
-            } else {
-                toggleSidebar(state);
-            }
-        });
+        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.init();
         RED.sidebar.config.init();
         // hide info bar at start if screen rather narrow...
-        if ($(window).width() < 600) { RED.menu.setSelected("menu-item-sidebar",false); }
+        if ($(window).width() < 600) { toggleSidebar(); }
     }
 
     return {

editor/js/ui/state.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/ui/subflow.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -306,13 +306,50 @@ RED.subflow = (function() {
 
         $("#workspace-subflow-delete").click(function(event) {
             event.preventDefault();
+            var removedNodes = [];
+            var removedLinks = [];
             var startDirty = RED.nodes.dirty();
-            var historyEvent = removeSubflow(RED.workspaces.active());
-            historyEvent.t = 'delete';
-            historyEvent.dirty = startDirty;
 
-            RED.history.push(historyEvent);
+            var activeSubflow = getSubflow();
 
+            RED.nodes.eachNode(function(n) {
+                if (n.type == "subflow:"+activeSubflow.id) {
+                    removedNodes.push(n);
+                }
+                if (n.z == activeSubflow.id) {
+                    removedNodes.push(n);
+                }
+            });
+            RED.nodes.eachConfig(function(n) {
+                if (n.z == activeSubflow.id) {
+                    removedNodes.push(n);
+                }
+            });
+
+            var removedConfigNodes = [];
+            for (var i=0;i<removedNodes.length;i++) {
+                var removedEntities = RED.nodes.remove(removedNodes[i].id);
+                removedLinks = removedLinks.concat(removedEntities.links);
+                removedConfigNodes = removedConfigNodes.concat(removedEntities.nodes);
+            }
+            // TODO: this whole delete logic should be in RED.nodes.removeSubflow..
+            removedNodes = removedNodes.concat(removedConfigNodes);
+
+            RED.nodes.removeSubflow(activeSubflow);
+
+            RED.history.push({
+                    t:'delete',
+                    nodes:removedNodes,
+                    links:removedLinks,
+                    subflow: {
+                        subflow: activeSubflow
+                    },
+                    dirty:startDirty
+            });
+
+            RED.workspaces.remove(activeSubflow);
+            RED.nodes.dirty(true);
+            RED.view.redraw();
         });
 
         refreshToolbar(activeSubflow);
@@ -325,48 +362,7 @@ RED.subflow = (function() {
         $("#chart").css({"margin-top": "0"});
     }
 
-    function removeSubflow(id) {
-        var removedNodes = [];
-        var removedLinks = [];
 
-        var activeSubflow = RED.nodes.subflow(id);
-
-        RED.nodes.eachNode(function(n) {
-            if (n.type == "subflow:"+activeSubflow.id) {
-                removedNodes.push(n);
-            }
-            if (n.z == activeSubflow.id) {
-                removedNodes.push(n);
-            }
-        });
-        RED.nodes.eachConfig(function(n) {
-            if (n.z == activeSubflow.id) {
-                removedNodes.push(n);
-            }
-        });
-
-        var removedConfigNodes = [];
-        for (var i=0;i<removedNodes.length;i++) {
-            var removedEntities = RED.nodes.remove(removedNodes[i].id);
-            removedLinks = removedLinks.concat(removedEntities.links);
-            removedConfigNodes = removedConfigNodes.concat(removedEntities.nodes);
-        }
-        // TODO: this whole delete logic should be in RED.nodes.removeSubflow..
-        removedNodes = removedNodes.concat(removedConfigNodes);
-
-        RED.nodes.removeSubflow(activeSubflow);
-        RED.workspaces.remove(activeSubflow);
-        RED.nodes.dirty(true);
-        RED.view.redraw();
-
-        return {
-            nodes:removedNodes,
-            links:removedLinks,
-            subflow: {
-                subflow: activeSubflow
-            }
-        }
-    }
     function init() {
         RED.events.on("workspace:change",function(event) {
             var activeSubflow = RED.nodes.subflow(event.workspace);
@@ -384,8 +380,6 @@ RED.subflow = (function() {
             }
         });
 
-        RED.actions.add("core:create-subflow",createSubflow);
-        RED.actions.add("core:convert-to-subflow",convertToSubflow);
     }
 
     function createSubflow() {
@@ -623,7 +617,6 @@ RED.subflow = (function() {
         init: init,
         createSubflow: createSubflow,
         convertToSubflow: convertToSubflow,
-        removeSubflow: removeSubflow,
         refresh: refresh,
         removeInput: removeSubflowInput,
         removeOutput: removeSubflowOutput

editor/js/ui/tab-config.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ RED.sidebar.config = (function() {
         if (showUnusedOnly) {
             var hiddenCount = nodes.length;
             nodes = nodes.filter(function(n) {
-                return n._def.hasUsers!==false && n.users.length === 0;
+                return n.users.length === 0;
             })
             hiddenCount = hiddenCount - nodes.length;
             if (hiddenCount > 0) {
@@ -139,11 +139,10 @@ RED.sidebar.config = (function() {
 
                 var entry = $('<li class="palette_node config_node palette_node_id_'+node.id.replace(/\./g,"-")+'"></li>').appendTo(list);
                 $('<div class="palette_label"></div>').text(label).appendTo(entry);
-                if (node._def.hasUsers !== false) {
-                    var iconContainer = $('<div/>',{class:"palette_icon_container  palette_icon_container_right"}).text(node.users.length).appendTo(entry);
-                    if (node.users.length === 0) {
-                        entry.addClass("config_node_unused");
-                    }
+
+                var iconContainer = $('<div/>',{class:"palette_icon_container  palette_icon_container_right"}).text(node.users.length).appendTo(entry);
+                if (node.users.length === 0) {
+                    entry.addClass("config_node_unused");
                 }
                 entry.on('click',function(e) {
                     RED.sidebar.info.refresh(node);
@@ -225,7 +224,10 @@ RED.sidebar.config = (function() {
             visible: false,
             onchange: function() { refreshConfigNodeList(); }
         });
-        RED.actions.add("core:show-config-tab",function() {RED.sidebar.show('config')});
+
+        RED.menu.setAction('menu-item-config-nodes',function() {
+            RED.sidebar.show('config');
+        })
 
         $("#workspace-config-node-collapse-all").on("click", function(e) {
             e.preventDefault();

editor/js/ui/tab-info.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ RED.sidebar.info = (function() {
             content: content,
             enableOnEdit: true
         });
-        RED.actions.add("core:show-info-tab",show);
+
     }
 
     function show() {
@@ -67,7 +67,6 @@ RED.sidebar.info = (function() {
     }
 
     function refresh(node) {
-        tips.stop();
         $(content).empty();
         var table = $('<table class="node-info"></table>');
         var tableBody = $('<tbody>').appendTo(table);
@@ -128,6 +127,7 @@ RED.sidebar.info = (function() {
             //$('<div class="node-help">'+(typeof info === "function" ? info.call(node) : info)+'</div>';
         }
 
+
         $(".node-info-property-header").click(function(e) {
             var icon = $(this).find("i");
             if (icon.hasClass("fa-caret-right")) {
@@ -146,98 +146,14 @@ RED.sidebar.info = (function() {
         });
     }
 
-
-    var tips = (function() {
-        var started = false;
-        var enabled = true;
-        var startDelay = 1000;
-        var cycleDelay = 15000;
-        var startTimeout;
-        var refreshTimeout;
-        var tipCount = -1;
-
-        RED.actions.add("core:toggle-show-tips",function(state) {
-            if (state === undefined) {
-                RED.menu.toggleSelected("menu-item-show-tips");
-            } else {
-                enabled = state;
-                if (enabled) {
-                    if (started) {
-                        startTips();
-                    }
-                } else {
-                    stopTips();
-                }
-            }
-        });
-
-        function setTip() {
-            var r = Math.floor(Math.random() * tipCount);
-            var tip = RED._("infotips:info.tip"+r);
-
-            var m;
-            while ((m=/({{(.*?)}})/.exec(tip))) {
-                var shortcut = RED.keyboard.getShortcut(m[2]);
-                if (shortcut) {
-                    tip = tip.replace(m[1],RED.keyboard.formatKey(shortcut.key));
-                } else {
-                    return;
-                }
-            }
-            while ((m=/(\[(.*?)\])/.exec(tip))) {
-                tip = tip.replace(m[1],RED.keyboard.formatKey(m[2]));
-            }
-            $('<div class="node-info-tip hide">'+tip+'</div>').appendTo(content).fadeIn(200);
-            if (startTimeout) {
-                startTimeout = null;
-                refreshTimeout = setInterval(cycleTips,cycleDelay);
-            }
-        }
-        function cycleTips() {
-            $(".node-info-tip").fadeOut(300,function() {
-                $(this).remove();
-                setTip();
-            })
-        }
-        function startTips() {
-            started = true;
-            if (enabled) {
-                if (!startTimeout && !refreshTimeout) {
-                    $(content).html("");
-                    if (tipCount === -1) {
-                        do {
-                            tipCount++;
-                        } while(RED._("infotips:info.tip"+tipCount)!=="infotips:info.tip"+tipCount);
-                    }
-                    startTimeout = setTimeout(setTip,startDelay);
-                }
-            }
-        }
-        function stopTips() {
-            started = false;
-            clearInterval(refreshTimeout);
-            clearTimeout(startTimeout);
-            refreshTimeout = null;
-            startTimeout = null;
-            $(".node-info-tip").remove();
-        }
-        return {
-            start: startTips,
-            stop: stopTips
-        }
-    })();
-
     function clear() {
-        tips.start();
+        $(content).html("");
     }
 
     function set(html) {
-        tips.stop();
         $(content).html(html);
     }
 
-
-
     RED.events.on("view:selection-changed",function(selection) {
         if (selection.nodes) {
             if (selection.nodes.length == 1) {
@@ -261,7 +177,7 @@ RED.sidebar.info = (function() {
     return {
         init: init,
         show: show,
-        refresh: refresh,
+        refresh:refresh,
         clear: clear,
         set: set
     }

editor/js/ui/touch/radialMenu.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/ui/tray.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -189,7 +189,7 @@ RED.tray = (function() {
         if (stack.length > 0) {
             var tray = stack[stack.length-1];
             var trayHeight = tray.tray.height()-tray.header.outerHeight()-tray.footer.outerHeight();
-            tray.body.height(trayHeight);
+            tray.body.height(trayHeight-40);
             if (tray.width > $("#editor-stack").position().left-8) {
                 tray.width = $("#editor-stack").position().left-8;
                 tray.tray.width(tray.width);
@@ -200,7 +200,7 @@ RED.tray = (function() {
                 // tray.body.parent().width(tray.width);
             }
             if (tray.options.resize) {
-                tray.options.resize({width:tray.width, height:trayHeight});
+                tray.options.resize({width:tray.width});
             }
         }
     }

editor/js/ui/typeSearch.js

@@ -13,8 +13,6 @@ RED.typeSearch = (function() {
     var activeFilter = "";
     var addCallback;
 
-    var typesUsed = {};
-
     function search(val) {
         activeFilter = val.toLowerCase();
         var visible = searchResults.editableList('filter');
@@ -46,7 +44,7 @@ RED.typeSearch = (function() {
         //shade = $('<div>',{class:"red-ui-type-search-shade"}).appendTo("#main-container");
         dialog = $("<div>",{id:"red-ui-type-search",class:"red-ui-search red-ui-type-search"}).appendTo("#main-container");
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
-        searchInput = $('<input type="text">').attr("placeholder",RED._("search.addNode")).appendTo(searchDiv).searchBox({
+        searchInput = $('<input type="text" placeholder="add a node...">').appendTo(searchDiv).searchBox({
             delay: 50,
             change: function() {
                 search($(this).val());
@@ -95,38 +93,44 @@ RED.typeSearch = (function() {
                 if (activeFilter === "" ) {
                     return true;
                 }
-                if (data.recent || data.common) {
-                    return false;
-                }
+
                 return (activeFilter==="")||(data.index.indexOf(activeFilter) > -1);
             },
             addItem: function(container,i,object) {
                 var def = object.def;
                 object.index = object.type.toLowerCase();
-                if (object.separator) {
-                    container.addClass("red-ui-search-result-separator")
-                }
                 var div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
 
                 var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
                 var colour = def.color;
-                var icon_url = RED.utils.getNodeIcon(def);
+                var icon_url = "arrow-in.png";
+                if (def.category === 'config') {
+                    icon_url = "cog.png";
+                } else {
+                    try {
+                        icon_url = (typeof def.icon === "function" ? def.icon.call({}) : def.icon);
+                    } catch(err) {
+                        console.log("Definition error: "+object.type+".icon",err);
+                    }
+                }
                 nodeDiv.css('backgroundColor',colour);
 
                 var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
-                $('<div/>',{class:"palette_icon",style:"background-image: url("+icon_url+")"}).appendTo(iconContainer);
-
-                if (def.inputs > 0) {
-                    $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
-                }
-                if (def.outputs > 0) {
-                    $('<div/>',{class:"red-ui-search-result-node-port red-ui-search-result-node-output"}).appendTo(nodeDiv);
-                }
+                $('<div/>',{class:"palette_icon",style:"background-image: url(icons/"+icon_url+")"}).appendTo(iconContainer);
 
                 var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
 
-                var label = object.label;
-                object.index += "|"+label.toLowerCase();
+                var label = object.type;
+                if (typeof def.paletteLabel !== "undefined") {
+                    try {
+                        label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
+                        label += " ("+object.type+")";
+                        object.index += "|"+label.toLowerCase();
+                    } catch(err) {
+                        console.log("Definition error: "+object.type+".paletteLabel",err);
+                    }
+                }
+
 
                 $('<div>',{class:"red-ui-search-result-node-label"}).html(label).appendTo(contentDiv);
 
@@ -141,7 +145,6 @@ RED.typeSearch = (function() {
     }
     function confirm(def) {
         hide();
-        typesUsed[def.type] = Date.now();
         addCallback(def.type);
     }
 
@@ -159,7 +162,7 @@ RED.typeSearch = (function() {
     }
     function show(opts) {
         if (!visible) {
-            RED.keyboard.add("*","escape",function(){hide()});
+            RED.keyboard.add("*",/* ESCAPE */ 27,function(){hide();d3.event.preventDefault();});
             if (dialog === null) {
                 createDialog();
             }
@@ -178,7 +181,7 @@ RED.typeSearch = (function() {
         RED.events.emit("type-search:open");
         //shade.show();
         dialog.css({left:opts.x+"px",top:opts.y+"px"}).show();
-        searchResultsDiv.slideDown(300);
+        searchResultsDiv.slideDown();
         setTimeout(function() {
             searchResultsDiv.find(".red-ui-editableList-container").scrollTop(0);
             searchInput.focus();
@@ -186,7 +189,7 @@ RED.typeSearch = (function() {
     }
     function hide(fast) {
         if (visible) {
-            RED.keyboard.remove("escape");
+            RED.keyboard.remove(/* ESCAPE */ 27);
             visible = false;
             if (dialog !== null) {
                 searchResultsDiv.slideUp(fast?50:200,function() {
@@ -202,84 +205,41 @@ RED.typeSearch = (function() {
             $(document).off('click.type-search');
         }
     }
-
-    function getTypeLabel(type, def) {
-        var label = type;
-        if (typeof def.paletteLabel !== "undefined") {
-            try {
-                label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
-                label += " ("+type+")";
-            } catch(err) {
-                console.log("Definition error: "+type+".paletteLabel",err);
-            }
-        }
-        return label;
-    }
-
     function refreshTypeList() {
-        var i;
         searchResults.editableList('empty');
         searchInput.searchBox('value','');
         selected = -1;
-        var common = [
-            'inject','debug','function','change','switch'
-        ];
-
-        var recentlyUsed = Object.keys(typesUsed);
-        recentlyUsed.sort(function(a,b) {
-            return typesUsed[b]-typesUsed[a];
-        });
-        recentlyUsed = recentlyUsed.filter(function(t) {
-            return common.indexOf(t) === -1;
+        var common = {
+            "debug"   : false,
+            "inject"  : false,
+            "function": false
+        };
+        var nodeTypes = RED.nodes.registry.getNodeTypes().filter(function(n) {
+            if (common.hasOwnProperty(n)) {
+                common[n] = true;
+                return false;
+            }
+            return true;
         });
+        // Just in case a core node has been disabled
+        if (common["function"]) {
+            nodeTypes.unshift("function");
+        }
+        if (common["inject"]) {
+            nodeTypes.unshift("inject");
+        }
+        if (common["debug"]) {
+            nodeTypes.unshift("debug");
+        }
 
-        var items = [];
-        RED.nodes.registry.getNodeTypes().forEach(function(t) {
+
+        var i;
+        for (i=0;i<nodeTypes.length;i++) {
+            var t = nodeTypes[i];
             var def = RED.nodes.getType(t);
             if (def.category !== 'config' && t !== 'unknown') {
-                items.push({type:t,def: def, label:getTypeLabel(t,def)});
+                searchResults.editableList('addItem',{type:t,def: def})
             }
-        });
-        items.sort(function(a,b) {
-            var al = a.label.toLowerCase();
-            var bl = b.label.toLowerCase();
-            if (al < bl) {
-                return -1;
-            } else if (al === bl) {
-                return 0;
-            } else {
-                return 1;
-            }
-        })
-
-        var commonCount = 0;
-        var item;
-        for(i=0;i<common.length;i++) {
-            item = {
-                type: common[i],
-                common: true,
-                def: RED.nodes.getType(common[i])
-            };
-            item.label = getTypeLabel(item.type,item.def);
-            if (i === common.length-1) {
-                item.separator = true;
-            }
-            searchResults.editableList('addItem', item);
-        }
-        for(i=0;i<Math.min(5,recentlyUsed.length);i++) {
-            item = {
-                type:recentlyUsed[i],
-                def: RED.nodes.getType(recentlyUsed[i]),
-                recent: true
-            };
-            item.label = getTypeLabel(item.type,item.def);
-            if (i === recentlyUsed.length-1) {
-                item.separator = true;
-            }
-            searchResults.editableList('addItem', item);
-        }
-        for (i=0;i<items.length;i++) {
-            searchResults.editableList('addItem', items[i]);
         }
         setTimeout(function() {
             selected = 0;
@@ -287,7 +247,23 @@ RED.typeSearch = (function() {
         },100);
     }
 
+    function init() {
+        // RED.keyboard.add("*",/* . */ 190,{ctrl:true},function(){if (!disabled) { show(); } d3.event.preventDefault();});
+        // RED.events.on("editor:open",function() { disabled = true; });
+        // RED.events.on("editor:close",function() { disabled = false; });
+        // RED.events.on("palette-editor:open",function() { disabled = true; });
+        // RED.events.on("palette-editor:close",function() { disabled = false; });
+        //
+        //
+        //
+        // $("#header-shade").on('mousedown',hide);
+        // $("#editor-shade").on('mousedown',hide);
+        // $("#palette-shade").on('mousedown',hide);
+        // $("#sidebar-shade").on('mousedown',hide);
+    }
+
     return {
+        init: init,
         show: show,
         hide: hide
     };

editor/js/ui/utils.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,6 @@ RED.utils = (function() {
     function formatString(str) {
         return str.replace(/\r?\n/g,"↵").replace(/\t/g,"→");
     }
-    function sanitize(m) {
-        return m.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
-    }
 
     function buildMessageSummaryValue(value) {
         var result;
@@ -38,11 +35,9 @@ RED.utils = (function() {
                 result = $('<span class="debug-message-object-value debug-message-type-meta">object</span>');
             }
         } else if (typeof value === 'string') {
-            var subvalue;
-            if (value.length > 30) {
-                subvalue = sanitize(value.substring(0,30))+"&hellip;";
-            } else {
-                subvalue = sanitize(value);
+            subvalue = value;
+            if (subvalue.length > 30) {
+                subvalue = subvalue.substring(0,30)+"&hellip;";
             }
             result = $('<span class="debug-message-object-value debug-message-type-string"></span>').html('"'+formatString(subvalue)+'"');
         } else {
@@ -73,7 +68,7 @@ RED.utils = (function() {
         var entryObj;
         var header;
         var headerHead;
-        var value;
+        var value,subvalue;
         var element = $('<span class="debug-message-element"></span>');
         if (!key) {
             element.addClass("debug-message-top-level");
@@ -89,7 +84,7 @@ RED.utils = (function() {
 
         var isArray = Array.isArray(obj);
         var isArrayObject = false;
-        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data') && ((obj.__encoded__ && obj.type === 'array') || obj.type === 'Buffer')) {
+        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data')) {
             isArray = true;
             isArrayObject = true;
         }
@@ -103,32 +98,23 @@ RED.utils = (function() {
                 makeExpandable(header, function() {
                     $('<span class="debug-message-type-meta debug-message-object-type-header"></span>').html(typeHint||'string').appendTo(header);
                     var row = $('<div class="debug-message-object-entry collapsed"></div>').appendTo(element);
-                    $('<pre class="debug-message-type-string"></pre>').text(obj).appendTo(row);
+                    $('<pre class="debug-message-type-string"></pre>').html(obj).appendTo(row);
                 });
             }
-            e = $('<span class="debug-message-type-string debug-message-object-header"></span>').html('"'+formatString(sanitize(obj))+'"').appendTo(entryObj);
-            if (/^#[0-9a-f]{6}$/i.test(obj)) {
-                $('<span class="debug-message-type-string-swatch"></span>').css('backgroundColor',obj).appendTo(e);
-            }
+            $('<span class="debug-message-type-string debug-message-object-header"></span>').html('"'+formatString(obj)+'"').appendTo(entryObj);
+
 
         } else if (typeof obj === 'number') {
             e = $('<span class="debug-message-type-number"></span>').text(""+obj).appendTo(entryObj);
-            if (Number.isInteger(obj) && (obj >= 0)) { // if it's a +ve integer
-                e.addClass("debug-message-type-number-toggle");
-                e.click(function(evt) {
-                    var format = $(this).data('format') || "date";
-                    if (format === 'dec') {
-                        $(this).text(""+obj).data('format','date');
-                    } else if ((format === 'date') && (obj.toString().length===13) && (obj<=2147483647000)) {
-                        $(this).text((new Date(obj)).toISOString()).data('format','hex');
-                    } else if ((format === 'date') && (obj.toString().length===10) && (obj<=2147483647)) {
-                        $(this).text((new Date(obj*1000)).toISOString()).data('format','hex');
-                    } else {
-                        $(this).text("0x"+(obj).toString(16)).data('format','dec');
-                    }
-                    evt.preventDefault();
-                });
-            }
+            e.click(function(evt) {
+                var format = $(this).data('format');
+                if (format === 'hex') {
+                    $(this).text(""+obj).data('format','dec');
+                } else {
+                    $(this).text("0x"+(obj).toString(16)).data('format','hex');
+                }
+                evt.preventDefault();
+            });
         } else if (isArray) {
             element.addClass('collapsed');
 
@@ -146,9 +132,6 @@ RED.utils = (function() {
                 if (originalLength === undefined) {
                     originalLength = data.length;
                 }
-                if (data.__encoded__) {
-                    data = data.data;
-                }
                 type = obj.type.toLowerCase();
             } else if (/buffer/.test(typeHint)) {
                 type = 'buffer';
@@ -172,7 +155,7 @@ RED.utils = (function() {
                         } catch(err) {
                             console.log(err);
                         }
-                        $('<pre class="debug-message-type-string"></pre>').text(stringEncoding).appendTo(sr);
+                        $('<pre class="debug-message-type-string"></pre>').html(stringEncoding).appendTo(sr);
                         var bufferOpts = $('<span class="debug-message-buffer-opts"></span>').appendTo(headerHead);
                         $('<a href="#"></a>').addClass('selected').html('raw').appendTo(bufferOpts).click(function(e) {
                             if ($(this).text() === 'raw') {
@@ -284,111 +267,6 @@ RED.utils = (function() {
         return element;
     }
 
-    function validatePropertyExpression(str) {
-        // This must be kept in sync with normalisePropertyExpression
-        // in red/runtime/util.js
-
-        var length = str.length;
-        if (length === 0) {
-            return false;
-        }
-        var start = 0;
-        var inString = false;
-        var inBox = false;
-        var quoteChar;
-        var v;
-        for (var i=0;i<length;i++) {
-            var c = str[i];
-            if (!inString) {
-                if (c === "'" || c === '"') {
-                    if (i != start) {
-                        return false;
-                    }
-                    inString = true;
-                    quoteChar = c;
-                    start = i+1;
-                } else if (c === '.') {
-                    if (i===0 || i===length-1) {
-                        return false;
-                    }
-                    // Next char is first char of an identifier: a-z 0-9 $ _
-                    if (!/[a-z0-9\$\_]/i.test(str[i+1])) {
-                        return false;
-                    }
-                    start = i+1;
-                } else if (c === '[') {
-                    if (i === 0) {
-                        return false;
-                    }
-                    if (i===length-1) {
-                        return false;
-                    }
-                    // Next char is either a quote or a number
-                    if (!/["'\d]/.test(str[i+1])) {
-                        return false;
-                    }
-                    start = i+1;
-                    inBox = true;
-                } else if (c === ']') {
-                    if (!inBox) {
-                        return false;
-                    }
-                    if (start != i) {
-                        v = str.substring(start,i);
-                        if (!/^\d+$/.test(v)) {
-                            return false;
-                        }
-                    }
-                    start = i+1;
-                    inBox = false;
-                } else if (c === ' ') {
-                    return false;
-                }
-            } else {
-                if (c === quoteChar) {
-                    if (i-start === 0) {
-                        return false;
-                    }
-                    // Next char must be a ]
-                    if (inBox && !/\]/.test(str[i+1])) {
-                        return false;
-                    } else if (!inBox && i+1!==length && !/[\[\.]/.test(str[i+1])) {
-                        return false;
-                    }
-                    start = i+1;
-                    inString = false;
-                }
-            }
-
-        }
-        if (inBox || inString) {
-            return false;
-        }
-        return true;
-    }
-
-    function getNodeIcon(def,node) {
-        if (def.category === 'config') {
-            return "icons/node-red/cog.png"
-        } else if (node && node.type === 'tab') {
-            return "icons/node-red/subflow.png"
-        } else if (node && node.type === 'unknown') {
-            return "icons/node-red/alert.png"
-        }
-        var icon_url;
-        if (typeof def.icon === "function") {
-            try {
-                icon_url = def.icon.call(node);
-            } catch(err) {
-                console.log("Definition error: "+def.type+".icon",err);
-                icon_url = "arrow-in.png";
-            }
-        } else {
-            icon_url = def.icon;
-        }
-        return "icons/"+def.set.module+"/"+icon_url;
-    }
-
     function getNodeLabel(node,defaultLabel) {
         defaultLabel = defaultLabel||"";
         var l = node._def.label;
@@ -403,8 +281,6 @@ RED.utils = (function() {
 
     return {
         createObjectElement: buildMessageElement,
-        validatePropertyExpression: validatePropertyExpression,
-        getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel
     }
 })();

editor/js/ui/view.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,7 @@ RED.view = (function() {
         lasso = null,
         showStatus = false,
         lastClickNode = null,
+        lastClickPort = null,
         dblClickPrimed = null,
         clickTime = 0,
         clickElapsed = 0;
@@ -70,9 +71,6 @@ RED.view = (function() {
         "grey":   "#d3d3d3"
     }
 
-    var PORT_TYPE_INPUT = 1;
-    var PORT_TYPE_OUTPUT = 0;
-
     var outer = d3.select("#chart")
         .append("svg:svg")
         .attr("width", space_width)
@@ -87,7 +85,6 @@ RED.view = (function() {
         .append("svg:g")
         .on("dblclick.zoom", null)
         .append("svg:g")
-        .attr('class','innerCanvas')
         .on("mousemove", canvasMouseMove)
         .on("mousedown", canvasMouseDown)
         .on("mouseup", canvasMouseUp)
@@ -264,6 +261,10 @@ RED.view = (function() {
 
         activeNodes = RED.nodes.filterNodes({z:activeWorkspace});
 
+        activeNodes.forEach(function(n) {
+            n.dirty = true;
+        });
+
         activeLinks = RED.nodes.filterLinks({
             source:{z:activeWorkspace},
             target:{z:activeWorkspace}
@@ -271,7 +272,6 @@ RED.view = (function() {
     }
 
     function init() {
-
         RED.events.on("workspace:change",function(event) {
             var chart = $("#chart");
             if (event.old !== 0) {
@@ -388,54 +388,29 @@ RED.view = (function() {
                 }
             }
         });
-        $("#chart").focus(function() {
-            $("#workspace-tabs").addClass("workspace-focussed")
-        });
-        $("#chart").blur(function() {
-            $("#workspace-tabs").removeClass("workspace-focussed")
-        });
 
-        RED.actions.add("core:copy-selection-to-internal-clipboard",copySelection);
-        RED.actions.add("core:cut-selection-to-internal-clipboard",function(){copySelection();deleteSelection();});
-        RED.actions.add("core:paste-from-internal-clipboard",function(){importNodes(clipboard);});
-        RED.actions.add("core:delete-selection",deleteSelection);
-        RED.actions.add("core:edit-selected-node",editSelection);
-        RED.actions.add("core:undo",RED.history.pop);
-        RED.actions.add("core:select-all-nodes",selectAll);
-        RED.actions.add("core:zoom-in",zoomIn);
-        RED.actions.add("core:zoom-out",zoomOut);
-        RED.actions.add("core:zoom-reset",zoomZero);
+        RED.keyboard.add("workspace",/* backspace */ 8,function(){deleteSelection();d3.event.preventDefault();});
+        RED.keyboard.add("workspace",/* delete */ 46,function(){deleteSelection();d3.event.preventDefault();});
+        RED.keyboard.add("workspace",/* enter */ 13, function() { editSelection(); d3.event.preventDefault();});
 
-        RED.actions.add("core:toggle-show-grid",function(state) {
-            if (state === undefined) {
-                RED.menu.toggleSelected("menu-item-view-show-grid");
-            } else {
-                toggleShowGrid(state);
-            }
-        });
-        RED.actions.add("core:toggle-snap-grid",function(state) {
-            if (state === undefined) {
-                RED.menu.toggleSelected("menu-item-view-snap-grid");
-            } else {
-                toggleSnapGrid(state);
-            }
-        });
-        RED.actions.add("core:toggle-status",function(state) {
-            if (state === undefined) {
-                RED.menu.toggleSelected("menu-item-status");
-            } else {
-                toggleStatus(state);
-            }
-        });
+        RED.keyboard.add("workspace",/* c */ 67,{ctrl:true},function(){copySelection();d3.event.preventDefault();});
+        RED.keyboard.add("workspace",/* x */ 88,{ctrl:true},function(){copySelection();deleteSelection();d3.event.preventDefault();});
 
-        RED.actions.add("core:move-selection-up", function() { moveSelection(0,-1);});
-        RED.actions.add("core:step-selection-up", function() { moveSelection(0,-20);});
-        RED.actions.add("core:move-selection-right", function() { moveSelection(1,0);});
-        RED.actions.add("core:step-selection-right", function() { moveSelection(20,0);});
-        RED.actions.add("core:move-selection-down", function() { moveSelection(0,1);});
-        RED.actions.add("core:step-selection-down", function() { moveSelection(0,20);});
-        RED.actions.add("core:move-selection-left", function() { moveSelection(-1,0);});
-        RED.actions.add("core:step-selection-left", function() { moveSelection(-20,0);});
+        RED.keyboard.add("workspace",/* z */ 90,{ctrl:true},function(){RED.history.pop();});
+        RED.keyboard.add("workspace",/* a */ 65,{ctrl:true},function(){selectAll();d3.event.preventDefault();});
+        RED.keyboard.add("*",/* = */ 187,{ctrl:true},function(){zoomIn();d3.event.preventDefault();});
+        RED.keyboard.add("*",/* - */ 189,{ctrl:true},function(){zoomOut();d3.event.preventDefault();});
+        RED.keyboard.add("*",/* 0 */ 48,{ctrl:true},function(){zoomZero();d3.event.preventDefault();});
+        RED.keyboard.add("workspace",/* v */ 86,{ctrl:true},function(){importNodes(clipboard);d3.event.preventDefault();});
+
+        RED.keyboard.add("workspace",/* up    */ 38, function() { moveSelection(0,-1);d3.event.preventDefault();},endKeyboardMove);
+        RED.keyboard.add("workspace",/* up    */ 38, {shift:true}, function() { moveSelection(0,-20); d3.event.preventDefault();},endKeyboardMove);
+        RED.keyboard.add("workspace",/* down  */ 40, function() { moveSelection(0,1);d3.event.preventDefault();},endKeyboardMove);
+        RED.keyboard.add("workspace",/* down  */ 40, {shift:true}, function() { moveSelection(0,20); d3.event.preventDefault();},endKeyboardMove);
+        RED.keyboard.add("workspace",/* left  */ 37, function() { moveSelection(-1,0);d3.event.preventDefault();},endKeyboardMove);
+        RED.keyboard.add("workspace",/* left  */ 37, {shift:true}, function() { moveSelection(-20,0); d3.event.preventDefault();},endKeyboardMove);
+        RED.keyboard.add("workspace",/* right */ 39, function() { moveSelection(1,0);d3.event.preventDefault();},endKeyboardMove);
+        RED.keyboard.add("workspace",/* right */ 39, {shift:true}, function() { moveSelection(20,0); d3.event.preventDefault();},endKeyboardMove);
     }
 
 
@@ -552,11 +527,11 @@ RED.view = (function() {
                                 var drag_line = drag_lines[0];
                                 var src = null,dst,src_port;
 
-                                if (drag_line.portType === PORT_TYPE_OUTPUT && nn.inputs > 0) {
+                                if (drag_line.portType === 0 && nn.inputs > 0) {
                                     src = drag_line.node;
                                     src_port = drag_line.port;
                                     dst = nn;
-                                } else if (drag_line.portType === PORT_TYPE_INPUT && nn.outputs > 0) {
+                                } else if (drag_line.portType === 1 && nn.outputs > 0) {
                                     src = nn;
                                     dst = drag_line.node;
                                     src_port = 0;
@@ -566,10 +541,10 @@ RED.view = (function() {
                                     RED.nodes.addLink(link);
                                     historyEvent.links = [link];
                                     hideDragLines();
-                                    if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                    } else if (drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
+                                    if (drag_line.portType === 0 && nn.outputs > 0) {
+                                        showDragLines([{node:nn,port:0,portType:0}]);
+                                    } else if (drag_line.portType === 1 && nn.inputs > 0) {
+                                        showDragLines([{node:nn,port:0,portType:1}]);
                                     } else {
                                         resetMouseVars();
                                     }
@@ -579,9 +554,9 @@ RED.view = (function() {
                                 }
                             } else {
                                 if (nn.outputs > 0) {
-                                    showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
+                                    showDragLines([{node:nn,port:0,portType:0}]);
                                 } else if (nn.inputs > 0) {
-                                    showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
+                                    showDragLines([{node:nn,port:0,portType:1}]);
                                 } else {
                                     resetMouseVars();
                                 }
@@ -681,18 +656,18 @@ RED.view = (function() {
                     var links = [];
                     var existingLinks = [];
                     if (selected_link &&
-                        ((mousedown_port_type === PORT_TYPE_OUTPUT &&
+                        ((mousedown_port_type === 0 &&
                             selected_link.source === mousedown_node &&
                             selected_link.sourcePort === mousedown_port_index
                         ) ||
-                        (mousedown_port_type === PORT_TYPE_INPUT &&
+                        (mousedown_port_type === 1 &&
                             selected_link.target === mousedown_node
                         ))
                     ) {
                         existingLinks = [selected_link];
                     } else {
                         var filter;
-                        if (mousedown_port_type === PORT_TYPE_OUTPUT) {
+                        if (mousedown_port_type === 0) {
                             filter = {
                                 source:mousedown_node,
                                 sourcePort: mousedown_port_index
@@ -709,9 +684,9 @@ RED.view = (function() {
                         RED.nodes.removeLink(link);
                         links.push({
                             link:link,
-                            node: (mousedown_port_type===PORT_TYPE_OUTPUT)?link.target:link.source,
-                            port: (mousedown_port_type===PORT_TYPE_OUTPUT)?0:link.sourcePort,
-                            portType: (mousedown_port_type===PORT_TYPE_OUTPUT)?PORT_TYPE_INPUT:PORT_TYPE_OUTPUT
+                            node: (mousedown_port_type===0)?link.target:link.source,
+                            port: (mousedown_port_type===0)?0:link.sourcePort,
+                            portType: (mousedown_port_type===0)?1:0
                         })
                     }
                     if (links.length === 0) {
@@ -732,11 +707,11 @@ RED.view = (function() {
             mousePos = mouse_position;
             for (i=0;i<drag_lines.length;i++) {
                 var drag_line = drag_lines[i];
-                var numOutputs = (drag_line.portType === PORT_TYPE_OUTPUT)?(drag_line.node.outputs || 1):1;
+                var numOutputs = (drag_line.portType === 0)?(drag_line.node.outputs || 1):1;
                 var sourcePort = drag_line.port;
                 var portY = -((numOutputs-1)/2)*13 +13*sourcePort;
 
-                var sc = (drag_line.portType === PORT_TYPE_OUTPUT)?1:-1;
+                var sc = (drag_line.portType === 0)?1:-1;
 
                 var dy = mousePos[1]-(drag_line.node.y+portY);
                 var dx = mousePos[0]-(drag_line.node.x+sc*drag_line.node.w/2);
@@ -989,7 +964,7 @@ RED.view = (function() {
             }
         }
         if (mouse_mode == RED.state.IMPORT_DRAGGING) {
-            RED.keyboard.remove("escape");
+            RED.keyboard.remove(/* ESCAPE */ 27);
             updateActiveNodes();
             RED.nodes.dirty(true);
         }
@@ -1133,7 +1108,6 @@ RED.view = (function() {
     }
 
     function endKeyboardMove() {
-        endMoveSet = false;
         if (moving_set.length > 0) {
             var ns = [];
             for (var i=0;i<moving_set.length;i++) {
@@ -1148,21 +1122,14 @@ RED.view = (function() {
             RED.nodes.dirty(true);
         }
     }
-    var endMoveSet = false;
     function moveSelection(dx,dy) {
         if (moving_set.length > 0) {
-            if (!endMoveSet) {
-                $(document).one('keyup',endKeyboardMove);
-                endMoveSet = true;
-            }
             var minX = 0;
             var minY = 0;
             var node;
 
             for (var i=0;i<moving_set.length;i++) {
                 node = moving_set[i];
-                node.n.changed = true;
-                node.n.dirty = true;
                 if (node.ox == null && node.oy == null) {
                     node.ox = node.n.x;
                     node.oy = node.n.y;
@@ -1303,10 +1270,6 @@ RED.view = (function() {
 
 
     function calculateTextWidth(str, className, offset) {
-        return calculateTextDimensions(str,className,offset,0)[0];
-    }
-
-    function calculateTextDimensions(str,className,offsetW,offsetH) {
         var sp = document.createElement("span");
         sp.className = className;
         sp.style.position = "absolute";
@@ -1314,9 +1277,8 @@ RED.view = (function() {
         sp.innerHTML = (str||"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
         document.body.appendChild(sp);
         var w = sp.offsetWidth;
-        var h = sp.offsetHeight;
         document.body.removeChild(sp);
-        return [offsetW+w,offsetH+h];
+        return offset+w;
     }
 
     function resetMouseVars() {
@@ -1324,7 +1286,7 @@ RED.view = (function() {
         mouseup_node = null;
         mousedown_link = null;
         mouse_mode = 0;
-        mousedown_port_type = PORT_TYPE_OUTPUT;
+        mousedown_port_type = 0;
         activeSpliceLink = null;
         spliceActive = false;
         d3.select(".link_splice").classed("link_splice",false);
@@ -1360,6 +1322,15 @@ RED.view = (function() {
                 $(window).on('keyup',disableQuickJoinEventHandler);
             }
         }
+
+        var now = Date.now();
+        clickElapsed = now-clickTime;
+        clickTime = now;
+
+        dblClickPrimed = (lastClickNode === mousedown_node && lastClickPort === mousedown_port_index);
+        lastClickNode = mousedown_node;
+        lastClickPort = mousedown_port_index;
+
         d3.event.stopPropagation();
         d3.event.preventDefault();
     }
@@ -1371,6 +1342,14 @@ RED.view = (function() {
                 return
             }
         }
+
+        if (dblClickPrimed && mousedown_node == d && lastClickPort === portIndex && clickElapsed > 0 && clickElapsed < 750) {
+            RED.debug.toggleBreakpoint(mousedown_node,portType,portIndex);
+            redraw();
+            return;
+        }
+
+
         document.body.style.cursor = "";
         if (mouse_mode == RED.state.JOINING || mouse_mode == RED.state.QUICK_JOINING) {
             if (typeof TouchEvent != "undefined" && d3.event instanceof TouchEvent) {
@@ -1381,7 +1360,7 @@ RED.view = (function() {
                         if (n.x-hw<mouse_position[0] && n.x+hw> mouse_position[0] &&
                             n.y-hh<mouse_position[1] && n.y+hh>mouse_position[1]) {
                                 mouseup_node = n;
-                                portType = mouseup_node.inputs>0?PORT_TYPE_INPUT:PORT_TYPE_OUTPUT;
+                                portType = mouseup_node.inputs>0?1:0;
                                 portIndex = 0;
                         }
                     }
@@ -1401,11 +1380,11 @@ RED.view = (function() {
                 if (portType != drag_lines[i].portType && mouseup_node !== drag_lines[i].node) {
                     var drag_line = drag_lines[i];
                     var src,dst,src_port;
-                    if (drag_line.portType === PORT_TYPE_OUTPUT) {
+                    if (drag_line.portType === 0) {
                         src = drag_line.node;
                         src_port = drag_line.port;
                         dst = mouseup_node;
-                    } else if (drag_line.portType === PORT_TYPE_INPUT) {
+                    } else if (drag_line.portType == 1) {
                         src = mouseup_node;
                         dst = drag_line.node;
                         src_port = portIndex;
@@ -1442,10 +1421,10 @@ RED.view = (function() {
             if (mouse_mode === RED.state.QUICK_JOINING) {
                 if (addedLinks.length > 0) {
                     hideDragLines();
-                    if (portType === PORT_TYPE_INPUT && d.outputs > 0) {
-                        showDragLines([{node:d,port:0,portType:PORT_TYPE_OUTPUT}]);
-                    } else if (portType === PORT_TYPE_OUTPUT && d.inputs > 0) {
-                        showDragLines([{node:d,port:0,portType:PORT_TYPE_INPUT}]);
+                    if (portType === 1 && d.outputs > 0) {
+                        showDragLines([{node:d,port:0,portType:0}]);
+                    } else if (portType === 0 && d.inputs > 0) {
+                        showDragLines([{node:d,port:0,portType:1}]);
                     } else {
                         resetMouseVars();
                     }
@@ -1461,106 +1440,6 @@ RED.view = (function() {
         }
     }
 
-    var portLabelHoverTimeout = null;
-    var portLabelHover = null;
-
-
-    function getElementPosition(node) {
-        var d3Node = d3.select(node);
-        if (d3Node.attr('class') === 'innerCanvas') {
-            return [0,0];
-        }
-        var result = [];
-        var localPos = [0,0];
-        if (node.nodeName.toLowerCase() === 'g') {
-            var transform = d3Node.attr("transform");
-            if (transform) {
-                localPos = d3.transform(transform).translate;
-            }
-        } else {
-            localPos = [d3Node.attr("x")||0,d3Node.attr("y")||0];
-        }
-        var parentPos = getElementPosition(node.parentNode);
-        return [localPos[0]+parentPos[0],localPos[1]+parentPos[1]]
-
-    }
-
-    function getPortLabel(node,portType,portIndex) {
-        var result;
-        var nodePortLabels = (portType === PORT_TYPE_INPUT)?node.inputLabels:node.outputLabels;
-        if (nodePortLabels && nodePortLabels[portIndex]) {
-            return nodePortLabels[portIndex];
-        }
-        var portLabels = (portType === PORT_TYPE_INPUT)?node._def.inputLabels:node._def.outputLabels;
-        if (typeof portLabels === 'string') {
-            result = portLabels;
-        } else if (typeof portLabels === 'function') {
-            try {
-                result = portLabels.call(node,portIndex);
-            } catch(err) {
-                console.log("Definition error: "+node.type+"."+((portType === PORT_TYPE_INPUT)?"inputLabels":"outputLabels"),err);
-                result = null;
-            }
-        } else if ($.isArray(portLabels)) {
-            result = portLabels[portIndex];
-        }
-        return result;
-    }
-    function portMouseOver(port,d,portType,portIndex) {
-        clearTimeout(portLabelHoverTimeout);
-        var active = (mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== portType));
-        if (active && ((portType === PORT_TYPE_INPUT && (d._def.inputLabels||d.inputLabels)) || (portType === PORT_TYPE_OUTPUT && (d._def.outputLabels||d.outputLabels)))) {
-            portLabelHoverTimeout = setTimeout(function() {
-                var tooltip = getPortLabel(d,portType,portIndex);
-                if (!tooltip) {
-                    return;
-                }
-                var pos = getElementPosition(port.node());
-                portLabelHoverTimeout = null;
-                portLabelHover = vis.append("g")
-                    .attr("transform","translate("+(pos[0]+(portType===PORT_TYPE_INPUT?-2:12))+","+(pos[1]+5)+")")
-                    .attr("class","port_tooltip");
-                var lines = tooltip.split("\n");
-                var labelWidth = 0;
-                var labelHeight = 4;
-                var labelHeights = [];
-                lines.forEach(function(l) {
-                    var labelDimensions = calculateTextDimensions(l, "port_tooltip_label", 8,0);
-                    labelWidth = Math.max(labelWidth,labelDimensions[0]);
-                    labelHeights.push(0.8*labelDimensions[1]);
-                    labelHeight += 0.8*labelDimensions[1];
-                });
-
-                var labelHeight1 = (labelHeight/2)-5-2;
-                var labelHeight2 = labelHeight - 4;
-                portLabelHover.append("path").attr("d",
-                    portType===PORT_TYPE_INPUT?
-                        "M0 0 l -5 -5 v -"+(labelHeight1)+" q 0 -2 -2 -2 h -"+labelWidth+" q -2 0 -2 2 v "+(labelHeight2)+" q 0 2 2 2 h "+labelWidth+" q 2 0 2 -2 v -"+(labelHeight1)+" l 5 -5"
-                        :
-                        "M0 0 l 5 -5 v -"+(labelHeight1)+" q 0 -2 2 -2 h "+labelWidth+" q 2 0 2 2 v "+(labelHeight2)+" q 0 2 -2 2 h -"+labelWidth+" q -2 0 -2 -2 v -"+(labelHeight1)+" l -5 -5"
-                    );
-                var y = -labelHeight/2-2;
-                lines.forEach(function(l,i) {
-                    y += labelHeights[i];
-                    portLabelHover.append("svg:text").attr("class","port_tooltip_label")
-                        .attr("x", portType===PORT_TYPE_INPUT?-10:10)
-                        .attr("y", y)
-                        .attr("text-anchor",portType===PORT_TYPE_INPUT?"end":"start")
-                        .text(l)
-                });
-            },500);
-        }
-        port.classed("port_hovered",active);
-    }
-    function portMouseOut(port,d,portType,portIndex) {
-        clearTimeout(portLabelHoverTimeout);
-        if (portLabelHover) {
-            portLabelHover.remove();
-            portLabelHover = null;
-        }
-        port.classed("port_hovered",false);
-    }
-
     function nodeMouseUp(d) {
         if (dblClickPrimed && mousedown_node == d && clickElapsed > 0 && clickElapsed < 750) {
             mouse_mode = RED.state.DEFAULT;
@@ -1583,7 +1462,7 @@ RED.view = (function() {
         //var pos = [touch0.pageX,touch0.pageY];
         //RED.touch.radialMenu.show(d3.select(this),pos);
         if (mouse_mode == RED.state.IMPORT_DRAGGING) {
-            RED.keyboard.remove("escape");
+            RED.keyboard.remove(/* ESCAPE */ 27);
 
             if (activeSpliceLink) {
                 // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp
@@ -1713,6 +1592,16 @@ RED.view = (function() {
         RED.touch.radialMenu.show(obj,pos,options);
         resetMouseVars();
     }
+
+
+    function createBreakpoint(port,type) {
+        var breakPointGroup = port.append("g").attr("class","port_breakpoint").classed("port_breakpoint_inactive",true);
+        breakPointGroup.append("rect")
+            .attr("x",2).attr("y",2)
+            .attr("rx",2).attr("ry",2)
+            .attr("width",6).attr("height",6);
+    }
+
     function redraw() {
         vis.attr("transform","scale("+scaleFactor+")");
         outer.attr("width", space_width*scaleFactor).attr("height", space_height*scaleFactor);
@@ -1755,13 +1644,13 @@ RED.view = (function() {
                             nodeMouseUp.call(this,d);
                     });
 
-                outGroup.append("g").attr('transform','translate(-5,15)').append("rect").attr("class","port").attr("rx",3).attr("ry",3).attr("width",10).attr("height",10)
-                    .on("mousedown", function(d,i){portMouseDown(d,PORT_TYPE_INPUT,0);} )
-                    .on("touchstart", function(d,i){portMouseDown(d,PORT_TYPE_INPUT,0);} )
-                    .on("mouseup", function(d,i){portMouseUp(d,PORT_TYPE_INPUT,0);})
-                    .on("touchend",function(d,i){portMouseUp(d,PORT_TYPE_INPUT,0);} )
-                    .on("mouseover",function(d){portMouseOver(d3.select(this),d,PORT_TYPE_INPUT,0);})
-                    .on("mouseout",function(d){portMouseOut(d3.select(this),d,PORT_TYPE_INPUT,0);});
+                outGroup.append("rect").attr("class","port").attr("rx",3).attr("ry",3).attr("width",10).attr("height",10).attr("x",-5).attr("y",15)
+                    .on("mousedown", function(d,i){portMouseDown(d,1,0);} )
+                    .on("touchstart", function(d,i){portMouseDown(d,1,0);} )
+                    .on("mouseup", function(d,i){portMouseUp(d,1,0);})
+                    .on("touchend",function(d,i){portMouseUp(d,1,0);} )
+                    .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 1)));})
+                    .on("mouseout",function(d,i) { var port = d3.select(this); port.classed("port_hovered",false);});
 
                 outGroup.append("svg:text").attr("class","port_label").attr("x",20).attr("y",8).style("font-size","10px").text("output");
                 outGroup.append("svg:text").attr("class","port_label port_index").attr("x",20).attr("y",24).text(function(d,i){ return i+1});
@@ -1798,15 +1687,13 @@ RED.view = (function() {
                             nodeMouseUp.call(this,d);
                     });
 
-                inGroup.append("g").attr('transform','translate(35,15)').append("rect").attr("class","port").attr("rx",3).attr("ry",3).attr("width",10).attr("height",10)
-                    .on("mousedown", function(d,i){portMouseDown(d,PORT_TYPE_OUTPUT,i);} )
-                    .on("touchstart", function(d,i){portMouseDown(d,PORT_TYPE_OUTPUT,i);} )
-                    .on("mouseup", function(d,i){portMouseUp(d,PORT_TYPE_OUTPUT,i);})
-                    .on("touchend",function(d,i){portMouseUp(d,PORT_TYPE_OUTPUT,i);} )
-                    .on("mouseover",function(d){portMouseOver(d3.select(this),d,PORT_TYPE_OUTPUT,0);})
-                    .on("mouseout",function(d) {portMouseOut(d3.select(this),d,PORT_TYPE_OUTPUT,0);});
-
-
+                inGroup.append("rect").attr("class","port").attr("rx",3).attr("ry",3).attr("width",10).attr("height",10).attr("x",35).attr("y",15)
+                    .on("mousedown", function(d,i){portMouseDown(d,0,i);} )
+                    .on("touchstart", function(d,i){portMouseDown(d,0,i);} )
+                    .on("mouseup", function(d,i){portMouseUp(d,0,i);})
+                    .on("touchend",function(d,i){portMouseUp(d,0,i);} )
+                    .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 0) ));})
+                    .on("mouseout",function(d,i) { var port = d3.select(this); port.classed("port_hovered",false);});
                 inGroup.append("svg:text").attr("class","port_label").attr("x",18).attr("y",20).style("font-size","10px").text("input");
 
 
@@ -1942,7 +1829,7 @@ RED.view = (function() {
                    //node.append("rect").attr("class", "node-gradient-bottom").attr("rx", 6).attr("ry", 6).attr("height",30).attr("stroke","none").attr("fill","url(#gradient-bottom)").style("pointer-events","none");
 
                     if (d._def.icon) {
-                        var icon_url = RED.utils.getNodeIcon(d._def,d);
+
                         var icon_group = node.append("g")
                             .attr("class","node_icon_group")
                             .attr("x",0).attr("y",0);
@@ -1957,7 +1844,7 @@ RED.view = (function() {
                             .attr("height",function(d){return Math.min(50,d.h-4);});
 
                         var icon = icon_group.append("image")
-                            .attr("xlink:href",icon_url)
+                            .attr("xlink:href","icons/"+d._def.icon)
                             .attr("class","node_icon")
                             .attr("x",0)
                             .attr("width","30")
@@ -1988,7 +1875,7 @@ RED.view = (function() {
                         //}
 
                         var img = new Image();
-                        img.src = icon_url;
+                        img.src = "icons/"+d._def.icon;
                         img.onload = function() {
                             icon.attr("width",Math.min(img.width,30));
                             icon.attr("height",Math.min(img.height,30));
@@ -2025,10 +1912,8 @@ RED.view = (function() {
                     //node.append("circle").attr({"class":"centerDot","cx":0,"cy":0,"r":5});
 
                     //node.append("path").attr("class","node_error").attr("d","M 3,-3 l 10,0 l -5,-8 z");
-
-                    //TODO: these ought to be SVG
-                    node.append("image").attr("class","node_error hidden").attr("xlink:href","icons/node-red/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9);
-                    node.append("image").attr("class","node_changed hidden").attr("xlink:href","icons/node-red/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10);
+                    node.append("image").attr("class","node_error hidden").attr("xlink:href","icons/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9);
+                    node.append("image").attr("class","node_changed hidden").attr("xlink:href","icons/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10);
             });
 
             node.each(function(d,i) {
@@ -2065,18 +1950,27 @@ RED.view = (function() {
                             //thisNode.selectAll(".node_icon_shade_border_right").attr("d",function(d){return "M "+(d.w-30)+" 1 l 0 "+(d.h-2)});
 
                             var inputPorts = thisNode.selectAll(".port_input");
+                            var breakPointGroup;
                             if (d.inputs === 0 && !inputPorts.empty()) {
                                 inputPorts.remove();
                                 //nodeLabel.attr("x",30);
-                            } else if (d.inputs === 1 && inputPorts.empty()) {
-                                var inputGroup = thisNode.append("g").attr("class","port_input");
-                                inputGroup.append("rect").attr("class","port").attr("rx",3).attr("ry",3).attr("width",10).attr("height",10)
-                                    .on("mousedown",function(d){portMouseDown(d,PORT_TYPE_INPUT,0);})
-                                    .on("touchstart",function(d){portMouseDown(d,PORT_TYPE_INPUT,0);})
-                                    .on("mouseup",function(d){portMouseUp(d,PORT_TYPE_INPUT,0);} )
-                                    .on("touchend",function(d){portMouseUp(d,PORT_TYPE_INPUT,0);} )
-                                    .on("mouseover",function(d){portMouseOver(d3.select(this),d,PORT_TYPE_INPUT,0);})
-                                    .on("mouseout",function(d) {portMouseOut(d3.select(this),d,PORT_TYPE_INPUT,0);});
+                            } else if (d.inputs === 1) {
+                                if  (inputPorts.empty()) {
+                                    var inputGroup = thisNode.append("g").attr("class","port_input");
+                                    inputGroup.append("rect").attr("class","port").attr("rx",3).attr("ry",3).attr("width",10).attr("height",10)
+                                        .on("mousedown",function(d){portMouseDown(d,1,0);})
+                                        .on("touchstart",function(d){portMouseDown(d,1,0);})
+                                        .on("mouseup",function(d){portMouseUp(d,1,0);} )
+                                        .on("touchend",function(d){portMouseUp(d,1,0);} )
+                                        .on("mouseover",function(d) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 1) ));})
+                                        .on("mouseout",function(d) { var port = d3.select(this); port.classed("port_hovered",false);})
+
+                                    createBreakpoint(inputGroup,0);
+                                } else {
+                                    var breakpointState = RED.debug.checkBreakpoint(d,1,0);
+                                    inputPorts.selectAll(".port_breakpoint").classed("port_breakpoint_active",breakpointState);
+                                    inputPorts.selectAll(".port_breakpoint").classed("port_breakpoint_inactive",!breakpointState);
+                                }
                             }
 
                             var numOutputs = d.outputs;
@@ -2086,38 +1980,32 @@ RED.view = (function() {
                             var output_group = d._ports.enter().append("g").attr("class","port_output");
 
                             output_group.append("rect").attr("class","port").attr("rx",3).attr("ry",3).attr("width",10).attr("height",10)
-                                .on("mousedown",(function(){var node = d; return function(d,i){portMouseDown(node,PORT_TYPE_OUTPUT,i);}})() )
-                                .on("touchstart",(function(){var node = d; return function(d,i){portMouseDown(node,PORT_TYPE_OUTPUT,i);}})() )
-                                .on("mouseup",(function(){var node = d; return function(d,i){portMouseUp(node,PORT_TYPE_OUTPUT,i);}})() )
-                                .on("touchend",(function(){var node = d; return function(d,i){portMouseUp(node,PORT_TYPE_OUTPUT,i);}})() )
-                                .on("mouseover",(function(){var node = d; return function(d,i){portMouseOver(d3.select(this),node,PORT_TYPE_OUTPUT,i);}})())
-                                .on("mouseout",(function(){var node = d; return function(d,i) {portMouseOut(d3.select(this),node,PORT_TYPE_OUTPUT,i);}})());
+                                .on("mousedown",(function(){var node = d; return function(d,i){portMouseDown(node,0,i);}})() )
+                                .on("touchstart",(function(){var node = d; return function(d,i){portMouseDown(node,0,i);}})() )
+                                .on("mouseup",(function(){var node = d; return function(d,i){portMouseUp(node,0,i);}})() )
+                                .on("touchend",(function(){var node = d; return function(d,i){portMouseUp(node,0,i);}})() )
+                                .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 0) ));})
+                                .on("mouseout",function(d,i) { var port = d3.select(this); port.classed("port_hovered",false);});
+
+                            createBreakpoint(output_group,1);
 
                             d._ports.exit().remove();
                             if (d._ports) {
                                 numOutputs = d.outputs || 1;
                                 y = (d.h/2)-((numOutputs-1)/2)*13;
                                 var x = d.w - 5;
-                                d._ports.each(function(d,i) {
-                                        var port = d3.select(this);
-                                        //port.attr("y",(y+13*i)-5).attr("x",x);
-                                        port.attr("transform", function(d) { return "translate("+x+","+((y+13*i)-5)+")";});
+                                d._ports.each(function(n,i) {
+                                    var port = d3.select(this);
+                                    //port.attr("y",(y+13*i)-5).attr("x",x);
+                                    port.attr("transform", function(d) { return "translate("+x+","+((y+13*i)-5)+")";});
+                                    var breakpointState = RED.debug.checkBreakpoint(d,0,i);
+                                    port.selectAll(".port_breakpoint").classed("port_breakpoint_active",breakpointState);
+                                    port.selectAll(".port_breakpoint").classed("port_breakpoint_inactive",!breakpointState);
+
                                 });
                             }
-                            thisNode.selectAll("text.node_label").text(function(d,i){
-                                    var l = "";
-                                    if (d._def.label) {
-                                        l = d._def.label;
-                                        try {
-                                            l = (typeof l === "function" ? l.call(d) : l)||"";
-                                            l = RED.text.bidi.enforceTextDirectionWithUCC(l);
-                                        } catch(err) {
-                                            console.log("Definition error: "+d.type+".label",err);
-                                            l = d.type;
-                                        }
-                                    }
-                                    return l;
-                                })
+                            thisNode.selectAll("text.node_label")
+                                .text(function(d,i){ return RED.utils.getNodeLabel(d); })
                                 .attr("y", function(d){return (d.h/2)-1;})
                                 .attr("class",function(d){
                                     var s = "";
@@ -2138,11 +2026,21 @@ RED.view = (function() {
                             if (d._def.icon) {
                                 icon = thisNode.select(".node_icon");
                                 var current_url = icon.attr("xlink:href");
-                                var new_url = RED.utils.getNodeIcon(d._def,d);
-                                if (new_url !== current_url) {
-                                    icon.attr("xlink:href",new_url);
+                                var icon_url;
+                                if (typeof d._def.icon == "function") {
+                                    try {
+                                        icon_url = d._def.icon.call(d);
+                                    } catch(err) {
+                                        console.log("icon",err);
+                                        icon_url = "arrow-in.png";
+                                    }
+                                } else {
+                                    icon_url = d._def.icon;
+                                }
+                                if ("icons/"+icon_url != current_url) {
+                                    icon.attr("xlink:href","icons/"+icon_url);
                                     var img = new Image();
-                                    img.src = new_url;
+                                    img.src = "icons/"+d._def.icon;
                                     img.onload = function() {
                                         icon.attr("width",Math.min(img.width,30));
                                         icon.attr("height",Math.min(img.height,30));
@@ -2561,8 +2459,8 @@ RED.view = (function() {
                                            node.n._def.outputs > 0;
                         }
                     }
-                    RED.keyboard.add("*","escape",function(){
-                            RED.keyboard.remove("escape");
+                    RED.keyboard.add("*",/* ESCAPE */ 27,function(){
+                            RED.keyboard.remove(/* ESCAPE */ 27);
                             clearSelection();
                             RED.history.pop();
                             mouse_mode = 0;
@@ -2607,24 +2505,6 @@ RED.view = (function() {
         }
     }
 
-    function toggleShowGrid(state) {
-        if (state) {
-            grid.style("visibility","visible");
-        } else {
-            grid.style("visibility","hidden");
-        }
-    }
-    function toggleSnapGrid(state) {
-        snapGrid = state;
-        redraw();
-    }
-    function toggleStatus(s) {
-        showStatus = s;
-        RED.nodes.eachNode(function(n) { n.dirty = true;});
-        //TODO: subscribe/unsubscribe here
-        redraw();
-    }
-
     return {
         init: init,
         state:function(state) {
@@ -2644,6 +2524,16 @@ RED.view = (function() {
         },
         focus: focusView,
         importNodes: importNodes,
+        status: function(s) {
+            if (s == null) {
+                return showStatus;
+            } else {
+                showStatus = s;
+                RED.nodes.eachNode(function(n) { n.dirty = true;});
+                //TODO: subscribe/unsubscribe here
+                redraw();
+            }
+        },
         calculateTextWidth: calculateTextWidth,
         select: function(selection) {
             if (typeof selection !== "undefined") {
@@ -2670,6 +2560,17 @@ RED.view = (function() {
             }
             return selection;
         },
+        toggleShowGrid: function(state) {
+            if (state) {
+                grid.style("visibility","visible");
+            } else {
+                grid.style("visibility","hidden");
+            }
+        },
+        toggleSnapGrid: function(state) {
+            snapGrid = state;
+            redraw();
+        },
         scale: function() {
             return scaleFactor;
         },

editor/js/ui/workspaces.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@ RED.workspaces = (function() {
                 RED.nodes.dirty(true);
             }
         }
-        RED.view.focus();
         return ws;
     }
     function deleteWorkspace(ws) {
@@ -140,10 +139,6 @@ RED.workspaces = (function() {
                 RED.events.emit("workspace:change",event);
                 window.location.hash = 'flow/'+tab.id;
                 RED.sidebar.config.refresh();
-                RED.view.focus();
-            },
-            onclick: function(tab) {
-                RED.view.focus();
             },
             ondblclick: function(tab) {
                 if (tab.type != "subflow") {
@@ -175,9 +170,6 @@ RED.workspaces = (function() {
         createWorkspaceTabs();
         RED.events.on("sidebar:resize",workspace_tabs.resize);
 
-        RED.actions.add("core:show-next-tab",workspace_tabs.nextTab);
-        RED.actions.add("core:show-previous-tab",workspace_tabs.previousTab);
-
         RED.menu.setAction('menu-item-workspace-delete',function() {
             deleteWorkspace(RED.nodes.workspace(activeWorkspace));
         });
@@ -185,14 +177,6 @@ RED.workspaces = (function() {
         $(window).resize(function() {
             workspace_tabs.resize();
         });
-
-        RED.actions.add("core:add-flow",addWorkspace);
-        RED.actions.add("core:edit-flow",editWorkspace);
-        RED.actions.add("core:remove-flow",removeWorkspace);
-    }
-
-    function editWorkspace(id) {
-        showRenameWorkspaceDialog(id||activeWorkspace);
     }
 
     function removeWorkspace(ws) {
@@ -217,7 +201,9 @@ RED.workspaces = (function() {
         add: addWorkspace,
         remove: removeWorkspace,
         order: setWorkspaceOrder,
-        edit: editWorkspace,
+        edit: function(id) {
+            showRenameWorkspaceDialog(id||activeWorkspace);
+        },
         contains: function(id) {
             return workspace_tabs.contains(id);
         },

editor/js/user.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014, 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/js/validators.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,6 @@
  * limitations under the License.
  **/
 RED.validators = {
-    number: function(blankAllowed){return function(v) { return (blankAllowed&&(v===''||v===undefined)) || (v!=='' && !isNaN(v));}},
-    regex: function(re){return function(v) { return re.test(v);}},
-    typedInput: function(ptypeName,isConfig) { return function(v) {
-        var ptype = $("#node-"+(isConfig?"config-":"")+"input-"+ptypeName).val() || this[ptypeName];
-        if (ptype === 'json') {
-            try {
-                JSON.parse(v);
-                return true;
-            } catch(err) {
-                return false;
-            }
-        } else if (ptype === 'msg' || ptype === 'flow' || ptype === 'global' ) {
-            return RED.utils.validatePropertyExpression(v);
-        } else if (ptype === 'num') {
-            return /^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v);
-        }
-        return true;
-    }}
+    number: function(){return function(v) { return v!=='' && !isNaN(v);}},
+    regex: function(re){return function(v) { return re.test(v);}}
 };

editor/sass/ace.scss

@@ -1,8 +0,0 @@
-.ace_gutter {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-}
-.ace_scroller {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}

editor/sass/bootstrap.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/colors.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/debug.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,15 @@
     right: 0px;
     overflow-y: scroll;
 }
+.debug-dbgr-content {
+    top: 0px;
+}
+.debug-dbgr-content-disabled {
+    padding-top: 40px;
+    text-align: center;
+    background: #f3f3f3;
+    color: #999;
+}
 .debug-filter-box {
     position:absolute;
     top: 42px;
@@ -45,6 +54,18 @@
     text-align: right;
 }
 
+.debug-debugger-box {
+    position:absolute;
+    top: 42px;
+    left: 0px;
+    right: 0px;
+    background: #f9f9f9;
+    padding: 10px;
+    border-bottom: 1px solid #ddd;
+    box-shadow: 0 2px 6px rgba(0,0,0,0.1);
+}
+
+
 .debug-message {
     border-bottom: 1px solid #eee;
     border-left: 8px solid #eee;
@@ -150,8 +171,7 @@
 .debug-message-type-string { color: #b72828; }
 .debug-message-type-null { color: #666; font-style: italic;}
 .debug-message-type-meta { color: #666; font-style: italic;}
-.debug-message-type-number { color: #2033d6; };
-.debug-message-type-number-toggle { cursor: pointer;}
+.debug-message-type-number { color: #2033d6;cursor: pointer;}
 
 .debug-message-expandable {
     cursor: pointer;
@@ -183,11 +203,34 @@
 .debug-message-buffer-string > .debug-message-array-rows {
     display: none;
 }
-.debug-message-type-string-swatch {
-    display: inline-block;
-    width: 1.1em;
-    height: 0.9em;
-    vertical-align: middle;
-    border-radius: 3px;
-    margin: 0 4px;
+.debug-dbgr-breakpoints {
+    background: #f9f9f9;
+    padding: 0;
+}
+.debug-dbgr-content {
+    .red-ui-editableList {
+        background: none;
+        input {
+            vertical-align: middle;
+            margin: 0 8px 0 4px;
+        }
+        li {
+            padding: 0;
+        }
+        label {
+            padding: 6px 2px;
+            &:hover {
+                background: #f3f3f3;
+            }
+            margin: 0;
+        }
+        .red-ui-search-result-node-type {
+            margin-left: 26px;
+        }
+    }
+    .red-ui-editableList-container {
+        border: none;
+        border-radius: 0;
+        padding: 0;
+    }
 }

editor/sass/diff.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,67 +21,30 @@
     .red-ui-editableList-container {
         border-radius:1px;
         padding:0;
-        background: #f9f9f9;
     }
-    #node-dialog-view-diff-diff {
+    ol {
         position: absolute;
-        top:80px;
+        top:10px;
         bottom:10px;
         left:10px;
         right:10px;
         li {
-            background: #f9f9f9;
             padding: 0px;
             border: none;
-            min-height: 0;
         }
 
     }
     .red-ui-editableList-item-content {
         padding: 5px;
-        // padding-bottom: 5px;
     }
-}
-#node-dialog-view-diff-headers {
-    position: absolute;
-    left:17px;
-    right:32px;
-    top: 55px;
-    height: 25px;
-    .node-diff-node-entry-cell:not(:first-child) {
-        background: #f9f9f9;
-        text-align: center;
-        border-top: 1px solid $secondary-border-color;
-        border-color:$secondary-border-color;
-    }
-    .node-diff-node-entry-cell:last-child {
-        border-right: 1px solid $secondary-border-color;
 
-    }
-}
-
-.node-diff-toolbar {
-    position:absolute;
-    top:0;
-    left:0;
-    right:0;
-    height: 43px;
-    box-sizing: border-box;
-    color: #666;
-    text-align: right;
-    padding: 8px 10px;
-    background: #f3f3f3;
-    border-bottom: 1px solid $secondary-border-color;
-    white-space: nowrap;
 }
 .node-diff-tab {
-    background: #fff;
-    border: 1px solid #ddd;
-    border-radius: 1px;
-    overflow: hidden;
+    border: 1px solid $secondary-border-color;
+    border-radius: 3px;
 
     &.collapsed {
-        .node-diff-tab-title .node-diff-chevron {
+        .node-diff-tab-title > .node-diff-chevron {
             transform: rotate(-90deg);
         }
         .node-diff-node-entry {
@@ -90,26 +53,21 @@
     }
 }
 .node-diff-tab-stats {
-    font-size: 0.9em;
+    position: absolute;
+    left: 50%;
 }
 
 .node-diff-chevron {
-    display: inline-block;
     width: 15px;
     text-align: center;
-    margin-left: 3px;
+    margin: 3px 5px 3px 5px;
     transition: transform 0.1s ease-in-out;
 
 }
 .node-diff-node-entry {
-    margin-left: 20px;
-    font-size: 0.9em;
-
-    &:first-child {
-        border-top: 1px solid #eee;
-    }
+    padding: 0 0 0 5px;
     &:not(:last-child) {
-        border-bottom: 1px solid #eee;
+        border-bottom: 1px solid $secondary-border-color;
     }
 
     &.collapsed {
@@ -120,80 +78,25 @@
             display: none;
         }
     }
-    &:not(.collapsed) {
-        .node-diff-node-entry-cell:not(:first-child) {
-            //display: none;
-        }
-        .node-diff-node-entry-cell:first-child {
-            //width: 100%
-        }
-    }
 
     table {
-        border-collapse: collapse;
-        table-layout:fixed;
-        
-        // Fix for table-layout: fixed on safari:
-        max-width: none;
-        width: auto;
-        min-width: 100%;
+         border-collapse: collapse;
+         width: 100%;
+         table-layout:fixed;
     }
     td, th {
         border: 1px solid $secondary-border-color;
-        padding: 0 0 0 3px;
+        padding: 3px 5px;
         text-align: left;
-        overflow-x: auto;
     }
-    tr {
-        vertical-align: top;
-        &:first-child td {
-            white-space:nowrap;
-            overflow:hidden;
-        }
-    }
-    td:first-child {
-        width: 140px;
+
+    td:nth-child(1) {
+        width: 150px;
     }
     td:not(:first-child) {
-        width: calc( 100% - 140px);
-    }
-    td  {
-        .node-diff-status {
-            margin-left: 0;
-        }
-    }
-    tr:not(.node-diff-property-header) {
-        .node-diff-status {
-            width: 12px;
-            margin-left: 0;
-            margin-top: 0;
-            margin-bottom: 0;
-            margin-right: 5px;
-        }
+        width: calc(50% - 150px);
     }
 }
-.node-diff-three-way {
-    .node-diff-node-entry-cell {
-        width: calc((100% - 220px) / 2);
-        &:first-child {
-            width: 220px;
-        }
-    }
-    td:not(:first-child) {
-        width: calc( (100% - 140px) / 2);
-    }
-
-    .node-diff-node-entry {
-        .node-diff-node-entry-cell {
-            width: calc((100% + 20px - 220px) / 2);
-            &:first-child {
-                width: 200px;
-            }
-
-        }
-    }
-}
-
 .node-diff-column {
     display:inline-block;
     height:100%;
@@ -205,26 +108,18 @@
         border-right: 1px solid $secondary-border-color
     }
 }
-
 .node-diff-tab-title {
-    cursor: pointer;
-    padding: 0;
-    // background: #f6f6f6;
-}
-.node-diff-tab-title-meta {
-    vertical-align: middle;
-    display: inline-block;
-    padding-top: 2px;
-}
-.node-diff-node-entry-header {
+    padding: 3px 3px 3px 0;
+    background: #f6f6f6;
     cursor: pointer;
 }
+
 .node-diff-node-entry-node {
     vertical-align: middle;
     display: inline-block;
     margin: 5px;
-    width: 18px;
-    height: 15px;
+    width: 24px;
+    height: 20px;
     background: #ddd;
     border-radius: 2px;
     border: 1px solid #999;
@@ -233,89 +128,25 @@
     background-size: contain;
     position: relative;
 
-    .palette_icon {
-        background-position: 49% 50%;
-        width: 15px;
+    .palette-icon {
+        width: 16px;
     }
     .palette_icon_container {
-        width: 18px;
-    }
-}
-.node-diff-tab-empty {
-    .node-diff-chevron i {
-        display: none;
-    }
-    .node-diff-tab-title {
-        cursor: default;
-    }
-}
-.node-diff-node-deleted {
-    //background: #fadddd;
-    cursor: default !important;
-    .node-diff-status {
-        color: #f80000;
-    }
-    .node-diff-node-entry-node {
-        opacity: 0.5;
-    }
-    .node-diff-node-description {
-        opacity: 0.5;
-        text-decoration: line-through;
-    }
-}
-.node-diff-node-added {
-    //background: #eefaee;
-    cursor: default !important;
-    .node-diff-status {
-        color: #009900;
-    }
-}
-.node-diff-node-moved {
-    //background: #eefaee;
-    .node-diff-status {
-        color: #3f81b3;
-    }
-}
-
-.node-diff-node-changed {
-    //background: #fff2ca;
-    .node-diff-status {
-        color: #f89406;
-    }
-}
-.node-diff-node-unchanged {
-    //background: #fff2ca;
-    .node-diff-status {
-        color: #bbb;
-    }
-}
-.node-diff-node-conflict {
-    .node-diff-status {
-        color: #9b45ce;
+        width: 24px;
     }
 }
 .node-diff-node-entry-title {
-    display: inline-block;
-    .node-diff-status {
-        margin-left: 15px;
-    }
+    cursor: pointer;
 }
 .node-diff-node-entry-properties {
-    margin: 5px ;
+    margin-left: 30px;
+    margin-right: 8px;
+    margin-bottom:8px;
     color: #666;
 }
-.node-diff-status {
-    display: inline-block;
-    height: 20px;
-    margin-left: 5px;
-    vertical-align: top;
-    margin-top: 6px;
-    margin-bottom: 6px;
-    text-align: center;
-}
-
 .node-diff-node-description {
     color: $form-text-color;
+    margin-left: 5px;
     margin-right: 5px;
     padding-top: 5px;
     display: inline-block;
@@ -325,192 +156,10 @@
         clear: both;
     }
 }
-.node-diff-node-meta {
-    float: right;
-    //font-size: 0.9em;
-    color: #999;
-    margin-top: 7px;
-    margin-right: 10px;
-}
+
 
 .node-diff-count { color: #999}
 .node-diff-added { color: #009900}
 .node-diff-deleted { color: #f80000}
 .node-diff-changed { color: #f89406}
 .node-diff-conflicted { color: purple}
-
-
-.node-diff-node-entry-cell {
-    display: inline-block;
-    vertical-align: top;
-    box-sizing: border-box;
-    width: calc( (100% - 20px) / 2);
-    height: 32px;
-    border-left: 1px solid #eee;
-    padding-top: 2px;
-    white-space: nowrap;
-    overflow: hidden;
-    position: relative;
-}
-.node-diff-empty {
-    background: #f3f3f3;
-    background: repeating-linear-gradient(
-        20deg,
-        #fff, #fff 5px,
-        #f6f6f6 5px,
-        #f6f6f6 10px
-        );
-}
-.node-diff-node-entry-cell:first-child {
-    border-left: none;
-}
-.node-diff-property-cell-label {
-    margin-left: 20px;
-    vertical-align: top;
-    box-sizing: border-box;
-    padding-left: 8px;
-    width: 120px;
-}
-.node-diff-property-wires {
-    display: inline-block;
-    .node-diff-node-entry-node {
-        width: 18px;
-        height: 15px;
-    }
-    .palette_icon_container {
-        width: 18px;
-    }
-    .palette_icon {
-        width: 15px;
-    }
-    ul,li,ol {
-        background: none !important;
-    }
-    ul {
-        vertical-align: middle;
-        display: inline-block;
-        margin-left: 5px;
-    }
-    li {
-        list-style-type: none !important;
-    }
-    ol {
-        font-size: 0.9em;
-        margin: 0;
-        & > span {
-            vertical-align: middle;
-            display: inline-block;
-            width: 30px;
-            text-align: center;
-        }
-        & > li:not(:last-child) {
-            border-bottom: 1px solid #999;
-        }
-    }
-
-}
-.node-diff-node-props .node-diff-node-entry-cell:first-child {
-    padding: 6px 0px;
-    span:not(.node-diff-chevron) {
-        margin-left: 5px;
-    }
-
-}
-.node-diff-property-cell {
-    // vertical-align: top;
-    // display:inline-block;
-    //
-    // box-sizing: border-box;
-    // padding: 1px 5px;
-    //min-height: 30px;
-
-    &.node-diff-node-changed {
-        background: #fff2e1 !important;
-    }
-    &.node-diff-node-conflict {
-        background: #ffdad4 !important;
-    }
-}
-
-.node-diff-selectbox {
-    position: absolute;
-    top:0;
-    right:0;
-    bottom:0;
-    width: 35px;
-    text-align: center;
-    border-left: 1px solid #eee;
-    margin:0;
-    input {
-        margin-top: 8px;
-    }
-
-    &:hover {
-        background: #f3f3f3;
-    }
-}
-
-.node-diff-node-entry-conflict.node-diff-select-remote {
-    .node-diff-node-remote {
-        background: #e7ffe3;
-        label {
-            border-left-color: #b8daad;
-        }
-    }
-    .node-diff-node-local {
-        background: #ffe1e1;
-        label {
-            border-left-color: #e4bcbc;
-        }
-    }
-}
-.node-diff-node-entry-conflict.node-diff-select-local {
-    .node-diff-node-local {
-        background: #e7ffe3;
-        label {
-            border-left-color: #b8daad;
-        }
-    }
-    .node-diff-node-remote {
-        background: #ffe1e1;
-        label {
-            border-left-color: #e4bcbc;
-        }
-    }
-}
-
-
-#node-dialog-confirm-deploy {
-    .node-dialog-confirm-row {
-        text-align: left; padding-top: 10px;
-    }
-    ul {
-        font-size: 0.9em;
-        width: 400px;
-        margin: 10px auto;
-        text-align: left;
-    }
-    .node-dialog-confirm-conflict-row {
-        img {
-            vertical-align:middle;
-            height: 30px;
-            margin-right: 10px;
-        }
-        i {
-             vertical-align:middle;
-             text-align: center;
-             font-size: 30px;
-             width: 30px;
-             margin-right: 10px;
-        }
-        div {
-            vertical-align: middle;
-            width: calc(100% - 60px);
-            display:inline-block;
-        }
-    }
-}
-
-#node-diff-toolbar-resolved-conflicts .node-diff-status {
-    margin:0;
-}

editor/sass/dragdrop.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
     width: 100%;
     height: 100%;
     display: none;
-    z-index:100;
 }
 #dropTarget div {
     display: table-cell;
@@ -35,3 +34,4 @@
 #dropTarget div i {
     font-size: 80px;
 }
+

editor/sass/dropdownMenu.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/editor.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,12 +46,7 @@
     overflow: auto;
 }
 .editor-tray-body {
-    form {
-        margin: 20px;
-    }
-}
-.editor-tray-content {
-    overflow: auto;
+    margin: 20px;
 }
 .editor-tray-header {
     @include disable-selection;
@@ -70,13 +65,6 @@
 .editor-tray-footer {
     @include component-footer;
     height: 35px;
-
-    button {
-        @include editor-button;
-        padding: 3px 7px;
-        font-size: 11px;
-    }
-
 }
 
 .editor-tray-toolbar {
@@ -84,9 +72,48 @@
     padding: 6px;
 
     button {
-        @include editor-button;
-        &.toggle {
-            @include workspace-button-toggle;
+        @include workspace-button;
+        font-size: 14px;
+        padding: 6px 14px;
+        margin-right: 8px;
+        color: $editor-button-color !important;
+        background: $editor-button-background;
+
+        &.primary {
+            border-color: $editor-button-background-primary;
+            color: $editor-button-color-primary !important;
+            background: $editor-button-background-primary;
+            &.disabled, &.ui-state-disabled {
+                background: none;
+                color: $editor-button-color !important;
+                border-color: $form-input-border-color;
+            }
+            &:not(.disabled):not(.ui-button-disabled):hover {
+                border-color: $editor-button-background-primary-hover;
+                background: $editor-button-background-primary-hover;
+                color: $editor-button-color-primary !important;
+            }
+        }
+        &:not(.disabled):hover {
+            //color: $editor-button-color;
+        }
+        &.disabled {
+            background: none;
+        }
+        &.disabled:focus {
+            outline: none;
+        }
+
+
+        &.leftButton {
+            float: left;
+            margin-top: 1px;
+        }
+        &:not(.leftButton):not(:last-child) {
+            margin-right: 16px;
+        }
+        &.ui-state-disabled {
+            opacity: 1;
         }
     }
 }
@@ -152,6 +179,7 @@
 
 
 .dialog-form,#dialog-form, #dialog-config-form {
+    margin: 0;
     height: 100%;
 }
 
@@ -216,6 +244,17 @@
     padding: 0 5px;
 }
 
+.dialog-form {
+    .button-group {
+        .editor-button {
+            &:first-child {
+
+            }
+        }
+    }
+
+}
+
 #node-config-dialog-scope-container {
     cursor: auto;
     float: right;

editor/sass/flow.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,13 +120,28 @@
     fill: #ddd;
     cursor: crosshair;
 }
-
-.port_highlight {
-    stroke: #6DA332;
-    stroke-width: 3;
-    fill: #fff;
-    pointer-events:none;
-    fill-opacity: 0.5;
+.port_breakpoint {
+    pointer-events: none;
+    rect {
+        stroke: #666;
+        stroke-width: 0;
+        fill:  #666;
+    }
+}
+.port_breakpoint_inactive {
+    rect {
+        fill: none;
+    }
+}
+.port_breakpoint_active {
+    rect {
+        fill: #5386de;
+    }
+}
+.port_breakpoint_triggered {
+    rect {
+        fill: #ff1010;
+    }
 }
 
 .node_error {
@@ -272,25 +287,3 @@ g.link_unknown path.link_line {
     stroke-width: 2;
     stroke-dasharray: 10, 4;
 }
-
-@keyframes port_tooltip_fadeIn { from { opacity:0; } to { opacity:1; } }
-
-.port_tooltip {
-    opacity:0;
-    animation: 0.1s ease-in 0s 1 normal forwards port_tooltip_fadeIn;
-    pointer-events: none;
-
-    path {
-        fill: white;
-        stroke: #999;
-        stroke-width: 1;
-    }
-}
-.port_tooltip_label {
-    stroke-width: 0;
-    fill: #666;
-    font-size: 12px;
-    pointer-events: none;
-    -webkit-touch-callout: none;
-    @include disable-selection;
-}

editor/sass/forms.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/header.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/jquery.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/keyboard.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,42 +16,19 @@
 
 #keyboard-help-dialog {
     font-size: 0.9em;
-    padding-top: 10px;
-
 }
-.keyboard-shortcut-entry.keyboard-shortcut-list-header {
-    padding:0 30px 0 5px;
-    div {
-        color: #666 !important;
-    }
+.keyboard-shortcuts {
+    padding: 10px;
 }
-#keyboard-shortcut-list {
-    position: absolute;
-    top:30px;
-    left:10px;
-    right:10px;
-    bottom:10px;
+.keyboard-shortcuts td  {
+    padding: 7px 5px;
+    margin-bottom: 10px;
+    white-space: pre;
 }
-.keyboard-shortcut-entry {
-    padding: 0px 20px 0 10px;
-    div {
-        display: inline-block;
-    }
+.keyboard-shortcuts td:first-child {
+    text-align: right;
+    padding-right: 10px;
 }
-.keyboard-shortcut-entry-key {
-    width:150px;
-}
-.keyboard-shortcut-entry-scope {
-    float: right;
-    color: #999;
-}
-.keyboard-shortcut-entry-unassigned {
-    color: #999;
-    .keyboard-shortcut-entry-key {
-        font-style: italic;
-    }
-}
-
 .help-key {
     border: 1px solid #ddd;
     padding: 4px;
@@ -60,6 +37,4 @@
     font-family: Courier, monospace;
     box-shadow: #999 1px 1px 1px;
 }
-.help-key-block {
-    white-space: nowrap;
-}
+

editor/sass/library.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/mixins.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@
     margin:0;
     text-decoration: none;
     cursor:pointer;
+    padding: 0;
 
     &.disabled {
         cursor: default;
@@ -108,51 +109,7 @@
         color: $workspace-button-toggle-color-disabled !important;
     }
 }
-@mixin editor-button {
-    @include workspace-button;
-    font-size: 14px;
-    padding: 6px 14px;
-    margin-right: 8px;
-    color: $editor-button-color !important;
-    background: $editor-button-background;
 
-    &.primary {
-        border-color: $editor-button-background-primary;
-        color: $editor-button-color-primary !important;
-        background: $editor-button-background-primary;
-        &.disabled, &.ui-state-disabled {
-            background: none;
-            color: $editor-button-color !important;
-            border-color: $form-input-border-color;
-        }
-        &:not(.disabled):not(.ui-button-disabled):hover {
-            border-color: $editor-button-background-primary-hover;
-            background: $editor-button-background-primary-hover;
-            color: $editor-button-color-primary !important;
-        }
-    }
-    &:not(.disabled):hover {
-        //color: $editor-button-color;
-    }
-    &.disabled {
-        background: none;
-    }
-    &.disabled:focus {
-        outline: none;
-    }
-
-
-    &.leftButton {
-        float: left;
-        margin-top: 1px;
-    }
-    &:not(.leftButton):not(:last-child) {
-        margin-right: 16px;
-    }
-    &.ui-state-disabled {
-        opacity: 1;
-    }
-}
 
 @mixin component-footer {
     border-top: 1px solid $primary-border-color;

editor/sass/notifications.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/palette-editor.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/palette.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/popover.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/search.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,31 +60,12 @@
     .red-ui-search-result {
         padding: 2px 2px 2px 5px;
         font-size: 13px;
-        border-left-width: 3px;
-        border-right-width: 3px;
-    }
-    .red-ui-search-result-separator {
-        border-bottom: 3px solid #ddd;
+        border-left-width: 2px;
+        border-right-width: 2px;
     }
     .red-ui-search-result-node {
-        position: relative;
         width: 18px;
         height: 15px;
-        margin-top: 1px;
-    }
-    .red-ui-search-result-node-port {
-        position: absolute;
-        border-radius: 2px;
-        border: 1px solid #999;
-        width: 6px;
-        height: 7px;
-        top:4px;
-        left:-4px;
-        background: #eee;
-        box-sizing: border-box;
-    }
-    .red-ui-search-result-node-output{
-        left: 16px;
     }
     .palette_icon_container {
         width: 18px;

editor/sass/sidebar.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,12 +89,14 @@
     font-size: 13px;
     line-height: 13px;
     padding: 5px 8px;
+    min-width: 30px;
 }
 .sidebar-header-button-toggle {
     @include workspace-button-toggle;
     font-size: 13px;
     line-height: 13px;
     padding: 5px 8px;
+    min-width: 30px;
 }
 .sidebar-header-button:not(:first-child) {
     border-left: none;

editor/sass/style.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 
 @import "jquery";
 @import "bootstrap";
-@import "ace";
 
 @import "dropdownMenu";
 

editor/sass/tab-config.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/tab-info.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,18 +81,3 @@ div.node-info {
         margin: 8px auto;
     }
 }
-.node-info-tip {
-    position: absolute;
-    top: 40%;
-    left:0;
-    right:0;
-    padding: 20px;
-    font-size: 16px;
-    text-align: center;
-    line-height: 1.9em;
-    color : #bbb;
-    background-color: #fff;
-    @include disable-selection;
-    cursor: default;
-
-}

editor/sass/tabs.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/ui/common/editableList.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/ui/common/searchBox.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/ui/common/typedInput.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,9 +69,6 @@
             margin-right:4px;
             margin-top: 1px;
             vertical-align: middle;
-            &.fa-ellipsis-h {
-                top: -1px;
-            }
         }
         &.disabled {
             cursor: default;
@@ -98,19 +95,6 @@
             background: $typedInput-button-background-active;
             text-decoration: none;
         }
-        &.red-ui-typedInput-full-width {
-            width: 100%;
-            border-top-right-radius: 4px;
-            border-bottom-right-radius: 4px;
-        }
-    }
-
-    button.red-ui-typedInput-option-expand {
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        right: 0;
     }
 
     button.red-ui-typedInput-option-trigger {

editor/sass/widgetStyle.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/sass/workspace.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,10 +51,3 @@
 #workspace-footer {
     @include component-footer;
 }
-
-#workspace-tabs:not(.workspace-focussed) {
-    opacity:0.8;
-    li.red-ui-tab.active a {
-        color:#666;
-    }
-}

editor/sass/workspaceToolbar.scss

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

editor/templates/index.mst

@@ -6,7 +6,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2013, 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -87,28 +87,19 @@
 
 <div id="node-dialog-confirm-deploy" class="hide">
     <form class="form-horizontal">
-        <div id="node-dialog-confirm-deploy-config" class="node-dialog-confirm-row" data-i18n="[prepend]deploy.confirm.improperlyConfigured;[append]deploy.confirm.confirm">
-            <ul id="node-dialog-confirm-deploy-invalid-list"></ul>
+        <div id="node-dialog-confirm-deploy-config" style="text-align: left; padding-top: 30px;" data-i18n="[prepend]deploy.confirm.improperlyConfigured;[append]deploy.confirm.confirm">
+            <ul style="font-size: 0.9em; width: 400px; margin: 10px auto; text-align: left;" id="node-dialog-confirm-deploy-invalid-list"></ul>
         </div>
-        <div id="node-dialog-confirm-deploy-unknown" class="node-dialog-confirm-row" data-i18n="[prepend]deploy.confirm.unknown;[append]deploy.confirm.confirm">
-            <ul id="node-dialog-confirm-deploy-unknown-list"></ul>
+        <div id="node-dialog-confirm-deploy-unknown" style="text-align: left; padding-top: 10px;" data-i18n="[prepend]deploy.confirm.unknown;[append]deploy.confirm.confirm">
+            <ul style="font-size: 0.9em; width: 400px; margin: 10px auto; text-align: left;" id="node-dialog-confirm-deploy-unknown-list"></ul>
         </div>
-        <div id="node-dialog-confirm-deploy-conflict" class="node-dialog-confirm-row">
-            <div style="margin-left: 40px; margin-bottom: 10px;">
-                <span data-i18n="deploy.confirm.conflict"></span>
-            </div>
-            <div id="node-dialog-confirm-deploy-conflict-checking" class="node-dialog-confirm-conflict-row">
-                <img src="red/images/spin.svg"/><div data-i18n="deploy.confirm.conflictChecking"></div>
-            </div>
-            <div id="node-dialog-confirm-deploy-conflict-auto-merge" class="node-dialog-confirm-conflict-row">
-                <i style="color: #3a3;" class="fa fa-check"></i><div data-i18n="deploy.confirm.conflictAutoMerge"></div>
-            </div>
-            <div id="node-dialog-confirm-deploy-conflict-manual-merge" class="node-dialog-confirm-conflict-row">
-                <i style="color: #999;" class="fa fa-exclamation"></i><div data-i18n="deploy.confirm.conflictManualMerge"></div>
-            </div>
+        <div id="node-dialog-confirm-deploy-conflict" style="text-align: left; padding-top: 10px;" data-i18n="[prepend]deploy.confirm.conflict;[append]deploy.confirm.confirm">
         </div>
     </form>
 </div>
+<div id="node-dialog-view-diff" class="hide">
+    <ol id="node-dialog-view-diff-diff"></ol>
+</div>
 
 <div id="node-dialog-library-save-confirm" class="hide">
     <form class="form-horizontal">
@@ -168,21 +159,7 @@
     <div class="form-row form-tips" id="subflow-dialog-user-count"></div>
 </script>
 
-<script type="text/x-red" data-template-name="_expression">
-    <div class="form-row node-text-editor-row">
-        <div style="height: 200px;min-height: 150px;" class="node-text-editor" id="node-input-expression"></div>
-    </div>
-    <div class="form-row">
-        <label for="node-input-expression-func" data-i18n="expressionEditor.functions"></label>
-        <select id="node-input-expression-func"></select>
-        <button id="node-input-expression-func-insert" class="editor-button" data-i18n="expressionEditor.insert"></button>
-        <div style="min-height: 200px;" id="node-input-expression-help"></div>
-    </div>
-</script>
-
-
 <script src="vendor/vendor.js"></script>
-<script src="vendor/jsonata/jsonata.min.js"></script>
 <script src="vendor/ace/ace.js"></script>
 <script src="vendor/ace/ext-language_tools.js"></script>
 <script src="{{ asset.red }}"></script>

editor/vendor/jsonata/formatter.js

@@ -1,147 +0,0 @@
-(function() {
-    function indentLine(str,length) {
-        if (length <= 0) {
-            return str;
-        }
-        var i = (new Array(length)).join(" ");
-        str = str.replace(/^\s*/,i);
-        return str;
-    }
-    function formatExpression(str) {
-        var length = str.length;
-        var start = 0;
-        var inString = false;
-        var inBox = false;
-        var quoteChar;
-        var list = [];
-        var stack = [];
-        var frame;
-        var v;
-        var matchingBrackets = {
-            "(":")",
-            "[":"]",
-            "{":"}"
-        }
-        for (var i=0;i<length;i++) {
-            var c = str[i];
-            if (!inString) {
-                if (c === "'" || c === '"') {
-                    inString = true;
-                    quoteChar = c;
-                    frame = {type:"string",pos:i};
-                    list.push(frame);
-                    stack.push(frame);
-                } else if (c === ";") {
-                    frame = {type:";",pos:i};
-                    list.push(frame);
-                } else if (c === ",") {
-                    frame = {type:",",pos:i};
-                    list.push(frame);
-                } else if (/[\(\[\{]/.test(c)) {
-                    frame = {type:"open-block",char:c,pos:i};
-                    list.push(frame);
-                    stack.push(frame);
-                } else if (/[\}\)\]]/.test(c)) {
-                    var oldFrame = stack.pop();
-                    if (matchingBrackets[oldFrame.char] !== c) {
-                        //console.log("Stack frame mismatch",c,"at",i,"expected",matchingBrackets[oldFrame.char],"from",oldFrame.pos);
-                        return str;
-                    }
-                    //console.log("Closing",c,"at",i,"compare",oldFrame.type,oldFrame.pos);
-                    oldFrame.width = i-oldFrame.pos;
-                    frame = {type:"close-block",pos:i,char:c,width:oldFrame.width}
-                    list.push(frame);
-                }
-            } else {
-                if (c === quoteChar) {
-                    // Next char must be a ]
-                    inString = false;
-                    stack.pop();
-                }
-            }
-
-        }
-        // console.log(stack);
-        var result = str;
-        var indent = 0;
-        var offset = 0;
-        var pre,post,indented;
-        var longStack = [];
-        list.forEach(function(f) {
-            if (f.type === ";" || f.type === ",") {
-                if (longStack[longStack.length-1]) {
-                    pre = result.substring(0,offset+f.pos+1);
-                    post = result.substring(offset+f.pos+1);
-                    indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
-                    offset += indented.length-post.length+1;
-                }
-            } else if (f.type === "open-block") {
-                if (f.width > 30) {
-                    longStack.push(true);
-                    indent += 4;
-                    pre = result.substring(0,offset+f.pos+1);
-                    post = result.substring(offset+f.pos+1);
-                    indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
-                    offset += indented.length-post.length+1;
-                } else {
-                    longStack.push(false);
-                }
-            } else if (f.type === "close-block") {
-                if (f.width > 30) {
-                    indent -= 4;
-                    pre = result.substring(0,offset+f.pos);
-                    post = result.substring(offset+f.pos);
-                    indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
-                    offset += indented.length-post.length+1;
-                }
-                longStack.pop();
-            }
-        })
-        //console.log(result);
-        return result;
-    }
-
-    jsonata.format = formatExpression;
-    jsonata.functions =
-    {
-        '$append':{ args:['array','array'] },
-        '$average':{ args:['value'] },
-        '$boolean':{ args:['value'] },
-        '$count':{ args:['array'] },
-        '$exists':{ args:['value'] },
-        '$join':{ args:['array','separator'] },
-        '$keys':{ args:['object'] },
-        '$length':{ args:['string'] },
-        '$lookup':{ args:['object','key'] },
-        '$lowercase':{ args:['string'] },
-        '$map':{ args:[] },
-        '$max':{ args:['array'] },
-        '$min':{ args:['array'] },
-        '$not':{ args:['value'] },
-        '$number':{ args:['value'] },
-        '$reduce':{ args:[] },
-        '$split':{ args:['string','separator','limit'] },
-        '$spread':{ args:['object'] },
-        '$string':{ args:['value'] },
-        '$substring':{ args:['string','start','length'] },
-        '$substringAfter':{ args:['string','chars'] },
-        '$substringBefore':{ args:['string','chars'] },
-        '$sum':{ args:['array'] },
-        '$uppercase':{ args:['string'] }
-    }
-    jsonata.getFunctionSnippet = function(fn) {
-        var snippetText = "";
-        if (jsonata.functions.hasOwnProperty(fn)) {
-            var def = jsonata.functions[fn];
-            snippetText = "\\"+fn+"(";
-            if (def.args) {
-                snippetText += def.args.map(function(a,i) { return "${"+(i+1)+":"+a+"}"}).join(", ");
-            }
-            snippetText += ")\n"
-        }
-        return snippetText;
-    }
-})();

editor/vendor/jsonata/mode-jsonata.js

@@ -1,134 +0,0 @@
-define("ace/mode/jsonata",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules","ace/worker/worker_client","ace/mode/text"], function(require, exports, module) {
-
-    "use strict";
-
-    var oop = require("../lib/oop");
-    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-    var WorkerClient = require("../worker/worker_client").WorkerClient;
-    var jsonataFunctions = Object.keys(jsonata.functions);
-    // sort in length order (long->short) otherwise substringAfter gets matched
-    // as substring etc.
-    jsonataFunctions.sort(function(A,B) {
-        return B.length-A.length;
-    });
-    jsonataFunctions = jsonataFunctions.join("|").replace(/\$/g,"\\$");
-
-    var JSONataHighlightRules = function() {
-
-        var keywordMapper = this.createKeywordMapper({
-            "keyword.operator":
-                "and|or|in",
-            "constant.language":
-                "null|Infinity|NaN|undefined",
-            "constant.language.boolean":
-                "true|false",
-            "storage.type":
-                "function"
-        }, "identifier");
-        this.$rules = {
-            "start" : [
-                {
-                    token : "string",
-                    regex : "'(?=.)",
-                    next  : "qstring"
-                },
-                {
-                    token : "string",
-                    regex : '"(?=.)',
-                    next  : "qqstring"
-                },
-                {
-                    token : "constant.numeric", // hex
-                    regex : /0(?:[xX][0-9a-fA-F]+|[bB][01]+)\b/
-                },
-                {
-                    token : "constant.numeric", // float
-                    regex : /[+-]?\d[\d_]*(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-                },
-                {   token: "keyword",
-                    regex: /λ/
-                },
-                {
-                    token: "keyword",
-                    regex: jsonataFunctions
-                },
-                {
-                    token : keywordMapper,
-                    regex : "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*"
-                },
-                {
-                    token : "punctuation.operator",
-                    regex : /[.](?![.])/
-                },
-                {
-                    token : "keyword.operator",
-                    regex : /\|\||<=|>=|\.\.|\*\*|!=|:=|[=<>`!$%&*+\-~\/^]/,
-                    next  : "start"
-                },
-                {
-                    token : "punctuation.operator",
-                    regex : /[?:,;.]/,
-                    next  : "start"
-                },
-                {
-                    token : "paren.lparen",
-                    regex : /[\[({]/,
-                    next  : "start"
-                },
-                {
-                    token : "paren.rparen",
-                    regex : /[\])}]/
-                }
-            ],
-            "qqstring" : [
-                {
-                    token : "string",
-                    regex : '"|$',
-                    next  : "start"
-                }, {
-                    defaultToken: "string"
-                }
-            ],
-            "qstring" : [
-                {
-                    token : "string",
-                    regex : "'|$",
-                    next  : "start"
-                }, {
-                    defaultToken: "string"
-                }
-            ]
-        };
-    };
-
-    oop.inherits(JSONataHighlightRules, TextHighlightRules);
-
-    var TextMode = require("./text").Mode;
-    var Mode = function() {
-        this.HighlightRules = JSONataHighlightRules;
-    };
-    oop.inherits(Mode, TextMode);
-
-
-    (function() {
-        this.createWorker = function(session) {
-            var worker = new WorkerClient(["ace"], "ace/mode/jsonata_worker", "JSONataWorker");
-            worker.attachToDocument(session.getDocument());
-
-            worker.on("annotate", function(e) {
-                session.setAnnotations(e.data);
-            });
-
-            worker.on("terminate", function() {
-                session.clearAnnotations();
-            });
-
-            return worker;
-        };
-        this.$id = "ace/mode/jsonata";
-    }).call(Mode.prototype);
-
-    exports.Mode = Mode;
-
-});

editor/vendor/jsonata/snippets-jsonata.js

@@ -1,11 +0,0 @@
-define("ace/snippets/jsonata",["require","exports","module"], function(require, exports, module) {
-"use strict";
-var snippetText = "";
-for (var fn in jsonata.functions) {
-	if (jsonata.functions.hasOwnProperty(fn)) {
-		snippetText += "# "+fn+"\nsnippet "+fn+"\n\t"+jsonata.getFunctionSnippet(fn)+"\n"
-	}
-}
-exports.snippetText = snippetText;
-exports.scope = "jsonata";
-});

nodes/99-sample.html.demo

@@ -1,5 +1,5 @@
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2014 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

nodes/99-sample.js.demo

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

nodes/core/analysis/72-sentiment.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2013 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

nodes/core/analysis/72-sentiment.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

nodes/core/core/20-inject.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2013, 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -175,7 +175,22 @@
         defaults: {
             name: {value:""},
             topic: {value:""},
-            payload: {value:"", validate: RED.validators.typedInput("payloadType")},
+            payload: {value:"", validate:function(v) {
+                var ptype = $("#node-input-payloadType").val() || this.payloadType;
+                if (ptype === 'json') {
+                    try {
+                        JSON.parse(v);
+                        return true;
+                    } catch(err) {
+                        return false;
+                    }
+                } else if (ptype === 'flow' || ptype === 'global' ) {
+                    return /^[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z_][a-zA-Z0-9_]+)*/i.test(v);
+                } else if (ptype === 'num') {
+                    return /^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v);
+                }
+                return true;
+            }},
             payloadType: {value:"date"},
             repeat: {value:""},
             crontab: {value:""},
@@ -186,11 +201,6 @@
         icon: "inject.png",
         label: function() {
             var suffix = "";
-            // if fire once then add small indication
-            if (this.once) {
-                suffix = " ¹";
-            }
-            // but replace with repeat one if set to repeat
             if (this.repeat || this.crontab) {
                 suffix = " ↻";
             }

nodes/core/core/20-inject.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,21 +67,20 @@ module.exports = function(RED) {
                 this.error(err,msg);
             }
         });
+        this.on('close', function() {
+            if (node.interval_id != null) {
+                clearInterval(node.interval_id);
+                if (RED.settings.verbose) { node.log(RED._("inject.stopped")); }
+            } else if (node.cronjob != null) {
+                node.cronjob.stop();
+                if (RED.settings.verbose) { node.log(RED._("inject.stopped")); }
+                delete node.cronjob;
+            }
+        });
     }
 
     RED.nodes.registerType("inject",InjectNode);
 
-    InjectNode.prototype.close = function() {
-        if (this.interval_id != null) {
-            clearInterval(this.interval_id);
-            if (RED.settings.verbose) { this.log(RED._("inject.stopped")); }
-        } else if (this.cronjob != null) {
-            this.cronjob.stop();
-            if (RED.settings.verbose) { this.log(RED._("inject.stopped")); }
-            delete this.cronjob;
-        }
-    }
-
     RED.httpAdmin.post("/inject/:id", RED.auth.needsPermission("inject.write"), function(req,res) {
         var node = RED.nodes.getNode(req.params.id);
         if (node != null) {

nodes/core/core/25-catch.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2015, 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

nodes/core/core/25-catch.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

nodes/core/core/25-status.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2015, 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

nodes/core/core/25-status.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

nodes/core/core/58-debug.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2013, 2015 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
     <p>The button to the right of the node will toggle its output on and off so you can de-clutter the debug window.</p>
     <p>If the payload is an object or buffer it will be stringified first for display and indicate that by saying "(Object)" or "(Buffer)".</p>
     <p>Selecting any particular message will highlight (in red) the debug node that reported it. This is useful if you wire up multiple debug nodes.</p>
-    <p>Optionally can show the complete <code>msg</code> object, and send messages to the console log (⇶).</p>
+    <p>Optionally can show the complete <code>msg</code> object, and send messages to the console log.</p>
     <p>In addition any calls to node.warn or node.error will appear here.</p>
 </script>
 <script src="debug/view/debug-utils.js"></script>
@@ -58,12 +58,10 @@
             complete: {value:"false", required:true}
         },
         label: function() {
-            var suffix = "";
-            if (this.console === true || this.console === "true") { suffix = " ⇲"; }
             if (this.complete === true || this.complete === "true") {
-                return (this.name||"msg") + suffix;
+                return this.name||"msg";
             } else {
-                return (this.name || "msg." + ((!this.complete || this.complete === "false") ? "payload" : this.complete)) + suffix;
+                return this.name || "msg." + ((!this.complete || this.complete === "false") ? "payload" : this.complete);
             }
         },
         labelStyle: function() {
@@ -146,7 +144,8 @@
                 toolbar: uiComponents.footer,
                 enableOnEdit: true
             });
-            RED.actions.add("core:show-debug-tab",function() { RED.sidebar.show('debug')});
+
+
 
             var that = this;
             RED._debug = function(msg) {
@@ -185,10 +184,9 @@
             RED.comms.subscribe("debug",this.handleDebugMessage);
 
             RED.events.on("workspace:change", this.refreshMessageList);
-
             $("#debug-tab-open").click(function(e) {
                 e.preventDefault();
-                subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
+                subWindow = window.open(document.location.toString().replace(/#.*$/,"")+"debug/view/view.html","nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
                 subWindow.onload = function() {
                     subWindow.postMessage({event:"workspaceChange",activeWorkspace:RED.workspaces.active()},"*");
                 }
@@ -223,8 +221,6 @@
             RED.sidebar.removeTab("debug");
             RED.events.off("workspace:change", this.refreshMessageList);
             window.removeEventListener("message",this.handleWindowMessage);
-            RED.actions.remove("core:show-debug");
-
             delete RED._debug;
         },
         oneditprepare: function() {

nodes/core/core/58-debug.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,9 @@ module.exports = function(RED) {
     var util = require("util");
     var events = require("events");
     var path = require("path");
-    var safeJSONStringify = require("json-stringify-safe");
     var debuglength = RED.settings.debugMaxLength||1000;
-    var useColors = RED.settings.debugUseColors || false;
-    util.inspect.styles.boolean = "red";
+    var useColors = false;
+    // util.inspect.styles.boolean = "red";
 
     function DebugNode(n) {
         RED.nodes.createNode(this,n);
@@ -79,16 +78,7 @@ module.exports = function(RED) {
     function sendDebug(msg) {
         if (msg.msg instanceof Error) {
             msg.format = "error";
-            var errorMsg = {};
-            if (msg.msg.name) {
-                errorMsg.name = msg.msg.name;
-            }
-            if (msg.msg.hasOwnProperty('message')) {
-                errorMsg.message = msg.msg.message;
-            } else {
-                errorMsg.message = msg.msg.toString();
-            }
-            msg.msg = JSON.stringify(errorMsg);
+            msg.msg = msg.msg.toString();
         } else if (msg.msg instanceof Buffer) {
             msg.format = "buffer["+msg.msg.length+"]";
             msg.msg = msg.msg.toString('hex');
@@ -97,7 +87,6 @@ module.exports = function(RED) {
             }
         } else if (msg.msg && typeof msg.msg === 'object') {
             var seen = [];
-            var seenAts = [];
             try {
                 msg.format = msg.msg.constructor.name || "Object";
             } catch(err) {
@@ -117,7 +106,10 @@ module.exports = function(RED) {
                     }
                 }
                 if (isArray || (msg.format === "Object")) {
-                    msg.msg = safeJSONStringify(msg.msg, function(key, value) {
+                    msg.msg = JSON.stringify(msg.msg, function(key, value) {
+                        if (key[0] === '_' && key !== "_msgid") {
+                            return undefined;
+                        }
                         if (key === '_req' || key === '_res') {
                             return "[internal]"
                         }
@@ -126,12 +118,15 @@ module.exports = function(RED) {
                         }
                         if (util.isArray(value) && value.length > debuglength) {
                             value = {
-                                __encoded__: true,
                                 type: "array",
                                 data: value.slice(0,debuglength),
                                 length: value.length
                             }
                         }
+                        if (typeof value === 'object' && value !== null) {
+                            if (seen.indexOf(value) !== -1) { return "[circular]"; }
+                            seen.push(value);
+                        }
                         if (typeof value === 'string') {
                             if (value.length > debuglength) {
                                 return value.substring(0,debuglength)+"...";
@@ -195,9 +190,7 @@ module.exports = function(RED) {
         }
     });
 
-    // As debug/view/debug-utils.js is loaded via <script> tag, it won't get
-    // the auth header attached. So do not use RED.auth.needsPermission here.
-    RED.httpAdmin.get("/debug/view/*",function(req,res) {
+    RED.httpAdmin.get("/debug/view/*",RED.auth.needsPermission("debug.read"),function(req,res) {
         var options = {
             root: __dirname + '/lib/debug/',
             dotfiles: 'deny'

nodes/core/core/60-link.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.