Adding bidi preferences (#1375)

.github/ISSUE_TEMPLATE.md

@@ -1,34 +0,0 @@
-<!--
-## Before you hit that Submit button....
-
-This issue tracker is for problems with the Node-RED runtime, the editor or the core nodes.
-
-If your issue is:
-  - a general 'how-to' type question,
-  - a feature request or suggestion for a change,
-  - or problems with 3rd party (`node-red-contrib-`) nodes
-
-please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
-
-You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`.
-
-That way the whole Node-RED user community can help, rather than rely on the core development team.
-
-## So you have a real issue to raise...
-
-To help us understand the issue, please fill-in as much of the following information as you can:
--->
-
-### What are the steps to reproduce?
-
-### What happens?
-
-### What do you expect to happen?
-
-### Please tell us about your environment:
-
-- [ ] Node-RED version:
-- [ ] node.js version:
-- [ ] npm version:
-- [ ] Platform/OS:
-- [ ] Browser:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,34 +0,0 @@
-<!--
-## Before you hit that Submit button....
-
-Please read our [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
-before submitting a pull-request.
-
-## Types of changes
-
-What types of changes does your code introduce?
-Put an `x` in the boxes that apply
--->
-
-- [ ] Bugfix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-
-<!--
-If you want to raise a pull-request with a new feature, or a refactoring
-of existing code, it **may well get rejected** if it hasn't been discussed on
-the [forum](https://discourse.nodered.org) or
-[slack team](https://nodered.org/slack) first.
-
--->
-
-## Proposed changes
-
-<!-- Describe the nature of this change. What problem does it address? -->
-
-## Checklist
-<!-- Put an `x` in the boxes that apply -->
-
-- [ ] I have read the [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
-- [ ] For non-bugfix PRs, I have discussed this change on the mailing list/slack team.
-- [ ] I have run `grunt` to verify the unit tests pass
-- [ ] I have added suitable unit tests to cover the new/changed functionality

.travis.yml

@@ -1,12 +1,21 @@
 sudo: false
 language: node_js
-matrix:
-  include:
-    - node_js: "10"
-      script:
-        - ./node_modules/.bin/grunt && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
-      before_script:
-        - npm install -g istanbul coveralls
-    - node_js: "8"
-    - node_js: "6"
-    - node_js: "4"
+env:
+  - CXX="g++-4.8"
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
+    - gcc-4.8
+node_js:
+  - "8"
+  - "7"
+  - "6"
+  - "4"
+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:
+  - npm install -g istanbul
+  - npm install coveralls

CHANGELOG.md

@@ -1,325 +1,3 @@
-#### 0.19: Milestone Release
-
-Editor
-
- - Add editorTheme.palette.theme to allow overriding colours
- - Index all node properties when searching Fixes #1446
- - Handle NaN and Infinity properly in debug sidebar Fixes #1778 #1779
- - Prevent horizontal scroll when palette name cannot wrap
- - Ignore middle-click on node/ports to enable panning
- - Better wire layout when looping back
- - fix appearence of retry button of remote branch management dialog
- - Handle releasing ctrl when using quick-add node dialog
- - Add $env function to JSONata expressions
- - Widen support for env var to use ${} or $() syntax
- - Add env-var support to TypedInput
- - Show unknown node properties in info tab
- - Add node icon picker widget
- - Only edit nodes on dbl click on primary button with no modifiers
- - Allow subflows to be put in any palette category
- - Add flow navigator widget
- - Cache flow library result to improve response time Fixes #1753
- - Add middle-button-drag to pan the workspace
- - allow multi-line category name in editor
- - Redesign sidebar tabs
- - Do not disable the export-clipboard menu option with empty selection
-
-Nodes
-
- - Change: Ensure runtime errors in Change node can be caught Fixes #1769
- - File: Add output to File Out node
- - Function: add expandable JavaScript editor pane
- - Function: allow id and name reference in function node code (#1731)
- - HTTP Request: Move to request module
- - HTTP: Ensure apiMaxLength applies to HTTP Nodes Fixes #1278
- - Join: accumulate top level properties
- - Join: allow environment variable as reduce init value
- - JSON: add JSON schema validation via msg.schema
- - Pi: Let nrgpio code work with python 3
- - Pi: let Pi nodes be visible/editable on all platforms
- - Switch: add isEmpty rule
- - TCP: queue messages while connecting; closes #1414
- - TLS: Add servername option to TLS config node for SNI Fixes #1805
- - UDP: Don't accidentally re-use udp port when set to not do so
-
-Persistent Context
-
- - Add Context data sidebar
- - Add persistable context option
- - Add default memory store
- - Add file-based context store
- - Add async mode to evaluateJSONataExpression
- - Update RED.util.evaluateNodeProperty to support context stores
-
-Runtime
-
- - Support flow.disabled and .info in /flow API
- - Node errors should be Strings not Errors Fixes #1781
- - Add detection of connection timeout in git communication Fixes #1770
- - Handle loading empty nodesDir
- - Add 'private' property to userDir generated package.json
- - Add RED.require to allow nodes to access other modules
- - Ensure add/remove modules are run sequentially
-
-#### 0.18.7: Maintenance Release
-
-Editor Fixes
-
- - Do not trim wires if node declares outputs in defaults but misses value Fixes #1737
-
-Node Fixes
-
- - Relax twitter node version ready for major version bump
- - Pass Date into the Function node sandbox to fix instanceof tests
- - let TCP in node report remote ip and port when in single packet mode
- - typo fix in node help (#1735)
-
-Other Fixes
- - Tidy up default grunt task and fixup test break due to reorder Fixes #1738
- - Bump jsonata version
-
-#### 0.18.6: Maintenance Release
-
-Editor Fixes
-
- - Handle a node having wires in the editor on ports it no longer has Fixes #1724
- - Add missing ACE snippet files
- - Fix wireClippedNodes is not defined Fixes #1726
- - Split node html to isolate bad nodes when loading
- - Avoid unnecessary use of .html() where .text() will do
-
- - Add editorTheme.projects.enabled to default settings.js"
-
-#### 0.18.5: Maintenance Release
-
-Projects
-
- - Add clone project to welcome screen
- - Handle cloning a project without package.json
- - Keep remote branch state in sync between editor and runtime
-
-New Features
-
- - Add type checks to switch node options (#1714)
- - add output property select to HTML parse node (#1701)
- - Add Prevent Following Redirect to HTTP Request node (#615) (#1684)
- - Add debug and trace functions to function node (#1654)
- - Enable user defined icon for subflow
- - Add MQTT disconnect message and rework broker node UI (#1719)
- - Japanese message catalogue updates (#1723)
- - Show node load errors in the Palette Manager view
-
-Editor Fixes
-
- - Highlight subflow node when log msg comes from inside Fixes #1698
- - Ensure node wires array is not longer than outputs value Fixes #1678
- - Allow importing an unknown config node to be undone Fixes #1681
- - Ensure keyboard shortcuts get saved in runtime settings Fixes #1696
- - Don't mark a subflow changed when actually modified nothing (#1665)
-
-Node Fixes
-
- - bind to correct port when doing udp broadcast/multicast (#1686)
- - Provide full error stack in Function node log message (#1700)
- - Fix http request doc type Fixes #1690
- - Make debug slightly larger to pass WCAG AA rating
- - Make core nodes labels more consistent, to close #1673
- - Allow template node to be updated more than once Fixes #1671
- - Fix the problem that output labels of switch node sometimes disappear (#1664)
- - Chinese translations for core nodes (#1607)
-
-Runtime Fixes
-
- - Handle and display for invalid flow credentials when project is disabled #1689 (#1694)
- - node-red-pi: fix behavior with old bash version (#1713)
- - Fix ENOENT error on first start when no user dir (#1711)
- - Handle null error object in Flow.handleError Fixes #1721
- - update settings comments to describe how to setup for ipv6 (#1675)
- - Remove credential props after diffing flow to prevent future false positives Fixes #1359
- - Log error if settings unavailable when saving user settings Fixes #1645
- - Keep backup of .config.json
- - Add warning if using \_credentialSecret from .config.json
- - Filter req.user in /settings to prevent potentially leaking info
-
-#### 0.18.4: Maintenance Release
-
-Projects
-
- - Ensure sshkey file path is properly escaped on Windows
- - Normalize ssh key paths for Windows file names
- - Ensure userDir is an absolute path when used with sshkeygen
- - Detect if there are no existing flows to migrate into a project
- - Use relative urls when retriving flow history
- - Add credentialSecret to clone pane
- - Delay clearing inflight when changing credentials key
- - Mark deploy inflight when reverting a file change
- - Handle missing_flow_file error on clone properly
- - Remote project from cached list on delete so it can be reused
- - Fix tests for existing file flag in settings
-
-Editor Fixes
-
- - Fix merging a remote diff
- - Fixed the problems when using a node without defaults
- - Disable user defined icon for subflow
- - getDefaultNodeIcon should handle subflow instance nodes Fixes #1635
- - Add Japanese info text for core nodes
- - Fix message lookup for core nodes in case of i18 locales directory exists
- - Prevent the last tab from being deleted
-
-Node Fixes
-
- - Ensure trigger gets reset when 2nd output is null
-
-
-#### 0.18.3: Maintenance Release
-
-Projects
-
- - Fix permissions on git/ssh scripts
- - Add support for GIT_SSH on older levels of git
- - Handle host key verification as auth error
- - Ensure commit list has a refs object even if empty
- - Make git error detection case-insensitive
- - Fix up merge conflict handling
- - Use flow-diff when looking at flow file changes
-
-Node Fixes
-
- - Ensure debug tools show for 'complete msg object'
- - Fix msg.parts handling in concat mode of Batch node
-
-Editor Fixes
-
- - Fix offset calculation when dragging node from palette
- - Allow a library entry to use non-default node-input- prefixes
- - Change remote-diff shortcut and add it to keymap Fixes #1628
-
-#### 0.18.2: Maintenance Release
-
-Projects
-
- - Filter out %D from git log command for older git versions
- - Ensure projects are created as logged in user
- - Better error handling/reporting in project creation
- - Add Project Settings menu option
- - Refresh vc sidebar on remote add/remove
- - Fix auth prompt for ssh repos
- - Prevent http git urls from including username/pword
- - Fix fetch auth handling on non-default remote
- - Avoid exception if git not installed
- - Check version of git client on startup
- - Fix pull/push when no tracked branch
- - Add git_pull_unrelated_history handling
- - Handle delete of last remote in project settings
-
-Node Fixes
-
- - Fix and Add some Chinese translations
- - Update sort/batch docs
- - Don't assume node has defaults when exporting icon property
- - Ensure send is last thing trigger does
- - Ensure trigger doesn't set two simultaneous timeouts
- - Add missing property select var to HTML node
- - Add a default keepalive to tcp client mode
- - Move node.send in exec and httprequest nodes
-
-
-#### 0.18.1: Maintenance Release
-
-Projects
-
- - Handle more repo clone error cases
- - Relax validation of git urls
- - Revalidate project name on return to project-details view
- - Avoid unnecessary project refresh on branch-switch Fixes #1597
- - Add support for file:// git urls
- - Handle project first-run without existing flow file
- - Handle delete of last remote in project settings
- - Add git_pull_unrelated_history handling
- - Fix pull/push when no tracked branch
- - Remember to disable projects in editor when git not found
-
-Node Fixes
-
- - Trigger node migration - ensure bytopic not blank
- - Add HEAD to list of methods with no body in http req node #1598
- - Do not include payload in GET requests Fixes #1598
- - Update sort/batch docs Fixes #1601
- - Don't assume node has defaults when exporting icon property
-
-
-#### 0.18: Milestone Release
-
-Runtime
-
- - Beta: Projects - must be enabled in settings file
- - Allow port zero for Express (#1363)
- - Better error reporting when module provides duplicate type
- - Update jsonata to 1.5.0
- - add express-session memorystore without leaks (#1435)
- - Allow adminAuth.user to be a Function Fixes #1461
- - Ensure RED.server is set even if admin api disabled
- - Ensure strategy login button uses relative URL Fixes #1481
- - ignore `_msgid` when merging full objects
- - Move node install to spawn to allow for big stdout Fixes #1488
- - SIGINT handler should wait for stop to complete before exit
-
-Editor
-
- - allow a node's icon to be set dynamically (#1490)
- - Batch messages sent over comms to increase throughput
- - Migrate deploy confirmations to notifications
- - `oneditdelete` should be available to all node types Closes #1346
- - Sort typeSearch results based on position of match
- - Update ACE to test and add python highlighter (#1373)
- - Clear mouse state when typeSearch cancelled Fixes #1517
- - Handle scoped modules via palette editor
- - TypedInput: handle user defined value/labels options Fixes #1549
-
-Nodes
-
- - add msg. select to range and yaml nodes
- - add property choice to xml, sentiment nodes
- - mqtt: Add 'name' to mqtt-broker node, and label it by this if it is set. (#1364)
- - Add option to JSON node to ensure particular encoding
- - add parts support for HTML node (#1495)
- - Add passphrase to TLS node
- - Add rc property to exec node outputs 1 and 2 (#1401)
- - Add skip first n lines capability to csv node (#1535)
- - Add support for rejectUnauthorized msg property
- - Add TLS options to WebSocket client
- - Added parsed YAML support for template node (#1443)
- - Allow delay node in rate-limit mode to be reset Fixes #1360
- - Allow setTimeout in Function node to be promisified in node 8
- - Debug to status option (#1499)
- - enable template config via msg.template for stored or generated templates (#1503)
- - HTTP REQUEST: Adding PROPPATCH and PROPFIND http methods (#1531)
- - Initial support of merge & reduce mode for JOIN node (#1546)
- - Initial support of new BATCH node (#1548)
- - Initial support of sequence rules for SWITCH node (#1545)
- - initial support of SORT node (#1500)
- - Inject node - let once delay be editable (#1541)
- - Introduce `nodeMaxMessageBufferLength` setting for msg sequence nodes
- - Let CSV correct parts if we remove header row.
- - let default apply if msg.delay not set in override mode. (#1397)
- - let trigger node be reset by boolean message (#1554)
- - Let trigger node support per topic mode (#1398)
- - let HTML node return empty array for no matching input (#1582)
- - MQTT node - if Server/URL config contains '//' use it as a complete url; enabled ws:// and wss://
- - clone messages before delayed send (#1474)
- - Decrement connected client count rather than show disconnected
- - Don't end mqtt client on first error Fixes #1566
- - File out - create dirs synchronously to ensure they exist Fixes #1489
- - Fix debug message format for Buffer (#1444)
- - Fix global.keys() bug in function node (#1417)
- - Handle escape characters in template node which uses Mustache format and JSON output mode (#1377)
- - Move all node.send to end of timer functions in trigger node (issue #1527) (#1539)
- - Publish null/undefined to mqtt as blank not toString Fixes #1521
- - remove inject node at specific time spinner
- - restrict inject interval to less that 2^31 millisecs
- - tag UDP ports in use properly so they get closed correctly (#1508)
-
 #### 0.17.5: Maintenance Release
 
  - Add express-session missing dependency for oauth
@@ -1211,7 +889,7 @@ Fixes
 #### 0.10.10: Maintenance Release
 
  - Fix permissions issue with packaged nrgpio script
- - Add better help message if deprecated node missing
+- Add better help message if deprecated node missing
 
 
 
@@ -1223,16 +901,16 @@ Fix packaging of bin scripts
 
 #### 0.10.8: Maintenance Release
 
- - Nodes moved out of core
- - still included as a dependency: twitter, serial, email, feedparser
+- Nodes moved out of core
+  - still included as a dependency: twitter, serial, email, feedparser
  - no longer included: mongo, arduino, irc, redis
- - node icon defn can be a function
- - http_proxy support
- - httpNodeMiddleware setting
- - Trigger node ui refresh
- - editorTheme setting
- - Warn on deploy of unused config nodes
- - catch node prevents error loops
+- node icon defn can be a function
+- http_proxy support
+- httpNodeMiddleware setting
+- Trigger node ui refresh
+- editorTheme setting
+- Warn on deploy of unused config nodes
+- catch node prevents error loops
 
 
 
@@ -1255,14 +933,14 @@ Changes:
 
 Changes:
 
- - http request node passes on request url as msg.url
- - handle config nodes appearing out of order in flow file - don't assume they are always at the start
- - move subflow palette category to the top, to make it more obvious
- - fix labelling of Raspberry Pi pins
- - allow email node to mark mail as read
- - fix saving library content
- - add node-red and node-red-pi start scripts
- - use $HOME/.node-red for user data unless specified otherwise (or existing data is found in install dir)
+- http request node passes on request url as msg.url
+- handle config nodes appearing out of order in flow file - don't assume they are always at the start
+- move subflow palette category to the top, to make it more obvious
+- fix labelling of Raspberry Pi pins
+- allow email node to mark mail as read
+- fix saving library content
+- add node-red and node-red-pi start scripts
+- use $HOME/.node-red for user data unless specified otherwise (or existing data is found in install dir)
 
 
 

CONTRIBUTING.md

@@ -9,7 +9,7 @@ We welcome contributions, but request you follow these guidelines.
 
 This project adheres to the [Contributor Covenant 1.4](http://contributor-covenant.org/version/1/4/).
 By participating, you are expected to uphold this code. Please report unacceptable
-behavior to the project's core team at team@nodered.org.
+behavior to any of the [project's core team](https://github.com/orgs/node-red/teams/core).
 
 ## Raising issues
 
@@ -30,13 +30,13 @@ At a minimum, please include:
 
 ## Feature requests
 
-For feature requests, please raise them on the [forum](https://discourse.nodered.org).
+For feature requests, please raise them on the [mailing list](https://groups.google.com/forum/#!forum/node-red).
 
 ## Pull-Requests
 
 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 [forum](https://discourse.nodered.org) first.
+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

Gruntfile.js

@@ -24,10 +24,6 @@ module.exports = function(grunt) {
         nodemonArgs.push(flowFile);
     }
 
-    var nonHeadless = grunt.option('non-headless');
-    if (nonHeadless) {
-        process.env.NODE_RED_NON_HEADLESS = 'true';
-    }
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
         paths: {
@@ -45,23 +41,16 @@ module.exports = function(grunt) {
             core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
-        webdriver: {
-            all: {
-                configFile: 'test/editor/wdio.conf.js'
-            }
-        },
         mocha_istanbul: {
             options: {
                 globals: ['expect'],
                 timeout: 3000,
                 ignoreLeaks: false,
                 ui: 'bdd',
-                reportFormats: ['lcov','html'],
+                reportFormats: ['lcov'],
                 print: 'both'
             },
-            all: { src: ["test/_spec.js","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
-            nodes: { src: ["test/nodes/**/*_spec.js"]}
+            coverage: { src: ['test/**/*_spec.js'] }
         },
         jshint: {
             options: {
@@ -148,15 +137,12 @@ module.exports = function(grunt) {
                     "editor/js/ui/keyboard.js",
                     "editor/js/ui/workspaces.js",
                     "editor/js/ui/view.js",
-                    "editor/js/ui/view-navigator.js",
                     "editor/js/ui/sidebar.js",
                     "editor/js/ui/palette.js",
                     "editor/js/ui/tab-info.js",
                     "editor/js/ui/tab-config.js",
-                    "editor/js/ui/tab-context.js",
                     "editor/js/ui/palette-editor.js",
                     "editor/js/ui/editor.js",
-                    "editor/js/ui/editors/*.js",
                     "editor/js/ui/tray.js",
                     "editor/js/ui/clipboard.js",
                     "editor/js/ui/library.js",
@@ -165,10 +151,6 @@ module.exports = function(grunt) {
                     "editor/js/ui/typeSearch.js",
                     "editor/js/ui/subflow.js",
                     "editor/js/ui/userSettings.js",
-                    "editor/js/ui/projects/projects.js",
-                    "editor/js/ui/projects/projectSettings.js",
-                    "editor/js/ui/projects/projectUserSettings.js",
-                    "editor/js/ui/projects/tab-versionControl.js",
                     "editor/js/ui/touch/radialMenu.js"
                 ],
                 dest: "public/red/red.js"
@@ -399,9 +381,9 @@ module.exports = function(grunt) {
                 mode: '755'
             },
             release: {
+                // Target-specific file/dir lists and/or options go here.
                 src: [
-                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/nodes/core/hardware/nrgpio*'),
-                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/red/runtime/storage/localfilesystem/projects/git/node-red-*sh')
+                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/nodes/core/hardware/nrgpio*')
                 ]
             }
         },
@@ -431,7 +413,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-chmod');
     grunt.loadNpmTasks('grunt-jsonlint');
     grunt.loadNpmTasks('grunt-mocha-istanbul');
-    grunt.loadNpmTasks('grunt-webdriver');
 
     grunt.registerMultiTask('attachCopyright', function() {
         var files = this.data.src;
@@ -481,23 +462,19 @@ module.exports = function(grunt) {
 
     grunt.registerTask('default',
         'Builds editor content then runs code style checks and unit tests on all components',
-        ['build','jshint:editor','mocha_istanbul:all']);
+        ['build','test-core','test-editor','test-nodes']);
 
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',
-        ['build','mocha_istanbul:core']);
+        ['jshint:core','simplemocha:core']);
 
     grunt.registerTask('test-editor',
         'Runs code style check on editor code',
         ['jshint:editor']);
 
-    grunt.registerTask('test-ui',
-        'Builds editor content then runs unit tests on editor ui',
-        ['build','jshint:editor','webdriver:all']);
-
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',
-        ['build','mocha_istanbul:nodes']);
+        ['simplemocha:nodes']);
 
     grunt.registerTask('build',
         'Builds editor content',
@@ -513,5 +490,5 @@ module.exports = function(grunt) {
 
     grunt.registerTask('coverage',
         'Run Istanbul code test coverage task',
-        ['build','mocha_istanbul:all']);
+        ['build','mocha_istanbul']);
 };

README.md

@@ -14,7 +14,7 @@ A visual tool for wiring the Internet of Things.
 Check out http://nodered.org/docs/getting-started/ for full instructions on getting
 started.
 
-1. `sudo npm install -g --unsafe-perm node-red`
+1. `sudo npm install -g node-red`
 2. `node-red`
 3. Open <http://localhost:1880>
 
@@ -22,7 +22,8 @@ started.
 
 More documentation can be found [here](http://nodered.org/docs).
 
-For further help, or general discussion, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
+For further help, or general discussion, please use the
+[mailing list](https://groups.google.com/forum/#!forum/node-red).
 
 ## Developers
 
@@ -55,7 +56,7 @@ Before raising a pull-request, please read our
 
 This project adheres to the [Contributor Covenant 1.4](http://contributor-covenant.org/version/1/4/).
  By participating, you are expected to uphold this code. Please report unacceptable
- behavior to any of the project's core team at team@nodered.org.
+ behavior to any of the [project's core team](https://github.com/orgs/node-red/teams/core).
 
 ## Authors
 

bin/node-red-pi

@@ -31,7 +31,7 @@ done
 # Find the real location of this script
 CURRENT_PATH=`pwd`
 SCRIPT_PATH="${BASH_SOURCE[0]}";
-while [ -h "${SCRIPT_PATH}" ]; do
+while([ -h "${SCRIPT_PATH}" ]); do
     cd "`dirname "${SCRIPT_PATH}"`"
     SCRIPT_PATH="$(readlink "`basename "${SCRIPT_PATH}"`")";
 done

editor/js/comms.js

@@ -64,31 +64,27 @@ RED.comms = (function() {
             }
         }
         ws.onmessage = function(event) {
-            var message = JSON.parse(event.data);
-            for (var m = 0; m < message.length; m++) {
-                var msg = message[m];
-                if (pendingAuth && msg.auth) {
-                    if (msg.auth === "ok") {
-                        pendingAuth = false;
-                        completeConnection();
-                    } else if (msg.auth === "fail") {
-                        // anything else is an error...
-                        active = false;
-                        RED.user.login({updateMenu:true},function() {
-                            connectWS();
-                        })
-                    }
+            var msg = JSON.parse(event.data);
+            if (pendingAuth && msg.auth) {
+                if (msg.auth === "ok") {
+                    pendingAuth = false;
+                    completeConnection();
+                } else if (msg.auth === "fail") {
+                    // anything else is an error...
+                    active = false;
+                    RED.user.login({updateMenu:true},function() {
+                        connectWS();
+                    })
                 }
-                else if (msg.topic) {
-                    for (var t in subscriptions) {
-                        if (subscriptions.hasOwnProperty(t)) {
-                            var re = new RegExp("^"+t.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
-                            if (re.test(msg.topic)) {
-                                var subscribers = subscriptions[t];
-                                if (subscribers) {
-                                    for (var i=0;i<subscribers.length;i++) {
-                                        subscribers[i](msg.topic,msg.data);
-                                    }
+            } else if (msg.topic) {
+                for (var t in subscriptions) {
+                    if (subscriptions.hasOwnProperty(t)) {
+                        var re = new RegExp("^"+t.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
+                        if (re.test(msg.topic)) {
+                            var subscribers = subscriptions[t];
+                            if (subscribers) {
+                                for (var i=0;i<subscribers.length;i++) {
+                                    subscribers[i](msg.topic,msg.data);
                                 }
                             }
                         }

editor/js/history.js

@@ -191,7 +191,7 @@ RED.history = (function() {
             } else if (ev.t == "edit") {
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
-                        if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
+                        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) {
@@ -229,12 +229,10 @@ RED.history = (function() {
                             }
                         });
                     }
-                    RED.editor.validateNode(ev.node);
                     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);
-                        RED.editor.validateNode(n);
                     });
                 } else {
                     var outputMap;
@@ -323,9 +321,6 @@ RED.history = (function() {
         },
         peek: function() {
             return undo_history[undo_history.length-1];
-        },
-        clear: function() {
-            undo_history = [];
         }
     }
 

editor/js/keymap.json

@@ -10,15 +10,10 @@
         "ctrl-g i": "core:show-info-tab",
         "ctrl-g d": "core:show-debug-tab",
         "ctrl-g c": "core:show-config-tab",
-        "ctrl-g x": "core:show-context-tab",
         "ctrl-e": "core:show-export-dialog",
         "ctrl-i": "core:show-import-dialog",
         "ctrl-space": "core:toggle-sidebar",
-        "ctrl-,": "core:show-user-settings",
-        "ctrl-alt-r": "core:show-remote-diff",
-        "ctrl-alt-n": "core:new-project",
-        "ctrl-alt-o": "core:open-project",
-        "ctrl-g v": "core:show-version-control-tab"
+        "ctrl-,": "core:show-user-settings"
     },
     "workspace": {
         "backspace": "core:delete-selection",

editor/js/main.js

@@ -15,25 +15,6 @@
  **/
 (function() {
 
-    function appendNodeConfig(nodeConfig) {
-        var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
-        var moduleId;
-        if (m) {
-            moduleId = m[1];
-        } else {
-            moduleId = "unknown";
-        }
-        try {
-            $("body").append(nodeConfig);
-        } catch(err) {
-            RED.notify(RED._("notification.errors.failedToAppendNode",{module:moduleId, error:err.toString()}),{
-                type: "error",
-                timeout: 10000
-            });
-            console.log("["+moduleId+"] "+err.toString());
-        }
-    }
-
     function loadNodeList() {
         $.ajax({
             headers: {
@@ -43,25 +24,7 @@
             url: 'nodes',
             success: function(data) {
                 RED.nodes.setNodeList(data);
-                RED.i18n.loadNodeCatalogs(function() {
-                    loadIconList(loadNodes);
-                });
-            }
-        });
-    }
-
-    function loadIconList(done) {
-        $.ajax({
-            headers: {
-                "Accept":"application/json"
-            },
-            cache: false,
-            url: 'icons',
-            success: function(data) {
-                RED.nodes.setIconSets(data);
-                if (done) {
-                    done();
-                }
+                RED.i18n.loadNodeCatalogs(loadNodes);
             }
         });
     }
@@ -74,42 +37,17 @@
             cache: false,
             url: 'nodes',
             success: function(data) {
-                var configs = data.trim().split(/(?=<!-- --- \[red-module:\S+\] --- -->)/);
-                configs.forEach(function(data) {
-                    appendNodeConfig(data);
-                });
-
+                $("body").append(data);
                 $("body").i18n();
                 $("#palette > .palette-spinner").hide();
                 $(".palette-scroll").removeClass("hide");
                 $("#palette-search").removeClass("hide");
-                loadFlows(function() {
-                    if (RED.settings.theme("projects.enabled",false)) {
-                        RED.projects.refresh(function(activeProject) {
-                            RED.sidebar.info.refresh()
-                            if (!activeProject) {
-                                // Projects enabled but no active project
-                                RED.menu.setDisabled('menu-item-projects-open',true);
-                                RED.menu.setDisabled('menu-item-projects-settings',true);
-                                if (activeProject === false) {
-                                    // User previously decline the migration to projects.
-                                } else { // null/undefined
-                                    RED.projects.showStartup();
-                                }
-                            }
-                            completeLoad();
-                        });
-                    } else {
-                        // Projects disabled by the user
-                        RED.sidebar.info.refresh()
-                        completeLoad();
-                    }
-                });
+                loadFlows();
             }
         });
     }
 
-    function loadFlows(done) {
+    function loadFlows() {
         $.ajax({
             headers: {
                 "Accept":"application/json",
@@ -117,254 +55,111 @@
             cache: false,
             url: 'flows',
             success: function(nodes) {
-                if (nodes) {
-                    var currentHash = window.location.hash;
-                    RED.nodes.version(nodes.rev);
-                    RED.nodes.import(nodes.flows);
-                    RED.nodes.dirty(false);
-                    RED.view.redraw(true);
-                    if (/^#flow\/.+$/.test(currentHash)) {
-                        RED.workspaces.show(currentHash.substring(6));
-                    }
-                }
-                done();
-            }
-        });
-    }
-
-    function completeLoad() {
-        var persistentNotifications = {};
-        RED.comms.subscribe("notification/#",function(topic,msg) {
-            var parts = topic.split("/");
-            var notificationId = parts[1];
-            if (notificationId === "runtime-deploy") {
-                // handled in ui/deploy.js
-                return;
-            }
-            if (notificationId === "node") {
-                // handled below
-                return;
-            }
-            if (notificationId === "project-update") {
-                RED.nodes.clear();
-                RED.history.clear();
+                var currentHash = window.location.hash;
+                RED.nodes.version(nodes.rev);
+                RED.nodes.import(nodes.flows);
+                RED.nodes.dirty(false);
                 RED.view.redraw(true);
-                RED.projects.refresh(function() {
-                    loadFlows(function() {
-                        var project = RED.projects.getActiveProject();
-                        var message = {
-                            "change-branch": RED._("notification.project.change-branch", {project: project.git.branches.local}),
-                            "merge-abort": RED._("notification.project.merge-abort"),
-                            "loaded": RED._("notification.project.loaded", {project: msg.project}),
-                            "updated": RED._("notification.project.updated", {project: msg.project}),
-                            "pull": RED._("notification.project.pull", {project: msg.project}),
-                            "revert": RED._("notification.project.revert", {project: msg.project}),
-                            "merge-complete": RED._("notification.project.merge-complete")
-                        }[msg.action];
-                        RED.notify("<p>"+message+"</p>");
-                        RED.sidebar.info.refresh()
-                    });
-                });
-                return;
-            }
+                if (/^#flow\/.+$/.test(currentHash)) {
+                    RED.workspaces.show(currentHash.substring(6));
+                }
 
-            if (msg.text) {
-                msg.default = msg.text;
-                var text = RED._(msg.text,msg);
-                var options = {
-                    type: msg.type,
-                    fixed: msg.timeout === undefined,
-                    timeout: msg.timeout,
-                    id: notificationId
-                }
-                if (notificationId === "runtime-state") {
-                    if (msg.error === "missing-types") {
-                        text+="<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                        if (!!RED.projects.getActiveProject()) {
-                            options.buttons = [
-                                {
-                                    text: RED._("notification.label.manage-project-dep"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                        RED.projects.settings.show('deps');
-                                    }
-                                }
-                            ]
-                        // } else if (RED.settings.theme('palette.editable') !== false) {
-                        } else {
-                            options.buttons = [
-                                {
-                                    text: RED._("common.label.close"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                    }
-                                }
-                            ]
-                        }
-                    } else if (msg.error === "credentials_load_failed") {
-                        if (RED.settings.theme("projects.enabled",false)) {
-                            // projects enabled
-                            if (RED.user.hasPermission("projects.write")) {
-                                options.buttons = [
-                                    {
-                                        text: RED._("notification.label.setup-cred"),
-                                        click: function() {
-                                            persistentNotifications[notificationId].hideNotification();
-                                            RED.projects.showCredentialsPrompt();
-                                        }
-                                    }
-                                ]
-                            }
-                        } else {
-                            options.buttons = [
-                                {
-                                    text: RED._("common.label.close"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                    }
-                                }
-                            ]
-                        }
-                    } else if (msg.error === "missing_flow_file") {
-                        if (RED.user.hasPermission("projects.write")) {
-                            options.buttons = [
-                                {
-                                    text: RED._("notification.label.setup-project"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                        RED.projects.showFilesPrompt();
-                                    }
-                                }
-                            ]
-                        }
-                    } else if (msg.error === "missing_package_file") {
-                        if (RED.user.hasPermission("projects.write")) {
-                            options.buttons = [
-                                {
-                                    text: RED._("notification.label.create-default-package"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                        RED.projects.createDefaultPackageFile();
-                                    }
-                                }
-                            ]
-                        }
-                    } else if (msg.error === "project_empty") {
-                        if (RED.user.hasPermission("projects.write")) {
-                            options.buttons = [
-                                {
-                                    text: RED._("notification.label.no-thanks"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                    }
-                                },
-                                {
-                                    text: RED._("notification.label.create-default-project"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                        RED.projects.createDefaultFileSet();
-                                    }
-                                }
-                            ]
-                        }
-                    } else if (msg.error === "git_merge_conflict") {
-                        RED.nodes.clear();
-                        RED.sidebar.versionControl.refresh(true);
-                        if (RED.user.hasPermission("projects.write")) {
-                            options.buttons = [
-                                {
-                                    text: RED._("notification.label.show-merge-conflicts"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                        RED.sidebar.versionControl.showLocalChanges();
-                                    }
-                                }
-                            ]
-                        }
+                var persistentNotifications = {};
+                RED.comms.subscribe("notification/#",function(topic,msg) {
+                    var parts = topic.split("/");
+                    var notificationId = parts[1];
+                    if (notificationId === "runtime-deploy") {
+                        // handled in ui/deploy.js
+                        return;
                     }
-                }
-                if (!persistentNotifications.hasOwnProperty(notificationId)) {
-                    persistentNotifications[notificationId] = RED.notify(text,options);
-                } else {
-                    persistentNotifications[notificationId].update(text,options);
-                }
-            } 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]);
-            if (node) {
-                if (msg.hasOwnProperty("text")) {
-                    if (msg.text[0] !== ".") {
-                        msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
+                    if (notificationId === "node") {
+                        // handled below
+                        return;
+                    }
+                    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];
                     }
-                }
-                node.status = msg;
-                node.dirty = true;
-                RED.view.redraw();
-            }
-        });
-        RED.comms.subscribe("notification/node/#",function(topic,msg) {
-            var i,m;
-            var typeList;
-            var info;
-            if (topic == "notification/node/added") {
-                var addedTypes = [];
-                msg.forEach(function(m) {
-                    var id = m.id;
-                    RED.nodes.addNodeSet(m);
-                    addedTypes = addedTypes.concat(m.types);
-                    RED.i18n.loadCatalog(id, function() {
-                        $.get('nodes/'+id, function(data) {
-                            appendNodeConfig(data);
-                        });
-                    });
                 });
-                if (addedTypes.length) {
-                    typeList = "<ul><li>"+addedTypes.join("</li><li>")+"</li></ul>";
-                    RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
-                }
-                loadIconList();
-            } else if (topic == "notification/node/removed") {
-                for (i=0;i<msg.length;i++) {
-                    m = msg[i];
-                    info = RED.nodes.removeNodeSet(m.id);
-                    if (info.added) {
-                        typeList = "<ul><li>"+m.types.join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeRemoved", {count:m.types.length})+typeList,"success");
+                RED.comms.subscribe("status/#",function(topic,msg) {
+                    var parts = topic.split("/");
+                    var node = RED.nodes.node(parts[1]);
+                    if (node) {
+                        if (msg.hasOwnProperty("text")) {
+                            if (msg.text[0] !== ".") {
+                                msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
+                            }
+                        }
+                        node.status = msg;
+                        node.dirty = true;
+                        RED.view.redraw();
                     }
-                }
-                loadIconList();
-            } else if (topic == "notification/node/enabled") {
-                if (msg.types) {
-                    info = RED.nodes.getNodeSet(msg.id);
-                    if (info.added) {
-                        RED.nodes.enableNodeSet(msg.id);
-                        typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
-                    } else {
-                        $.get('nodes/'+msg.id, function(data) {
-                            appendNodeConfig(data);
-                            typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                            RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
+                });
+                RED.comms.subscribe("notification/node/#",function(topic,msg) {
+                    var i,m;
+                    var typeList;
+                    var info;
+                    if (topic == "notification/node/added") {
+                        var addedTypes = [];
+                        msg.forEach(function(m) {
+                            var id = m.id;
+                            RED.nodes.addNodeSet(m);
+                            addedTypes = addedTypes.concat(m.types);
+                            RED.i18n.loadCatalog(id, function() {
+                                $.get('nodes/'+id, function(data) {
+                                    $("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");
+                        }
+                    } else if (topic == "notification/node/removed") {
+                        for (i=0;i<msg.length;i++) {
+                            m = msg[i];
+                            info = RED.nodes.removeNodeSet(m.id);
+                            if (info.added) {
+                                typeList = "<ul><li>"+m.types.join("</li><li>")+"</li></ul>";
+                                RED.notify(RED._("palette.event.nodeRemoved", {count:m.types.length})+typeList,"success");
+                            }
+                        }
+                    } else if (topic == "notification/node/enabled") {
+                        if (msg.types) {
+                            info = RED.nodes.getNodeSet(msg.id);
+                            if (info.added) {
+                                RED.nodes.enableNodeSet(msg.id);
+                                typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                                RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
+                            } else {
+                                $.get('nodes/'+msg.id, function(data) {
+                                    $("body").append(data);
+                                    typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                                    RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
+                                });
+                            }
+                        }
+                    } else if (topic == "notification/node/disabled") {
+                        if (msg.types) {
+                            RED.nodes.disableNodeSet(msg.id);
+                            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);
                     }
-                }
-            } else if (topic == "notification/node/disabled") {
-                if (msg.types) {
-                    RED.nodes.disableNodeSet(msg.id);
-                    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();
+                });
             }
-            // Refresh flow library to ensure any examples are updated
-            RED.library.loadFlowLibrary();
         });
     }
 
@@ -381,15 +176,6 @@
 
     function loadEditor() {
         var menuOptions = [];
-        if (RED.settings.theme("projects.enabled",false)) {
-            menuOptions.push({id:"menu-item-projects-menu",label:RED._("menu.label.projects"),options:[
-                {id:"menu-item-projects-new",label:RED._("menu.label.projects-new"),disabled:false,onselect:"core:new-project"},
-                {id:"menu-item-projects-open",label:RED._("menu.label.projects-open"),disabled:false,onselect:"core:open-project"},
-                {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
-            ]});
-        }
-
-
         menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
             // {id:"menu-item-view-show-grid",setting:"view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:"core:toggle-show-grid"},
             // {id:"menu-item-view-snap-grid",setting:"view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:"core:toggle-snap-grid"},
@@ -410,8 +196,8 @@
             {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-import-dialog"},
             {id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
         ]});
-        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),options:[
-            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-export-dialog"},
+        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"}
         ]});
         menuOptions.push(null);
@@ -452,18 +238,9 @@
         RED.palette.init();
         if (RED.settings.theme('palette.editable') !== false) {
             RED.palette.editor.init();
-        } else {
-            console.log("Palette editor disabled");
         }
 
         RED.sidebar.init();
-
-        if (RED.settings.theme("projects.enabled",false)) {
-            RED.projects.init();
-        } else {
-            console.log("Projects disabled");
-        }
-
         RED.subflow.init();
         RED.workspaces.init();
         RED.clipboard.init();
@@ -474,7 +251,6 @@
         RED.menu.init({id:"btn-sidemenu",options: menuOptions});
 
         RED.deploy.init(RED.settings.theme("deployButton",null));
-        RED.notifications.init();
 
         RED.actions.add("core:show-about", showAbout);
         RED.nodes.init();

editor/js/nodes.js

@@ -40,7 +40,6 @@ RED.nodes = (function() {
         var nodeSets = {};
         var typeToId = {};
         var nodeDefinitions = {};
-        var iconSets = {};
 
         nodeDefinitions['tab'] = {
             defaults: {
@@ -133,7 +132,7 @@ RED.nodes = (function() {
             registerNodeType: function(nt,def) {
                 nodeDefinitions[nt] = def;
                 def.type = nt;
-                if (nt.substring(0,8) != "subflow:") {
+                if (def.category != "subflows") {
                     def.set = nodeSets[typeToId[nt]];
                     nodeSets[typeToId[nt]].added = true;
                     nodeSets[typeToId[nt]].enabled = true;
@@ -171,12 +170,6 @@ RED.nodes = (function() {
             },
             getNodeType: function(nt) {
                 return nodeDefinitions[nt];
-            },
-            setIconSets: function(sets) {
-                iconSets = sets;
-            },
-            getIconSets: function() {
-                return iconSets;
             }
         };
         return exports;
@@ -272,19 +265,10 @@ RED.nodes = (function() {
                 if (updatedConfigNode) {
                     RED.workspaces.refresh();
                 }
-                try {
-                    if (node._def.oneditdelete) {
-                        node._def.oneditdelete.call(node);
-                    }
-                } catch(err) {
-                    console.log("oneditdelete",node.id,node.type,err.toString());
-                }
                 RED.events.emit('nodes:remove',node);
             }
         }
         if (node && node._def.onremove) {
-            // Deprecated: never documented but used by some early nodes
-            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditremove - please report");
             node._def.onremove.call(n);
         }
         return {links:removedLinks,nodes:removedNodes};
@@ -355,8 +339,8 @@ RED.nodes = (function() {
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{name:{value:""}},
             info: sf.info,
-            icon: function() { return sf.icon||"subflow.png" },
-            category: sf.category || "subflows",
+            icon:"subflow.png",
+            category: "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
             color: "#da9",
@@ -491,9 +475,7 @@ RED.nodes = (function() {
             for (var j=0;j<wires.length;j++) {
                 var w = wires[j];
                 if (w.target.type != "subflow") {
-                    if (w.sourcePort < node.wires.length) {
-                        node.wires[w.sourcePort].push(w.target.id);
-                    }
+                    node.wires[w.sourcePort].push(w.target.id);
                 }
             }
 
@@ -503,12 +485,6 @@ RED.nodes = (function() {
             if (n.outputs > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) {
                 node.outputLabels = n.outputLabels.slice();
             }
-            if ((!n._def.defaults || !n._def.defaults.hasOwnProperty("icon")) && n.icon) {
-                var defIcon = RED.utils.getDefaultNodeIcon(n._def, n);
-                if (n.icon !== defIcon.module+"/"+defIcon.file) {
-                    node.icon = n.icon;
-                }
-            }
         }
         return node;
     }
@@ -519,7 +495,6 @@ RED.nodes = (function() {
         node.type = n.type;
         node.name = n.name;
         node.info = n.info;
-        node.category = n.category;
         node.in = [];
         node.out = [];
 
@@ -553,11 +528,7 @@ RED.nodes = (function() {
         if (node.out.length > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) {
             node.outputLabels = n.outputLabels.slice();
         }
-        if (n.icon) {
-            if (n.icon !== "node-red/subflow.png") {
-                node.icon = n.icon;
-            }
-        }
+
 
         return node;
     }
@@ -730,9 +701,7 @@ RED.nodes = (function() {
         if (!$.isArray(newNodes)) {
             newNodes = [newNodes];
         }
-        var isInitialLoad = false;
         if (!initialLoad) {
-            isInitialLoad = true;
             initialLoad = JSON.parse(JSON.stringify(newNodes));
         }
         var unknownTypes = [];
@@ -753,10 +722,10 @@ RED.nodes = (function() {
             }
 
         }
-        if (!isInitialLoad && unknownTypes.length > 0) {
+        if (unknownTypes.length > 0) {
             var typeList = "<ul><li>"+unknownTypes.join("</li><li>")+"</li></ul>";
             var type = "type"+(unknownTypes.length > 1?"s":"");
-            RED.notify("<p>"+RED._("clipboard.importUnrecognised",{count:unknownTypes.length})+"</p>"+typeList,"error",false,10000);
+            RED.notify("<strong>"+RED._("clipboard.importUnrecognised",{count:unknownTypes.length})+"</strong>"+typeList,"error",false,10000);
         }
 
         var activeWorkspace = RED.workspaces.active();
@@ -903,7 +872,7 @@ RED.nodes = (function() {
 
                 }
 
-                if (!existingConfigNode || existingConfigNode._def.exclusive) { //} || !compareNodes(existingConfigNode,n,true) || existingConfigNode.z !== n.z) {
+                if (!existingConfigNode) { //} || !compareNodes(existingConfigNode,n,true) || existingConfigNode._def.exclusive || existingConfigNode.z !== n.z) {
                     configNode = {id:n.id, z:n.z, type:n.type, users:[], _config:{}};
                     for (d in def.defaults) {
                         if (def.defaults.hasOwnProperty(d)) {
@@ -946,7 +915,6 @@ RED.nodes = (function() {
                         wires:n.wires,
                         inputLabels: n.inputLabels,
                         outputLabels: n.outputLabels,
-                        icon: n.icon,
                         changed:false,
                         _config:{}
                     };
@@ -1015,13 +983,6 @@ RED.nodes = (function() {
                                     set: registry.getNodeSet("node-red/unknown")
                                 };
                                 node.users = [];
-                                // This is a config node, so delete the default
-                                // non-config node properties
-                                delete node.x;
-                                delete node.y;
-                                delete node.wires;
-                                delete node.inputLabels;
-                                delete node.outputLabels;
                             }
                             var orig = {};
                             for (var p in n) {
@@ -1034,31 +995,10 @@ RED.nodes = (function() {
                             node.type = "unknown";
                         }
                         if (node._def.category != "config") {
-                            if (n.hasOwnProperty('inputs')) {
-                                node.inputs = n.inputs;
-                                node._config.inputs = JSON.stringify(n.inputs);
-                            } else {
-                                node.inputs = node._def.inputs;
-                            }
-                            if (n.hasOwnProperty('outputs')) {
-                                node.outputs = n.outputs;
-                                node._config.outputs = JSON.stringify(n.outputs);
-                            } else {
-                                node.outputs = node._def.outputs;
-                            }
-                            if (node.hasOwnProperty('wires') && node.wires.length > node.outputs) {
-                                if (!node._def.defaults.hasOwnProperty("outputs") || !isNaN(parseInt(n.outputs))) {
-                                    // If 'wires' is longer than outputs, clip wires
-                                    console.log("Warning: node.wires longer than node.outputs - trimming wires:",node.id," wires:",node.wires.length," outputs:",node.outputs);
-                                    node.wires = node.wires.slice(0,node.outputs);
-                                } else {
-                                    // The node declares outputs in its defaults, but has not got a valid value
-                                    // Defer to the length of the wires array
-                                    node.outputs = node.wires.length;
-                                }
-                            }
+                            node.inputs = n.inputs||node._def.inputs;
+                            node.outputs = n.outputs||node._def.outputs;
                             for (d in node._def.defaults) {
-                                if (node._def.defaults.hasOwnProperty(d) && d !== 'inputs' && d !== 'outputs') {
+                                if (node._def.defaults.hasOwnProperty(d)) {
                                     node[d] = n[d];
                                     node._config[d] = JSON.stringify(n[d]);
                                 }
@@ -1078,9 +1018,7 @@ RED.nodes = (function() {
                     addNode(node);
                     RED.editor.validateNode(node);
                     node_map[n.id] = node;
-                    // If an 'unknown' config node, it will not have been caught by the
-                    // proper config node handling, so needs adding to new_nodes here
-                    if (node.type === "unknown" || node._def.category !== "config") {
+                    if (node._def.category != "config") {
                         new_nodes.push(node);
                     }
                 }
@@ -1262,13 +1200,12 @@ RED.nodes = (function() {
             RED.workspaces.remove(workspaces[id]);
         });
         defaultWorkspace = null;
-        initialLoad = null;
-        RED.nodes.dirty(false);
+
+        RED.nodes.dirty(true);
         RED.view.redraw(true);
         RED.palette.refresh();
         RED.workspaces.refresh();
         RED.sidebar.config.refresh();
-        RED.sidebar.info.refresh();
 
         // var node_defs = {};
         // var nodes = [];
@@ -1335,9 +1272,6 @@ RED.nodes = (function() {
         enableNodeSet: registry.enableNodeSet,
         disableNodeSet: registry.disableNodeSet,
 
-        setIconSets: registry.setIconSets,
-        getIconSets: registry.getIconSets,
-
         registerType: registry.registerNodeType,
         getType: registry.getNodeType,
         convertNode: convertNode,

editor/js/settings.js

@@ -18,9 +18,6 @@
 RED.settings = (function () {
 
     var loadedSettings = {};
-    var userSettings = {};
-    var settingsDirty = false;
-    var pendingSave;
 
     var hasLocalStorage = function () {
         try {
@@ -34,12 +31,7 @@ RED.settings = (function () {
         if (!hasLocalStorage()) {
             return;
         }
-        if (key === "auth-tokens") {
-            localStorage.setItem(key, JSON.stringify(value));
-        } else {
-            userSettings[key] = value;
-            saveUserSettings();
-        }
+        localStorage.setItem(key, JSON.stringify(value));
     };
 
     /**
@@ -52,23 +44,14 @@ RED.settings = (function () {
         if (!hasLocalStorage()) {
             return undefined;
         }
-        if (key === "auth-tokens") {
-            return JSON.parse(localStorage.getItem(key));
-        } else {
-            return userSettings[key];
-        }
+        return JSON.parse(localStorage.getItem(key));
     };
 
     var remove = function (key) {
         if (!hasLocalStorage()) {
             return;
         }
-        if (key === "auth-tokens") {
-            localStorage.removeItem(key);
-        } else {
-            delete userSettings[key];
-            saveUserSettings();
-        }
+        localStorage.removeItem(key);
     };
 
     var setProperties = function(data) {
@@ -85,10 +68,6 @@ RED.settings = (function () {
         loadedSettings = data;
     };
 
-    var setUserSettings = function(data) {
-        userSettings = data;
-    }
-
     var init = function (done) {
         var accessTokenMatch = /[?&]access_token=(.*?)(?:$|&)/.exec(window.location.search);
         if (accessTokenMatch) {
@@ -127,7 +106,7 @@ RED.settings = (function () {
                     RED.settings.remove("auth-tokens");
                 }
                 console.log("Node-RED: " + data.version);
-                loadUserSettings(done);
+                done();
             },
             error: function(jqXHR,textStatus,errorThrown) {
                 if (jqXHR.status === 401) {
@@ -136,52 +115,12 @@ RED.settings = (function () {
                     }
                     RED.user.login(function() { load(done); });
                 } else {
-                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
+                    console.log("Unexpected error:",jqXHR.status,textStatus);
                 }
             }
         });
     };
 
-    function loadUserSettings(done) {
-        $.ajax({
-            headers: {
-                "Accept": "application/json"
-            },
-            dataType: "json",
-            cache: false,
-            url: 'settings/user',
-            success: function (data) {
-                setUserSettings(data);
-                done();
-            },
-            error: function(jqXHR,textStatus,errorThrown) {
-                console.log("Unexpected error loading user settings:",jqXHR.status,textStatus);
-            }
-        });
-    }
-
-    function saveUserSettings() {
-        if (RED.user.hasPermission("settings.write")) {
-            if (pendingSave) {
-                clearTimeout(pendingSave);
-            }
-            pendingSave = setTimeout(function() {
-                pendingSave = null;
-                $.ajax({
-                    method: 'POST',
-                    contentType: 'application/json',
-                    url: 'settings/user',
-                    data: JSON.stringify(userSettings),
-                    success: function (data) {
-                    },
-                    error: function(jqXHR,textStatus,errorThrown) {
-                        console.log("Unexpected error saving user settings:",jqXHR.status,textStatus);
-                    }
-                });
-            },300);
-        }
-    }
-
     function theme(property,defaultValue) {
         if (!RED.settings.editorTheme) {
             return defaultValue;
@@ -204,10 +143,10 @@ RED.settings = (function () {
     return {
         init: init,
         load: load,
-        loadUserSettings: loadUserSettings,
         set: set,
         get: get,
         remove: remove,
         theme: theme
     }
-})();
+})
+();

editor/js/text/bidi.js

@@ -15,7 +15,9 @@
  **/
 RED.text = {};
 RED.text.bidi = (function() {
-    var textDir = "";
+    var textDir = "";    
+    var textDirPref = "auto";
+    var bidiEnabled = false;
     var LRE = "\u202A",
         RLE = "\u202B",
         PDF = "\u202C";
@@ -110,8 +112,8 @@ RED.text.bidi = (function() {
     }
 
     /**
-     * Sets the text direction preference
-     * @param dir - the text direction preference
+     * Sets the text direction
+     * @param dir - the actual text direction
      */
     function setTextDirection(dir) {
         textDir = dir;
@@ -120,9 +122,44 @@ RED.text.bidi = (function() {
         RED.palette.refresh();
         enforceTextDirectionOnPage();
     }
-
+    
+    /**
+     * Gets the bidi enabled preference
+     */
+    function getBidiEnabled() {
+        return bidiEnabled;
+    }
+        
+    /**
+     * Sets the bidi enabled preference
+     * @param state - the bidi enabled preference
+     */
+    function setBidiEnabled(state) {
+        bidiEnabled = state;
+        setTextDirection((state ? textDirPref : ""));
+    }
+    
+    /**
+     * Gets the text direction preference
+     */
+    function getTextDirPref() {        
+        return textDirPref;
+    }
+    
+    /**
+     * Sets the text direction preference
+     * @param dirPref - text direction preference
+     */
+    function setTextDirPref(dirPref) {
+        textDirPref = dirPref;
+        setTextDirection(textDirPref);
+    }
+   
     return {
-        setTextDirection: setTextDirection,
+        setBidiEnabled: setBidiEnabled,
+        setTextDirPref: setTextDirPref,
+        getBidiEnabled: getBidiEnabled,
+        getTextDirPref: getTextDirPref,
         enforceTextDirectionWithUCC: enforceTextDirectionWithUCC,
         resolveBaseTextDir: resolveBaseTextDir,
         prepareInput: prepareInput

editor/js/ui/clipboard.js

@@ -276,20 +276,9 @@ RED.clipboard = (function() {
         if (typeof value !== "string" ) {
             value = JSON.stringify(value, function(key,value) {
                 if (value !== null && typeof value === 'object') {
-                    if (value.__enc__) {
-                        if (value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
-                            truncated = value.data.length !== value.length;
-                            return value.data;
-                        }
-                        if (value.type === 'function' || value.type === 'internal') {
-                            return undefined
-                        }
-                        if (value.type === 'number') {
-                            // Handle NaN and Infinity - they are not permitted
-                            // in JSON. We can either substitute with a String
-                            // representation or null
-                            return null;
-                        }
+                    if (value.__encoded__ && value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
+                        truncated = value.data.length !== value.length;
+                        return value.data;
                     }
                 }
                 return value;
@@ -320,6 +309,18 @@ RED.clipboard = (function() {
 
             $('<input type="text" id="clipboard-hidden">').appendTo("body");
 
+            RED.events.on("view:selection-changed",function(selection) {
+                if (!selection.nodes) {
+                    RED.menu.setDisabled("menu-item-export",true);
+                    RED.menu.setDisabled("menu-item-export-clipboard",true);
+                    RED.menu.setDisabled("menu-item-export-library",true);
+                } else {
+                    RED.menu.setDisabled("menu-item-export",false);
+                    RED.menu.setDisabled("menu-item-export-clipboard",false);
+                    RED.menu.setDisabled("menu-item-export-library",false);
+                }
+            });
+
             RED.actions.add("core:show-export-dialog",exportNodes);
             RED.actions.add("core:show-import-dialog",importNodes);
 

editor/js/ui/common/editableList.js

@@ -75,7 +75,7 @@
                         addLabel = 'add';
                     }
                 }
-                $('<a href="#" class="editor-button editor-button-small red-ui-editableList-addButton" style="margin-top: 4px;"><i class="fa fa-plus"></i> '+addLabel+'</a>')
+                $('<a href="#" class="editor-button editor-button-small" style="margin-top: 4px;"><i class="fa fa-plus"></i> '+addLabel+'</a>')
                     .appendTo(this.topContainer)
                     .click(function(evt) {
                         evt.preventDefault();
@@ -116,11 +116,6 @@
                 this.uiContainer.css("minHeight",minHeight);
                 this.element.css("minHeight",0);
             }
-            var maxHeight = this.element.css("maxHeight");
-            if (maxHeight !== '0px') {
-                this.uiContainer.css("maxHeight",maxHeight);
-                this.element.css("maxHeight",null);
-            }
             if (this.options.height !== 'auto') {
                 this.uiContainer.css("overflow-y","scroll");
                 if (!isNaN(this.options.height)) {

editor/js/ui/common/popover.js

@@ -19,14 +19,12 @@ RED.popover = (function() {
         "default": {
             top: 10,
             leftRight: 17,
-            leftLeft: 25,
-            leftBottom: 8,
+            leftLeft: 25
         },
         "small": {
             top: 5,
-            leftRight: 17,
-            leftLeft: 16,
-            leftBottom: 3,
+            leftRight: 8,
+            leftLeft: 16
         }
     }
     function createPopover(options) {
@@ -35,7 +33,6 @@ RED.popover = (function() {
         var trigger = options.trigger;
         var content = options.content;
         var delay = options.delay;
-        var autoClose = options.autoClose;
         var width = options.width||"auto";
         var size = options.size||"default";
         if (!deltaSizes[size]) {
@@ -46,65 +43,50 @@ RED.popover = (function() {
         var active;
         var div;
 
-        var openPopup = function(instant) {
+        var openPopup = function() {
             if (active) {
-                div = $('<div class="red-ui-popover red-ui-popover-'+direction+'"></div>');
+                div = $('<div class="red-ui-popover red-ui-popover-'+direction+'"></div>').appendTo("body");
                 if (size !== "default") {
                     div.addClass("red-ui-popover-size-"+size);
                 }
                 if (typeof content === 'function') {
-                    var result = content.call(res);
-                    if (result === null) {
-                        return;
-                    }
-                    if (typeof result === 'string') {
-                        div.text(result);
-                    } else {
-                        div.append(result);
-                    }
+                    content.call(res).appendTo(div);
                 } else {
                     div.html(content);
                 }
                 if (width !== "auto") {
                     div.width(width);
                 }
-                div.appendTo("body");
+
 
                 var targetPos = target.offset();
-                var targetWidth = target.outerWidth();
-                var targetHeight = target.outerHeight();
+                var targetWidth = target.width();
+                var targetHeight = target.height();
+
                 var divHeight = div.height();
                 var divWidth = div.width();
                 if (direction === 'right') {
                     div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left+targetWidth+deltaSizes[size].leftRight});
                 } else if (direction === 'left') {
                     div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left-deltaSizes[size].leftLeft-divWidth});
-                } else if (direction === 'bottom') {
-                    div.css({top: targetPos.top+targetHeight+deltaSizes[size].top,left:targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom});
-                }
-                if (instant) {
-                    div.show();
-                } else {
-                    div.fadeIn("fast");
                 }
+
+                div.fadeIn("fast");
             }
         }
-        var closePopup = function(instant) {
+        var closePopup = function() {
             if (!active) {
                 if (div) {
-                    if (instant) {
+                    div.fadeOut("fast",function() {
                         $(this).remove();
-                    } else {
-                        div.fadeOut("fast",function() {
-                            $(this).remove();
-                        });
-                    }
+                    });
                     div = null;
                 }
             }
         }
 
         if (trigger === 'hover') {
+
             target.on('mouseenter',function(e) {
                 clearTimeout(timer);
                 active = true;
@@ -128,26 +110,18 @@ RED.popover = (function() {
                     openPopup();
                 }
             });
-        } else if (autoClose) {
-            setTimeout(function() {
-                active = false;
-                closePopup();
-            },autoClose);
         }
         var res = {
             setContent: function(_content) {
                 content = _content;
-                return res;
             },
-            open: function (instant) {
+            open: function () {
                 active = true;
-                openPopup(instant);
-                return res;
+                openPopup();
             },
-            close: function (instant) {
+            close: function () {
                 active = false;
-                closePopup(instant);
-                return res;
+                closePopup();
             }
         }
         return res;
@@ -155,17 +129,7 @@ RED.popover = (function() {
     }
 
     return {
-        create: createPopover,
-        tooltip: function(target,content) {
-            RED.popover.create({
-                target:target,
-                trigger: "hover",
-                size: "small",
-                direction: "bottom",
-                content: content,
-                delay: { show: 550, hide: 10 }
-            });
-        }
+        create: createPopover
     }
 
 })();

editor/js/ui/common/stack.js

@@ -17,31 +17,11 @@
 RED.stack = (function() {
     function createStack(options) {
         var container = options.container;
-        container.addClass("red-ui-stack");
-        var contentHeight = 0;
+
         var entries = [];
 
         var visible = true;
-        // TODO: make this a singleton function - and watch out for stacks no longer
-        //       in the DOM
-        var resizeStack = function() {
-            if (entries.length > 0) {
-                var headerHeight = 0;
-                entries.forEach(function(entry) {
-                    headerHeight += entry.header.outerHeight();
-                });
 
-                var height = container.innerHeight();
-                contentHeight = height - headerHeight - (entries.length-1);
-                entries.forEach(function(e) {
-                    e.contentWrap.height(contentHeight);
-                });
-            }
-        }
-        if (options.fill && options.singleExpanded) {
-            $(window).resize(resizeStack);
-            $(window).focus(resizeStack);
-        }
         return {
             add: function(entry) {
                 entries.push(entry);
@@ -50,12 +30,7 @@ RED.stack = (function() {
                     entry.container.hide();
                 }
                 var header = $('<div class="palette-header"></div>').appendTo(entry.container);
-                entry.header = header;
-                entry.contentWrap = $('<div></div>',{style:"position:relative"}).appendTo(entry.container);
-                if (options.fill) {
-                    entry.contentWrap.css("height",contentHeight);
-                }
-                entry.content = $('<div></div>').appendTo(entry.contentWrap);
+                entry.content = $('<div></div>').appendTo(entry.container);
                 if (entry.collapsible !== false) {
                     header.click(function() {
                         if (options.singleExpanded) {
@@ -74,13 +49,11 @@ RED.stack = (function() {
                     var icon = $('<i class="fa fa-angle-down"></i>').appendTo(header);
 
                     if (entry.expanded) {
-                        entry.container.addClass("palette-category-expanded");
                         icon.addClass("expanded");
                     } else {
-                        entry.contentWrap.hide();
+                        entry.content.hide();
                     }
                 } else {
-                    $('<i style="opacity: 0.5;" class="fa fa-angle-down expanded"></i>').appendTo(header);
                     header.css("cursor","default");
                 }
                 entry.title = $('<span></span>').html(entry.title).appendTo(header);
@@ -101,35 +74,24 @@ RED.stack = (function() {
                         if (entry.onexpand) {
                             entry.onexpand.call(entry);
                         }
-                        if (options.singleExpanded) {
-                            entries.forEach(function(e) {
-                                if (e !== entry) {
-                                    e.collapse();
-                                }
-                            })
-                        }
-
                         icon.addClass("expanded");
-                        entry.container.addClass("palette-category-expanded");
-                        entry.contentWrap.slideDown(200);
+                        entry.content.slideDown(200);
                         return true;
                     }
                 };
                 entry.collapse = function() {
                     if (entry.isExpanded()) {
                         icon.removeClass("expanded");
-                        entry.container.removeClass("palette-category-expanded");
-                        entry.contentWrap.slideUp(200);
+                        entry.content.slideUp(200);
                         return true;
                     }
                 };
                 entry.isExpanded = function() {
-                    return entry.container.hasClass("palette-category-expanded");
+                    return icon.hasClass("expanded");
                 };
-                if (options.fill && options.singleExpanded) {
-                    resizeStack();
-                }
+
                 return entry;
+
             },
 
             hide: function() {
@@ -146,13 +108,9 @@ RED.stack = (function() {
                     entry.container.show();
                 });
                 return this;
-            },
-            resize: function() {
-                if (resizeStack) {
-                    resizeStack();
-                }
             }
         }
+
     }
 
     return {

editor/js/ui/common/tabs.js

@@ -17,15 +17,10 @@
 
 
 RED.tabs = (function() {
-
-    var defaultTabIcon = "fa fa-lemon-o";
-
     function createTabs(options) {
         var tabs = {};
-        var pinnedTabsCount = 0;
         var currentTabWidth;
         var currentActiveTabWidth = 0;
-        var collapsibleMenu;
 
         var ul = options.element || $("#"+options.id);
         var wrapper = ul.wrap( "<div>" ).parent();
@@ -55,56 +50,6 @@ RED.tabs = (function() {
             scrollRight = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-right"><a href="#" style="display:none;"><i class="fa fa-caret-right"></i></a></div>').appendTo(wrapper).find("a");
             scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }).on('click',function(evt){ evt.preventDefault();});
         }
-
-        if (options.collapsible) {
-            // var dropDown = $('<div>',{class:"red-ui-tabs-select"}).appendTo(wrapper);
-            // ul.hide();
-            wrapper.addClass("red-ui-tabs-collapsible");
-
-            var collapsedButtonsRow = $('<div class="red-ui-tab-link-buttons"></div>').appendTo(wrapper);
-
-            var selectButton = $('<a href="#"><i class="fa fa-caret-down"></i></a>').appendTo(collapsedButtonsRow);
-            selectButton.addClass("red-ui-tab-link-button-menu")
-            selectButton.click(function(evt) {
-                evt.preventDefault();
-                if (!collapsibleMenu) {
-                    var pinnedOptions = [];
-                    var options = [];
-                    ul.children().each(function(i,el) {
-                        var id = $(el).data('tabId');
-                        var opt = {
-                            id:"red-ui-tabs-menu-option-"+id,
-                            icon: tabs[id].iconClass || defaultTabIcon,
-                            label: tabs[id].name,
-                            onselect: function() {
-                                activateTab(id);
-                            }
-                        };
-                        if (tabs[id].pinned) {
-                            pinnedOptions.push(opt);
-                        } else {
-                            options.push(opt);
-                        }
-                    });
-                    options = pinnedOptions.concat(options);
-                    collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
-                    collapsibleMenu.css({
-                        position: "absolute"
-                    })
-                    collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
-                    collapsibleMenu.on('mouseup', function() { $(this).hide() });
-                    collapsibleMenu.appendTo("body");
-                }
-                var elementPos = selectButton.offset();
-                collapsibleMenu.css({
-                    top: (elementPos.top+selectButton.height()-20)+"px",
-                    left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
-                })
-                collapsibleMenu.toggle();
-            })
-
-        }
-
         function scrollEventHandler(evt,dir) {
             evt.preventDefault();
             if ($(this).hasClass('disabled')) {
@@ -173,9 +118,6 @@ RED.tabs = (function() {
                 ul.children().removeClass("active");
                 ul.children().css({"transition": "width 100ms"});
                 link.parent().addClass("active");
-                var parentId = link.parent().attr('id');
-                wrapper.find(".red-ui-tab-link-button").removeClass("active selected");
-                $("#"+parentId+"-link-button").addClass("active selected");
                 if (options.scrollable) {
                     var pos = link.parent().position().left;
                     if (pos-21 < 0) {
@@ -213,71 +155,42 @@ RED.tabs = (function() {
             var tabs = ul.find("li.red-ui-tab");
             var width = wrapper.width();
             var tabCount = tabs.size();
-            var tabWidth;
-
-            if (options.collapsible) {
-                tabWidth = width - collapsedButtonsRow.width()-10;
-                if (tabWidth < 198) {
-                    var delta = 198 - tabWidth;
-                    var b = collapsedButtonsRow.find("a:last").prev();
-                    while (b.is(":not(:visible)")) {
-                        b = b.prev();
-                    }
-                    if (!b.hasClass("red-ui-tab-link-button-pinned")) {
-                        b.hide();
-                    }
-                    tabWidth = width - collapsedButtonsRow.width()-10;
+            var tabWidth = (width-12-(tabCount*6))/tabCount;
+            currentTabWidth = (100*tabWidth/width)+"%";
+            currentActiveTabWidth = currentTabWidth+"%";
+            if (options.scrollable) {
+                tabWidth = Math.max(tabWidth,140);
+                currentTabWidth = tabWidth+"px";
+                currentActiveTabWidth = 0;
+                var listWidth = Math.max(wrapper.width(),12+(tabWidth+6)*tabCount);
+                ul.width(listWidth);
+                updateScroll();
+            } else if (options.hasOwnProperty("minimumActiveTabWidth")) {
+                if (tabWidth < options.minimumActiveTabWidth) {
+                    tabCount -= 1;
+                    tabWidth = (width-12-options.minimumActiveTabWidth-(tabCount*6))/tabCount;
+                    currentTabWidth = (100*tabWidth/width)+"%";
+                    currentActiveTabWidth = options.minimumActiveTabWidth+"px";
                 } else {
-                    var space = width - 198 - collapsedButtonsRow.width();
-                    if (space > 40) {
-                        collapsedButtonsRow.find("a:not(:visible):first").show();
-                        tabWidth = width - collapsedButtonsRow.width()-10;
-                    }
-                }
-                tabs.css({width:tabWidth});
-
-            } else {
-                var tabWidth = (width-12-(tabCount*6))/tabCount;
-                currentTabWidth = (100*tabWidth/width)+"%";
-                currentActiveTabWidth = currentTabWidth+"%";
-                if (options.scrollable) {
-                    tabWidth = Math.max(tabWidth,140);
-                    currentTabWidth = tabWidth+"px";
                     currentActiveTabWidth = 0;
-                    var listWidth = Math.max(wrapper.width(),12+(tabWidth+6)*tabCount);
-                    ul.width(listWidth);
-                    updateScroll();
-                } else if (options.hasOwnProperty("minimumActiveTabWidth")) {
-                    if (tabWidth < options.minimumActiveTabWidth) {
-                        tabCount -= 1;
-                        tabWidth = (width-12-options.minimumActiveTabWidth-(tabCount*6))/tabCount;
-                        currentTabWidth = (100*tabWidth/width)+"%";
-                        currentActiveTabWidth = options.minimumActiveTabWidth+"px";
-                    } else {
-                        currentActiveTabWidth = 0;
-                    }
-                }
-                if (options.collapsible) {
-                    console.log(currentTabWidth);
-                }
-
-                tabs.css({width:currentTabWidth});
-                if (tabWidth < 50) {
-                    ul.find(".red-ui-tab-close").hide();
-                    ul.find(".red-ui-tab-icon").hide();
-                    ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
-                } else {
-                    ul.find(".red-ui-tab-close").show();
-                    ul.find(".red-ui-tab-icon").show();
-                    ul.find(".red-ui-tab-label").css({paddingLeft:""})
-                }
-                if (currentActiveTabWidth !== 0) {
-                    ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
-                    ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
-                    ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
-                    ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
                 }
             }
+            tabs.css({width:currentTabWidth});
+            if (tabWidth < 50) {
+                ul.find(".red-ui-tab-close").hide();
+                ul.find(".red-ui-tab-icon").hide();
+                ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
+            } else {
+                ul.find(".red-ui-tab-close").show();
+                ul.find(".red-ui-tab-icon").show();
+                ul.find(".red-ui-tab-label").css({paddingLeft:""})
+            }
+            if (currentActiveTabWidth !== 0) {
+                ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
+                ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
+                ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
+                ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
+            }
 
         }
 
@@ -297,15 +210,11 @@ RED.tabs = (function() {
                 activateTab(tab.find("a"));
             }
             li.remove();
-            if (tabs[id].pinned) {
-                pinnedTabsCount--;
-            }
             if (options.onremove) {
                 options.onremove(tabs[id]);
             }
             delete tabs[id];
             updateTabWidths();
-            collapsibleMenu = null;
         }
 
         return {
@@ -314,48 +223,13 @@ RED.tabs = (function() {
                 var li = $("<li/>",{class:"red-ui-tab"}).appendTo(ul);
                 li.attr('id',"red-ui-tab-"+(tab.id.replace(".","-")));
                 li.data("tabId",tab.id);
-
-                if (options.maximumTabWidth) {
-                    li.css("maxWidth",options.maximumTabWidth+"px");
-                }
                 var link = $("<a/>",{href:"#"+tab.id, class:"red-ui-tab-label"}).appendTo(li);
                 if (tab.icon) {
                     $('<img src="'+tab.icon+'" class="red-ui-tab-icon"/>').appendTo(link);
-                } else if (tab.iconClass) {
-                    $('<i>',{class:"red-ui-tab-icon "+tab.iconClass}).appendTo(link);
                 }
                 var span = $('<span/>',{class:"bidiAware"}).text(tab.label).appendTo(link);
                 span.attr('dir', RED.text.bidi.resolveBaseTextDir(tab.label));
-                if (options.collapsible) {
-                    li.addClass("red-ui-tab-pinned");
-                    var pinnedLink = $('<a href="#'+tab.id+'" class="red-ui-tab-link-button"></a>');
-                    if (tab.pinned) {
-                        if (pinnedTabsCount === 0) {
-                            pinnedLink.prependTo(collapsedButtonsRow)
-                        } else {
-                            pinnedLink.insertAfter(collapsedButtonsRow.find("a.red-ui-tab-link-button-pinned:last"));
-                        }
-                    } else {
-                        pinnedLink.insertBefore(collapsedButtonsRow.find("a:last"));
-                    }
 
-                    pinnedLink.attr('id',li.attr('id')+"-link-button");
-                    if (tab.iconClass) {
-                        $('<i>',{class:tab.iconClass}).appendTo(pinnedLink);
-                    } else {
-                        $('<i>',{class:defaultTabIcon}).appendTo(pinnedLink);
-                    }
-                    pinnedLink.click(function(evt) {
-                        evt.preventDefault();
-                        activateTab(tab.id);
-                    });
-                    if (tab.pinned) {
-                        pinnedLink.addClass("red-ui-tab-link-button-pinned");
-                        pinnedTabsCount++;
-                    }
-                    RED.popover.tooltip($(pinnedLink), tab.name);
-
-                }
                 link.on("click",onTabClick);
                 link.on("dblclick",onTabDblClick);
                 if (tab.closeable) {
@@ -367,6 +241,7 @@ RED.tabs = (function() {
                         removeTab(tab.id);
                     });
                 }
+                updateTabWidths();
                 if (options.onadd) {
                     options.onadd(tab);
                 }
@@ -451,10 +326,6 @@ RED.tabs = (function() {
                         }
                     })
                 }
-                setTimeout(function() {
-                    updateTabWidths();
-                },10);
-                collapsibleMenu = null;
             },
             removeTab: removeTab,
             activateTab: activateTab,

editor/js/ui/common/typedInput.js

@@ -14,38 +14,10 @@
  * limitations under the License.
  **/
 (function($) {
-    var contextParse = function(v) {
-        var parts = RED.utils.parseContextKey(v);
-        return {
-            option: parts.store,
-            value: parts.key
-        }
-    }
-    var contextExport = function(v,opt) {
-        if (!opt) {
-            return v;
-        }
-        var store = ((typeof opt === "string")?opt:opt.value)
-        if (store !== RED.settings.context.default) {
-            return "#:("+store+")::"+v;
-        } else {
-            return v;
-        }
-    }
     var allOptions = {
         msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
-        flow: {value:"flow",label:"flow.",hasValue:true,
-            options:[],
-            validate:RED.utils.validatePropertyExpression,
-            parse: contextParse,
-            export: contextExport
-        },
-        global: {value:"global",label:"global.",hasValue:true,
-            options:[],
-            validate:RED.utils.validatePropertyExpression,
-            parse: contextParse,
-            export: contextExport
-        },
+        flow: {value:"flow",label:"flow.",validate:RED.utils.validatePropertyExpression},
+        global: {value:"global",label:"global.",validate:RED.utils.validatePropertyExpression},
         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"]},
@@ -104,51 +76,31 @@
                     }
                 })
             }
-        },
-        env: {
-            value: "env",
-            label: "env variable",
-            icon: "red/images/typedInput/env.png"
         }
     };
     var nlsd = false;
 
     $.widget( "nodered.typedInput", {
         _create: function() {
-            try {
             if (!nlsd && RED && RED._) {
                 for (var i in allOptions) {
                     if (allOptions.hasOwnProperty(i)) {
                         allOptions[i].label = RED._("typedInput.type."+i,{defaultValue:allOptions[i].label});
                     }
                 }
-                var contextStores = RED.settings.context.stores;
-                var contextOptions = contextStores.map(function(store) {
-                    return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #'+(store==='memory'?'ddd':'777')+'"></i>'}
-                })
-                if (contextOptions.length < 2) {
-                    allOptions.flow.options = [];
-                    allOptions.global.options = [];
-                } else {
-                    allOptions.flow.options = contextOptions;
-                    allOptions.global.options = contextOptions;
-                }
             }
             nlsd = true;
             var that = this;
 
             this.disarmClick = false;
-            this.input = $('<input type="text"></input>');
-            this.input.insertAfter(this.element);
-            this.input.val(this.element.val());
             this.element.addClass('red-ui-typedInput');
             this.uiWidth = this.element.outerWidth();
-            this.elementDiv = this.input.wrap("<div>").parent().addClass('red-ui-typedInput-input');
+            this.elementDiv = this.element.wrap("<div>").parent().addClass('red-ui-typedInput-input');
             this.uiSelect = this.elementDiv.wrap( "<div>" ).parent();
             var attrStyle = this.element.attr('style');
             var m;
-            if ((m = /width\s*:\s*(calc\s*\(.*\)|\d+(%|px))/i.exec(attrStyle)) !== null) {
-                this.input.css('width','100%');
+            if ((m = /width\s*:\s*(\d+(%|px))/i.exec(attrStyle)) !== null) {
+                this.element.css('width','100%');
                 this.uiSelect.width(m[1]);
                 this.uiWidth = null;
             } else {
@@ -157,19 +109,15 @@
             ["Right","Left"].forEach(function(d) {
                 var m = that.element.css("margin"+d);
                 that.uiSelect.css("margin"+d,m);
-                that.input.css("margin"+d,0);
+                that.element.css("margin"+d,0);
             });
-
             this.uiSelect.addClass("red-ui-typedInput-container");
 
-            this.element.attr('type','hidden');
-
             this.options.types = this.options.types||Object.keys(allOptions);
 
             this.selectTrigger = $('<button tabindex="0"></button>').prependTo(this.uiSelect);
-            $('<i class="red-ui-typedInput-icon fa fa-sort-desc"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
-
-            this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
+            $('<i class="fa fa-sort-desc"></i>').appendTo(this.selectTrigger);
+            this.selectLabel = $('<span></span>').appendTo(this.selectTrigger);
 
             this.types(this.options.types);
 
@@ -183,16 +131,14 @@
                 this.typeField = $("<input>",{type:'hidden'}).appendTo(this.uiSelect);
             }
 
-            this.input.on('focus', function() {
+            this.element.on('focus', function() {
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
-            this.input.on('blur', function() {
+            this.element.on('blur', function() {
                 that.uiSelect.removeClass('red-ui-typedInput-focus');
             });
-            this.input.on('change', function() {
+            this.element.on('change', function() {
                 that.validate();
-                that.element.val(that.value());
-                that.element.trigger('change',that.propertyType,that.value());
             })
             this.selectTrigger.click(function(event) {
                 event.preventDefault();
@@ -208,11 +154,8 @@
             })
 
             // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
-            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-sort-desc"></i></span></button>').appendTo(this.uiSelect);
+            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="fa fa-sort-desc"></i></span></button>').appendTo(this.uiSelect);
             this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
-            RED.popover.tooltip(this.optionSelectLabel,function() {
-                return that.optionValue;
-            });
             this.optionSelectTrigger.click(function(event) {
                 event.preventDefault();
                 that._showOptionSelectMenu();
@@ -227,18 +170,17 @@
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
 
-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
+            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);
-        }catch(err) {
-            console.log(err.stack);
-        }
         },
         _showTypeMenu: function() {
             if (this.typeList.length > 1) {
                 this._showMenu(this.menu,this.selectTrigger);
                 this.menu.find("[value='"+this.propertyType+"']").focus();
             } else {
-                this.input.focus();
+                this.element.focus();
             }
         },
         _showOptionSelectMenu: function() {
@@ -247,8 +189,8 @@
                     minWidth:this.optionSelectLabel.width()
                 });
 
-                this._showMenu(this.optionMenu,this.optionSelectTrigger);
-                var selectedOption = this.optionMenu.find("[value='"+this.optionValue+"']");
+                this._showMenu(this.optionMenu,this.optionSelectLabel);
+                var selectedOption = this.optionMenu.find("[value='"+this.value()+"']");
                 if (selectedOption.length === 0) {
                     selectedOption = this.optionMenu.children(":first");
                 }
@@ -260,7 +202,7 @@
             $(document).off("mousedown.close-property-select");
             menu.hide();
             if (this.elementDiv.is(":visible")) {
-                this.input.focus();
+                this.element.focus();
             } else if (this.optionSelectTrigger.is(":visible")){
                 this.optionSelectTrigger.focus();
             } else {
@@ -279,19 +221,10 @@
                     op.text(opt.label);
                 }
                 if (opt.icon) {
-                    if (opt.icon.indexOf("<") === 0) {
-                        $(opt.icon).prependTo(op);
-                    } else if (opt.icon.indexOf("/") !== -1) {
-                        $('<img>',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
-                    } else {
-                        $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
-                    }
+                    $('<img>',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
                 } else {
                     op.css({paddingLeft: "18px"});
                 }
-                if (!opt.icon && !opt.label) {
-                    op.text(opt.value);
-                }
 
                 op.click(function(event) {
                     event.preventDefault();
@@ -370,8 +303,7 @@
             if (this.uiWidth !== null) {
                 this.uiSelect.width(this.uiWidth);
             }
-            var type = this.typeMap[this.propertyType];
-            if (type && type.hasValue === false) {
+            if (this.typeMap[this.propertyType] && this.typeMap[this.propertyType].hasValue === false) {
                 this.selectTrigger.addClass("red-ui-typedInput-full-width");
             } else {
                 this.selectTrigger.removeClass("red-ui-typedInput-full-width");
@@ -381,68 +313,13 @@
                     this.elementDiv.css('right',"22px");
                 } else {
                     this.elementDiv.css('right','0');
-                    this.input.css({
-                        'border-top-right-radius': '4px',
-                        'border-bottom-right-radius': '4px'
-                    });
                 }
-
-                // if (this.optionSelectTrigger) {
-                //     this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
-                // }
-
                 if (this.optionSelectTrigger) {
-                    if (type && type.options && type.hasValue === true) {
-                        this.optionSelectLabel.css({'left':'auto'})
-                        var lw = this._getLabelWidth(this.optionSelectLabel);
-                        this.optionSelectTrigger.css({'width':(23+lw)+"px"});
-                        this.elementDiv.css('right',(23+lw)+"px");
-                        this.input.css({
-                            'border-top-right-radius': 0,
-                            'border-bottom-right-radius': 0
-                        });
-                    } else {
-                        this.optionSelectLabel.css({'left':'0'})
-                        this.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
-                        if (!this.optionExpandButton.is(":visible")) {
-                            this.elementDiv.css({'right':0});
-                            this.input.css({
-                                'border-top-right-radius': '4px',
-                                'border-bottom-right-radius': '4px'
-                            });
-                        }
-                    }
+                    this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
                 }
             }
         },
-        _updateOptionSelectLabel: function(o) {
-            var opt = this.typeMap[this.propertyType];
-            this.optionSelectLabel.empty();
-            if (o.icon) {
-                if (o.icon.indexOf("<") === 0) {
-                    $(o.icon).prependTo(this.optionSelectLabel);
-                } else if (o.icon.indexOf("/") !== -1) {
-                    // url
-                    $('<img>',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel);
-                } else {
-                    // icon class
-                    $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
-                }
-            } else if (o.label) {
-                this.optionSelectLabel.text(o.label);
-            } else {
-                this.optionSelectLabel.text(o.value);
-            }
-            if (opt.hasValue) {
-                this.optionValue = o.value;
-                this._resize();
-                this.input.trigger('change',this.propertyType,this.value());
-            }
-        },
         _destroy: function() {
-            if (this.optionMenu) {
-                this.optionMenu.remove();
-            }
             this.menu.remove();
         },
         types: function(types) {
@@ -460,18 +337,13 @@
                 return result;
             });
             this.selectTrigger.toggleClass("disabled", this.typeList.length === 1);
-            this.selectTrigger.find(".fa-sort-desc").toggle(this.typeList.length > 1)
             if (this.menu) {
                 this.menu.remove();
             }
             this.menu = this._createMenu(this.typeList, function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                 this.type(this.typeList[0].value);
-            } else {
-                this.propertyType = null;
-                this.type(currentType);
             }
-            setTimeout(function() {that._resize();},0);
         },
         width: function(desiredWidth) {
             this.uiWidth = desiredWidth;
@@ -479,33 +351,16 @@
         },
         value: function(value) {
             if (!arguments.length) {
-                var v = this.input.val();
-                if (this.typeMap[this.propertyType].export) {
-                    v = this.typeMap[this.propertyType].export(v,this.optionValue)
-                }
-                return v;
+                return this.element.val();
             } else {
-                var selectedOption;
                 if (this.typeMap[this.propertyType].options) {
-                    for (var i=0;i<this.typeMap[this.propertyType].options.length;i++) {
-                        var op = this.typeMap[this.propertyType].options[i];
-                        if (typeof op === "string") {
-                            if (op === value) {
-                                selectedOption = this.activeOptions[op];
-                                break;
-                            }
-                        } else if (op.value === value) {
-                            selectedOption = op;
-                            break;
-                        }
+                    if (this.typeMap[this.propertyType].options.indexOf(value) === -1) {
+                        value = "";
                     }
-                    if (!selectedOption) {
-                        selectedOption = {value:""}
-                    }
-                    this._updateOptionSelectLabel(selectedOption)
+                    this.optionSelectLabel.text(value);
                 }
-                this.input.val(value);
-                this.input.trigger('change',this.type(),value);
+                this.element.val(value);
+                this.element.trigger('change',this.type(),value);
             }
         },
         type: function(type) {
@@ -516,9 +371,7 @@
                 var opt = this.typeMap[type];
                 if (opt && this.propertyType !== type) {
                     this.propertyType = type;
-                    if (this.typeField) {
-                        this.typeField.val(type);
-                    }
+                    this.typeField.val(type);
                     this.selectLabel.empty();
                     var image;
                     if (opt.icon) {
@@ -535,87 +388,16 @@
                         }
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.show();
-                            if (!opt.hasValue) {
-                                this.elementDiv.hide();
-                            } else {
-                                this.elementDiv.show();
-                            }
-                            this.activeOptions = {};
-                            opt.options.forEach(function(o) {
-                                if (typeof o === 'string') {
-                                    that.activeOptions[o] = {label:o,value:o};
-                                } else {
-                                    that.activeOptions[o.value] = o;
-                                }
-                            });
-
-                            if (!that.activeOptions.hasOwnProperty(that.optionValue)) {
-                                that.optionValue = null;
-                            }
+                            this.elementDiv.hide();
                             this.optionMenu = this._createMenu(opt.options,function(v){
-                                that._updateOptionSelectLabel(that.activeOptions[v]);
-                                if (!opt.hasValue) {
-                                    that.value(that.activeOptions[v].value)
-                                }
+                                that.optionSelectLabel.text(v);
+                                that.value(v);
                             });
-                            var op;
-                            if (!opt.hasValue) {
-                                var currentVal = this.input.val();
-                                var validValue = false;
-                                for (var i=0;i<opt.options.length;i++) {
-                                    op = opt.options[i];
-                                    if (typeof op === "string" && op === currentVal) {
-                                        that._updateOptionSelectLabel({value:currentVal});
-                                        validValue = true;
-                                        break;
-                                    } else if (op.value === currentVal) {
-                                        that._updateOptionSelectLabel(op);
-                                        validValue = true;
-                                        break;
-                                    }
-                                }
-                                if (!validValue) {
-                                    op = opt.options[0];
-                                    if (typeof op === "string") {
-                                        this.value(op);
-                                        that._updateOptionSelectLabel({value:op});
-                                    } else {
-                                        this.value(op.value);
-                                        that._updateOptionSelectLabel(op);
-                                    }
-                                }
+                            var currentVal = this.element.val();
+                            if (opt.options.indexOf(currentVal) !== -1) {
+                                this.optionSelectLabel.text(currentVal);
                             } else {
-                                var selectedOption = this.optionValue||opt.options[0];
-                                if (opt.parse) {
-                                    var parts = opt.parse(this.input.val());
-                                    if (parts.option) {
-                                        selectedOption = parts.option;
-                                        if (!this.activeOptions.hasOwnProperty(selectedOption)) {
-                                            parts.option = Object.keys(this.activeOptions)[0];
-                                            selectedOption = parts.option
-                                        }
-                                    }
-                                    this.input.val(parts.value);
-                                    if (opt.export) {
-                                        this.element.val(opt.export(parts.value,parts.option||selectedOption));
-                                    }
-                                }
-                                if (typeof selectedOption === "string") {
-                                    this.optionValue = selectedOption;
-                                    if (!this.activeOptions.hasOwnProperty(selectedOption)) {
-                                        selectedOption = Object.keys(this.activeOptions)[0];
-                                    }
-                                    if (!selectedOption) {
-                                        this.optionSelectTrigger.hide();
-                                    } else {
-                                        this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
-                                    }
-                                } else if (selectedOption) {
-                                    this.optionValue = selectedOption.value;
-                                    this._updateOptionSelectLabel(selectedOption);
-                                } else {
-                                    this.optionSelectTrigger.hide();
-                                }
+                                this.value(opt.options[0]);
                             }
                         }
                     } else {
@@ -627,29 +409,27 @@
                             this.optionSelectTrigger.hide();
                         }
                         if (opt.hasValue === false) {
-                            this.oldValue = this.input.val();
-                            this.input.val("");
+                            this.oldValue = this.element.val();
+                            this.element.val("");
                             this.elementDiv.hide();
                         } else {
                             if (this.oldValue !== undefined) {
-                                this.input.val(this.oldValue);
+                                this.element.val(this.oldValue);
                                 delete this.oldValue;
                             }
                             this.elementDiv.show();
                         }
-                        if (this.optionExpandButton) {
-                            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();
-                            }
+                        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.input.trigger('change',this.propertyType,this.value());
+                        this.element.trigger('change',this.propertyType,this.value());
                     }
                     if (image) {
                         image.onload = function() { that._resize(); }

editor/js/ui/deploy.js

@@ -97,6 +97,113 @@ RED.deploy = (function() {
 
         RED.actions.add("core:deploy-flows",save);
 
+        $( "#node-dialog-confirm-deploy" ).dialog({
+                title: RED._('deploy.confirm.button.confirm'),
+                modal: true,
+                autoOpen: false,
+                width: 550,
+                height: "auto",
+                buttons: [
+                    {
+                        text: RED._("common.label.cancel"),
+                        click: function() {
+                            $( 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() {
+
+                            var ignoreChecked = $( "#node-dialog-confirm-deploy-hide" ).prop("checked");
+                            if (ignoreChecked) {
+                                ignoreDeployWarnings[$( "#node-dialog-confirm-deploy-type" ).val()] = true;
+                            }
+                            save(true,/conflict/.test($("#node-dialog-confirm-deploy-type" ).val()));
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "node-dialog-confirm-deploy-overwrite",
+                        text: RED._("deploy.confirm.button.overwrite"),
+                        class: "primary",
+                        click: function() {
+                            save(true,/conflict/.test($("#node-dialog-confirm-deploy-type" ).val()));
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                ],
+                create: function() {
+                    $("#node-dialog-confirm-deploy").parent().find("div.ui-dialog-buttonpane")
+                        .prepend('<div style="height:0; vertical-align: middle; display:inline-block; margin-top: 13px; float:left;">'+
+                                   '<input style="vertical-align:top;" type="checkbox" id="node-dialog-confirm-deploy-hide"> '+
+                                   '<label style="display:inline;" for="node-dialog-confirm-deploy-hide" data-i18n="deploy.confirm.doNotWarn"></label>'+
+                                   '<input type="hidden" id="node-dialog-confirm-deploy-type">'+
+                                   '</div>');
+                },
+                open: function() {
+                    var deployType = $("#node-dialog-confirm-deploy-type" ).val();
+                    if (/conflict/.test(deployType)) {
+                        $( "#node-dialog-confirm-deploy" ).dialog('option','title', RED._('deploy.confirm.button.review'));
+                        $("#node-dialog-confirm-deploy-deploy").hide();
+                        $("#node-dialog-confirm-deploy-review").addClass('disabled').show();
+                        $("#node-dialog-confirm-deploy-merge").addClass('disabled').show();
+                        $("#node-dialog-confirm-deploy-overwrite").toggle(deployType === "deploy-conflict");
+                        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-hide").parent().hide();
+                    } else {
+                        $( "#node-dialog-confirm-deploy" ).dialog('option','title', RED._('deploy.confirm.button.confirm'));
+                        $("#node-dialog-confirm-deploy-deploy").show();
+                        $("#node-dialog-confirm-deploy-overwrite").hide();
+                        $("#node-dialog-confirm-deploy-review").hide();
+                        $("#node-dialog-confirm-deploy-merge").hide();
+                        $("#node-dialog-confirm-deploy-hide").parent().show();
+                    }
+                }
+        });
 
         RED.events.on('nodes:change',function(state) {
             if (state.dirty) {
@@ -117,30 +224,24 @@ RED.deploy = (function() {
                 if (currentRev === null || deployInflight || currentRev === msg.revision) {
                     return;
                 }
-                var message = $('<p>').text(RED._('deploy.confirm.backgroundUpdate'));
-                activeNotifyMessage = RED.notify(message,{
-                    modal: true,
-                    fixed: true,
-                    buttons: [
-                        {
-                            text: RED._('deploy.confirm.button.ignore'),
-                            click: function() {
-                                activeNotifyMessage.close();
-                                activeNotifyMessage = null;
-                            }
-                        },
-                        {
-                            text: RED._('deploy.confirm.button.review'),
-                            class: "primary",
-                            click: function() {
-                                activeNotifyMessage.close();
-                                var nns = RED.nodes.createCompleteNodeSet();
-                                resolveConflict(nns,false);
-                                activeNotifyMessage = null;
-                            }
-                        }
-                    ]
-                });
+                var message = $('<div>'+RED._('deploy.confirm.backgroundUpdate')+
+                    '<br><br><div class="ui-dialog-buttonset">'+
+                    '<button>'+RED._('deploy.confirm.button.ignore')+'</button>'+
+                    '<button class="primary">'+RED._('deploy.confirm.button.review')+'</button>'+
+                    '</div></div>');
+                $(message.find('button')[0]).click(function(evt) {
+                    evt.preventDefault();
+                    activeNotifyMessage.close();
+                    activeNotifyMessage = null;
+                })
+                $(message.find('button')[1]).click(function(evt) {
+                    evt.preventDefault();
+                    activeNotifyMessage.close();
+                    var nns = RED.nodes.createCompleteNodeSet();
+                    resolveConflict(nns,false);
+                    activeNotifyMessage = null;
+                })
+                activeNotifyMessage = RED.notify(message,null,true);
             }
         });
     }
@@ -170,99 +271,16 @@ RED.deploy = (function() {
     }
 
     function resolveConflict(currentNodes, activeDeploy) {
-        var message = $('<div>');
-        $('<p data-i18n="deploy.confirm.conflict"></p>').appendTo(message);
-        var conflictCheck = $('<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>').appendTo(message);
-        var conflictAutoMerge = $('<div class="node-dialog-confirm-conflict-row">'+
-            '<i style="color: #3a3;" class="fa fa-check"></i><div data-i18n="deploy.confirm.conflictAutoMerge"></div>'+
-            '</div>').hide().appendTo(message);
-        var conflictManualMerge = $('<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>').hide().appendTo(message);
-
-        message.i18n();
-        currentDiff = null;
-        var buttons = [
-            {
-                text: RED._("common.label.cancel"),
-                click: function() {
-                    conflictNotification.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();
-                        conflictNotification.close();
-                    }
-                }
-            },
-            {
-                id: "node-dialog-confirm-deploy-merge",
-                text: RED._("deploy.confirm.button.merge"),
-                class: "primary disabled",
-                click: function() {
-                    if (!$("#node-dialog-confirm-deploy-merge").hasClass('disabled')) {
-                        RED.diff.mergeDiff(currentDiff);
-                        conflictNotification.close();
-                    }
-                }
-            }
-        ];
-        if (activeDeploy) {
-            buttons.push({
-                id: "node-dialog-confirm-deploy-overwrite",
-                text: RED._("deploy.confirm.button.overwrite"),
-                class: "primary",
-                click: function() {
-                    save(true,activeDeploy);
-                    conflictNotification.close();
-                }
-            })
-        }
-        var conflictNotification = RED.notify(message,{
-            modal: true,
-            fixed: true,
-            width: 600,
-            buttons: buttons
-        });
-
-        var now = Date.now();
-        RED.diff.getRemoteDiff(function(diff) {
-            var ellapsed = Math.max(1000 - (Date.now()-now), 0);
-            currentDiff = diff;
-            setTimeout(function() {
-                conflictCheck.hide();
-                var d = Object.keys(diff.conflicts);
-                if (d.length === 0) {
-                    conflictAutoMerge.show();
-                    $("#node-dialog-confirm-deploy-merge").removeClass('disabled')
-                } else {
-                    conflictManualMerge.show();
-                }
-                $("#node-dialog-confirm-deploy-review").removeClass('disabled')
-            },ellapsed);
-        })
-    }
-    function cropList(list) {
-        if (list.length > 5) {
-            var remainder = list.length - 5;
-            list = list.slice(0,5);
-            list.push(RED._("deploy.confirm.plusNMore",{count:remainder}));
-        }
-        return list;
+        $( "#node-dialog-confirm-deploy-config" ).hide();
+        $( "#node-dialog-confirm-deploy-unknown" ).hide();
+        $( "#node-dialog-confirm-deploy-unused" ).hide();
+        $( "#node-dialog-confirm-deploy-conflict" ).show();
+        $( "#node-dialog-confirm-deploy-type" ).val(activeDeploy?"deploy-conflict":"background-conflict");
+        $( "#node-dialog-confirm-deploy" ).dialog( "open" );
     }
+
     function save(skipValidation,force) {
         if (!$("#btn-deploy").hasClass("disabled")) {
-            if (!RED.user.hasPermission("flows.write")) {
-                RED.notify(RED._("user.errors.deploy"),"error");
-                return;
-            }
             if (!skipValidation) {
                 var hasUnknown = false;
                 var hasInvalid = false;
@@ -292,62 +310,39 @@ RED.deploy = (function() {
                     }
                 });
 
+                $( "#node-dialog-confirm-deploy-config" ).hide();
+                $( "#node-dialog-confirm-deploy-unknown" ).hide();
+                $( "#node-dialog-confirm-deploy-unused" ).hide();
+                $( "#node-dialog-confirm-deploy-conflict" ).hide();
+
                 var showWarning = false;
-                var notificationMessage;
-                var notificationButtons = [];
-                var notification;
+
                 if (hasUnknown && !ignoreDeployWarnings.unknown) {
                     showWarning = true;
-                    notificationMessage = "<p>"+RED._('deploy.confirm.unknown')+"</p>"+
-                        '<ul class="node-dialog-configm-deploy-list"><li>'+cropList(unknownNodes).join("</li><li>")+"</li></ul><p>"+
-                        RED._('deploy.confirm.confirm')+
-                        "</p>";
-
-                    notificationButtons= [
-                        {
-                            id: "node-dialog-confirm-deploy-deploy",
-                            text: RED._("deploy.confirm.button.confirm"),
-                            class: "primary",
-                            click: function() {
-                                save(true);
-                                notification.close();
-                            }
-                        }
-                    ];
+                    $( "#node-dialog-confirm-deploy-type" ).val("unknown");
+                    $( "#node-dialog-confirm-deploy-unknown" ).show();
+                    $( "#node-dialog-confirm-deploy-unknown-list" )
+                        .html("<li>"+unknownNodes.join("</li><li>")+"</li>");
                 } else if (hasInvalid && !ignoreDeployWarnings.invalid) {
                     showWarning = true;
+                    $( "#node-dialog-confirm-deploy-type" ).val("invalid");
+                    $( "#node-dialog-confirm-deploy-config" ).show();
                     invalidNodes.sort(sortNodeInfo);
+                    $( "#node-dialog-confirm-deploy-invalid-list" )
+                        .html("<li>"+invalidNodes.map(function(A) { return (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")"}).join("</li><li>")+"</li>");
 
-                    notificationMessage = "<p>"+RED._('deploy.confirm.improperlyConfigured')+"</p>"+
-                        '<ul class="node-dialog-configm-deploy-list"><li>'+cropList(invalidNodes.map(function(A) { return (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")"})).join("</li><li>")+"</li></ul><p>"+
-                        RED._('deploy.confirm.confirm')+
-                        "</p>";
-                    notificationButtons= [
-                        {
-                            id: "node-dialog-confirm-deploy-deploy",
-                            text: RED._("deploy.confirm.button.confirm"),
-                            class: "primary",
-                            click: function() {
-                                save(true);
-                                notification.close();
-                            }
-                        }
-                    ];
+                } else if (hasUnusedConfig && !ignoreDeployWarnings.unusedConfig) {
+                    // showWarning = true;
+                    // $( "#node-dialog-confirm-deploy-type" ).val("unusedConfig");
+                    // $( "#node-dialog-confirm-deploy-unused" ).show();
+                    //
+                    // unusedConfigNodes.sort(sortNodeInfo);
+                    // $( "#node-dialog-confirm-deploy-unused-list" )
+                    //     .html("<li>"+unusedConfigNodes.map(function(A) { return (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")"}).join("</li><li>")+"</li>");
                 }
                 if (showWarning) {
-                    notificationButtons.unshift(
-                        {
-                            text: RED._("common.label.cancel"),
-                            click: function() {
-                                notification.close();
-                            }
-                        }
-                    );
-                    notification = RED.notify(notificationMessage,{
-                        modal: true,
-                        fixed: true,
-                        buttons:notificationButtons
-                    });
+                    $( "#node-dialog-confirm-deploy-hide" ).prop("checked",false);
+                    $( "#node-dialog-confirm-deploy" ).dialog( "open" );
                     return;
                 }
             }
@@ -387,7 +382,7 @@ RED.deploy = (function() {
                     '<p>'+RED._("deploy.successfulDeploy")+'</p>'+
                     '<p>'+RED._("deploy.unusedConfigNodes")+' <a href="#" onclick="RED.sidebar.config.show(true); return false;">'+RED._("deploy.unusedConfigNodesLink")+'</a></p>',"success",false,6000);
                 } else {
-                    RED.notify('<p>'+RED._("deploy.successfulDeploy")+'</p>',"success");
+                    RED.notify(RED._("deploy.successfulDeploy"),"success");
                 }
                 RED.nodes.eachNode(function(node) {
                     if (node.changed) {
@@ -408,12 +403,9 @@ RED.deploy = (function() {
                         delete confNode.credentials;
                     }
                 });
-                RED.nodes.eachSubflow(function(subflow) {
-                    subflow.changed = false;
-                });
                 RED.nodes.eachWorkspace(function(ws) {
                     ws.changed = false;
-                });
+                })
                 // Once deployed, cannot undo back to a clean state
                 RED.history.markAllDirty();
                 RED.view.redraw();
@@ -445,10 +437,6 @@ RED.deploy = (function() {
         }
     }
     return {
-        init: init,
-        setDeployInflight: function(state) {
-            deployInflight = state;
-        }
-
+        init: init
     }
 })();

editor/js/ui/editors/buffer.js

@@ -1,209 +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.editor.types._buffer = (function() {
-
-
-    var template = '<script type="text/x-red" data-template-name="_buffer"><div id="node-input-buffer-panels"><div id="node-input-buffer-panel-str" class="red-ui-panel"><div class="form-row" style="margin-bottom: 3px; text-align: right;"><span class="node-input-buffer-type"><i class="fa fa-exclamation-circle"></i> <span id="node-input-buffer-type-string" data-i18n="bufferEditor.modeString"></span><span id="node-input-buffer-type-array" data-i18n="bufferEditor.modeArray"></span></span></div><div class="form-row node-text-editor-row"><div class="node-text-editor" id="node-input-buffer-str"></div></div></div><div id="node-input-buffer-panel-bin" class="red-ui-panel"><div class="form-row node-text-editor-row" style="margin-top: 10px"><div class="node-text-editor" id="node-input-buffer-bin"></div></div></div></div></script>';
-
-    function stringToUTF8Array(str) {
-        var data = [];
-        var i=0, l = str.length;
-        for (i=0; i<l; i++) {
-            var char = str.charCodeAt(i);
-            if (char < 0x80) {
-                data.push(char);
-            } else if (char < 0x800) {
-                data.push(0xc0 | (char >> 6));
-                data.push(0x80 | (char & 0x3f));
-            } else if (char < 0xd800 || char >= 0xe000) {
-                data.push(0xe0 | (char >> 12));
-                data.push(0x80 | ((char>>6) & 0x3f));
-                data.push(0x80 | (char & 0x3f));
-            } else {
-                i++;
-                char = 0x10000 + (((char & 0x3ff)<<10) | (str.charAt(i) & 0x3ff));
-                data.push(0xf0 | (char >>18));
-                data.push(0x80 | ((char>>12) & 0x3f));
-                data.push(0x80 | ((char>>6) & 0x3f));
-                data.push(0x80 | (char & 0x3f));
-            }
-        }
-        return data;
-    }
-
-
-    return {
-        init: function() {
-            $(template).appendTo(document.body);
-        },
-        show: function(options) {
-            var value = options.value;
-            var onComplete = options.complete;
-            var type = "_buffer"
-            RED.view.state(RED.state.EDITING);
-            var bufferStringEditor = [];
-            var bufferBinValue;
-
-            var panels;
-
-            var trayOptions = {
-                title: options.title,
-                width: "inherit",
-                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() {
-                            onComplete(JSON.stringify(bufferBinValue));
-                            RED.tray.close();
-                        }
-                    }
-                ],
-                resize: function(dimensions) {
-                    var height = $("#dialog-form").height();
-                    if (panels) {
-                        panels.resize(height);
-                    }
-                },
-                open: function(tray) {
-                    var trayBody = tray.find('.editor-tray-body');
-                    var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
-
-                    bufferStringEditor = RED.editor.createEditor({
-                        id: 'node-input-buffer-str',
-                        value: "",
-                        mode:"ace/mode/text"
-                    });
-                    bufferStringEditor.getSession().setValue(value||"",-1);
-
-                    bufferBinEditor = RED.editor.createEditor({
-                        id: 'node-input-buffer-bin',
-                        value: "",
-                        mode:"ace/mode/text",
-                        readOnly: true
-                    });
-
-                    var changeTimer;
-                    var buildBuffer = function(data) {
-                        var valid = true;
-                        var isString = typeof data === 'string';
-                        var binBuffer = [];
-                        if (isString) {
-                            bufferBinValue = stringToUTF8Array(data);
-                        } else {
-                            bufferBinValue = data;
-                        }
-                        var i=0,l=bufferBinValue.length;
-                        var c = 0;
-                        for(i=0;i<l;i++) {
-                            var d = parseInt(bufferBinValue[i]);
-                            if (!isString && (isNaN(d) || d < 0 || d > 255)) {
-                                valid = false;
-                                break;
-                            }
-                            if (i>0) {
-                                if (i%8 === 0) {
-                                    if (i%16 === 0) {
-                                        binBuffer.push("\n");
-                                    } else {
-                                        binBuffer.push("  ");
-                                    }
-                                } else {
-                                    binBuffer.push(" ");
-                                }
-                            }
-                            binBuffer.push((d<16?"0":"")+d.toString(16).toUpperCase());
-                        }
-                        if (valid) {
-                            $("#node-input-buffer-type-string").toggle(isString);
-                            $("#node-input-buffer-type-array").toggle(!isString);
-                            bufferBinEditor.setValue(binBuffer.join(""),1);
-                        }
-                        return valid;
-                    }
-                    var bufferStringUpdate = function() {
-                        var value = bufferStringEditor.getValue();
-                        var isValidArray = false;
-                        if (/^[\s]*\[[\s\S]*\][\s]*$/.test(value)) {
-                            isValidArray = true;
-                            try {
-                                var data = JSON.parse(value);
-                                isValidArray = buildBuffer(data);
-                            } catch(err) {
-                                isValidArray = false;
-                            }
-                        }
-                        if (!isValidArray) {
-                            buildBuffer(value);
-                        }
-
-                    }
-                    bufferStringEditor.getSession().on('change', function() {
-                        clearTimeout(changeTimer);
-                        changeTimer = setTimeout(bufferStringUpdate,200);
-                    });
-
-                    bufferStringUpdate();
-
-                    dialogForm.i18n();
-
-                    panels = RED.panels.create({
-                        id:"node-input-buffer-panels",
-                        resize: function(p1Height,p2Height) {
-                            var p1 = $("#node-input-buffer-panel-str");
-                            p1Height -= $(p1.children()[0]).outerHeight(true);
-                            var editorRow = $(p1.children()[1]);
-                            p1Height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                            $("#node-input-buffer-str").css("height",(p1Height-5)+"px");
-                            bufferStringEditor.resize();
-
-                            var p2 = $("#node-input-buffer-panel-bin");
-                            editorRow = $(p2.children()[0]);
-                            p2Height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                            $("#node-input-buffer-bin").css("height",(p2Height-5)+"px");
-                            bufferBinEditor.resize();
-                        }
-                    });
-
-                    $(".node-input-buffer-type").click(function(e) {
-                        e.preventDefault();
-                        RED.sidebar.info.set(RED._("bufferEditor.modeDesc"));
-                        RED.sidebar.info.show();
-                    })
-
-
-                },
-                close: function() {
-                    if (options.onclose) {
-                        options.onclose();
-                    }
-                    bufferStringEditor.destroy();
-                    bufferBinEditor.destroy();
-                },
-                show: function() {}
-            }
-            RED.tray.show(trayOptions);
-        }
-    }
-})();

editor/js/ui/editors/expression.js

@@ -1,325 +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.editor.types._expression = (function() {
-
-
-    var template = '<script type="text/x-red" data-template-name="_expression"><div id="node-input-expression-panels"><div id="node-input-expression-panel-expr" class="red-ui-panel"><div class="form-row" style="margin-bottom: 3px; text-align: right;"><span class="node-input-expression-legacy"><i class="fa fa-exclamation-circle"></i> <span data-i18n="expressionEditor.compatMode"></span></span><button id="node-input-expression-reformat" class="editor-button editor-button-small"><span data-i18n="expressionEditor.format"></span></button></div><div class="form-row node-text-editor-row"><div class="node-text-editor" id="node-input-expression"></div></div></div><div id="node-input-expression-panel-info" class="red-ui-panel"><div class="form-row"><ul id="node-input-expression-tabs"></ul><div id="node-input-expression-tab-help" class="node-input-expression-tab-content hide"><div><select id="node-input-expression-func"></select><button id="node-input-expression-func-insert" class="editor-button" data-i18n="expressionEditor.insert"></button></div><div id="node-input-expression-help"></div></div><div id="node-input-expression-tab-test" class="node-input-expression-tab-content hide"><div><span style="display: inline-block; width: calc(50% - 5px);"><span data-i18n="expressionEditor.data"></span><button style="float: right; margin-right: 5px;" id="node-input-example-reformat" class="editor-button editor-button-small"><span data-i18n="jsonEditor.format"></span></button></span><span style="display: inline-block; width: calc(50% - 5px);" data-i18n="expressionEditor.result"></span></div><div style="display: inline-block; width: calc(50% - 5px);" class="node-text-editor" id="node-input-expression-test-data"></div><div style="display: inline-block; width: calc(50% - 5px);" class="node-text-editor" id="node-input-expression-test-result"></div></div></div></div></div></script>';
-    var expressionTestCache = {};
-
-    return {
-        init: function() {
-            $(template).appendTo(document.body);
-        },
-        show: function(options) {
-            var expressionTestCacheId = options.parent||"_";
-            var value = options.value;
-            var onComplete = options.complete;
-            var type = "_expression"
-            RED.view.state(RED.state.EDITING);
-            var expressionEditor;
-            var testDataEditor;
-            var testResultEditor
-            var panels;
-
-            var trayOptions = {
-                title: options.title,
-                width: "inherit",
-                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").text("");
-                            onComplete(expressionEditor.getValue());
-                            RED.tray.close();
-                        }
-                    }
-                ],
-                resize: function(dimensions) {
-                    var height = $("#dialog-form").height();
-                    if (panels) {
-                        panels.resize(height);
-                    }
-
-                },
-                open: function(tray) {
-                    var trayBody = tray.find('.editor-tray-body');
-                    trayBody.addClass("node-input-expression-editor")
-                    var dialogForm = RED.editor.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();
-                    });
-                    $("#node-input-expression-reformat").click(function(evt) {
-                        evt.preventDefault();
-                        var v = expressionEditor.getValue()||"";
-                        try {
-                            v = jsonata.format(v);
-                        } catch(err) {
-                            // TODO: do an optimistic auto-format
-                        }
-                        expressionEditor.getSession().setValue(v||"",-1);
-                    });
-
-                    var tabs = RED.tabs.create({
-                        element: $("#node-input-expression-tabs"),
-                        onchange:function(tab) {
-                            $(".node-input-expression-tab-content").hide();
-                            tab.content.show();
-                            trayOptions.resize();
-                        }
-                    })
-
-                    tabs.addTab({
-                        id: 'expression-help',
-                        label: RED._('expressionEditor.functionReference'),
-                        content: $("#node-input-expression-tab-help")
-                    });
-                    tabs.addTab({
-                        id: 'expression-tests',
-                        label: RED._('expressionEditor.test'),
-                        content: $("#node-input-expression-tab-test")
-                    });
-                    testDataEditor = RED.editor.createEditor({
-                        id: 'node-input-expression-test-data',
-                        value: expressionTestCache[expressionTestCacheId] || '{\n    "payload": "hello world"\n}',
-                        mode:"ace/mode/json",
-                        lineNumbers: false
-                    });
-                    var changeTimer;
-                    $(".node-input-expression-legacy").click(function(e) {
-                        e.preventDefault();
-                        RED.sidebar.info.set(RED._("expressionEditor.compatModeDesc"));
-                        RED.sidebar.info.show();
-                    })
-                    var testExpression = function() {
-                        var value = testDataEditor.getValue();
-                        var parsedData;
-                        var currentExpression = expressionEditor.getValue();
-                        var expr;
-                        var usesContext = false;
-                        var legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
-                        $(".node-input-expression-legacy").toggle(legacyMode);
-                        try {
-                            expr = jsonata(currentExpression);
-                            expr.assign('flowContext',function(val) {
-                                usesContext = true;
-                                return null;
-                            });
-                            expr.assign('globalContext',function(val) {
-                                usesContext = true;
-                                return null;
-                            });
-                        } catch(err) {
-                            testResultEditor.setValue(RED._("expressionEditor.errors.invalid-expr",{message:err.message}),-1);
-                            return;
-                        }
-                        try {
-                            parsedData = JSON.parse(value);
-                        } catch(err) {
-                            testResultEditor.setValue(RED._("expressionEditor.errors.invalid-msg",{message:err.toString()}))
-                            return;
-                        }
-
-                        try {
-                            var result = expr.evaluate(legacyMode?{msg:parsedData}:parsedData);
-                            if (usesContext) {
-                                testResultEditor.setValue(RED._("expressionEditor.errors.context-unsupported"),-1);
-                                return;
-                            }
-
-                            var formattedResult;
-                            if (result !== undefined) {
-                                formattedResult = JSON.stringify(result,null,4);
-                            } else {
-                                formattedResult = RED._("expressionEditor.noMatch");
-                            }
-                            testResultEditor.setValue(formattedResult,-1);
-                        } catch(err) {
-                            testResultEditor.setValue(RED._("expressionEditor.errors.eval",{message:err.message}),-1);
-                        }
-                    }
-
-                    testDataEditor.getSession().on('change', function() {
-                        clearTimeout(changeTimer);
-                        changeTimer = setTimeout(testExpression,200);
-                        expressionTestCache[expressionTestCacheId] = testDataEditor.getValue();
-                    });
-                    expressionEditor.getSession().on('change', function() {
-                        clearTimeout(changeTimer);
-                        changeTimer = setTimeout(testExpression,200);
-                    });
-
-                    testResultEditor = RED.editor.createEditor({
-                        id: 'node-input-expression-test-result',
-                        value: "",
-                        mode:"ace/mode/json",
-                        lineNumbers: false,
-                        readOnly: true
-                    });
-                    panels = RED.panels.create({
-                        id:"node-input-expression-panels",
-                        resize: function(p1Height,p2Height) {
-                            var p1 = $("#node-input-expression-panel-expr");
-                            p1Height -= $(p1.children()[0]).outerHeight(true);
-                            var editorRow = $(p1.children()[1]);
-                            p1Height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                            $("#node-input-expression").css("height",(p1Height-5)+"px");
-                            expressionEditor.resize();
-
-                            var p2 = $("#node-input-expression-panel-info > .form-row > div:first-child");
-                            p2Height -= p2.outerHeight(true) + 20;
-                            $(".node-input-expression-tab-content").height(p2Height);
-                            $("#node-input-expression-test-data").css("height",(p2Height-5)+"px");
-                            testDataEditor.resize();
-                            $("#node-input-expression-test-result").css("height",(p2Height-5)+"px");
-                            testResultEditor.resize();
-                        }
-                    });
-
-                    $("#node-input-example-reformat").click(function(evt) {
-                        evt.preventDefault();
-                        var v = testDataEditor.getValue()||"";
-                        try {
-                            v = JSON.stringify(JSON.parse(v),null,4);
-                        } catch(err) {
-                            // TODO: do an optimistic auto-format
-                        }
-                        testDataEditor.getSession().setValue(v||"",-1);
-                    });
-
-                    testExpression();
-                },
-                close: function() {
-                    if (options.onclose) {
-                        options.onclose();
-                    }
-                    expressionEditor.destroy();
-                    testDataEditor.destroy();
-                },
-                show: function() {}
-            }
-            RED.tray.show(trayOptions);
-        }
-    }
-})();

editor/js/ui/editors/js.js

@@ -1,103 +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.editor.types._js = (function() {
-
-
-    var template = '<script type="text/x-red" data-template-name="_js"><div class="form-row node-text-editor-row" style="width: 700px"><div style="height: 200px;min-height: 150px;" class="node-text-editor" id="node-input-js"></div></div></script>';
-
-    return {
-        init: function() {
-            $(template).appendTo(document.body);
-        },
-        show: function(options) {
-            var value = options.value;
-            var onComplete = options.complete;
-            var type = "_js"
-            RED.view.state(RED.state.EDITING);
-            var expressionEditor;
-            var changeTimer;
-
-            var trayOptions = {
-                title: options.title,
-                width: "inherit",
-                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() {
-                            onComplete(expressionEditor.getValue(),expressionEditor.getCursorPosition());
-                            RED.tray.close();
-                        }
-                    }
-                ],
-                resize: function(dimensions) {
-                    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 = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
-                    expressionEditor = RED.editor.createEditor({
-                        id: 'node-input-js',
-                        mode: 'ace/mode/javascript',
-                        value: value,
-                        globals: {
-                            msg:true,
-                            context:true,
-                            RED: true,
-                            util: true,
-                            flow: true,
-                            global: true,
-                            console: true,
-                            Buffer: true,
-                            setTimeout: true,
-                            clearTimeout: true,
-                            setInterval: true,
-                            clearInterval: true
-                        }
-                    });
-                    if (options.cursor) {
-                        expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
-                    }
-                    dialogForm.i18n();
-                },
-                close: function() {
-                    expressionEditor.destroy();
-                    if (options.onclose) {
-                        options.onclose();
-                    }
-                },
-                show: function() {}
-            }
-            RED.tray.show(trayOptions);
-        }
-    }
-})();

editor/js/ui/editors/json.js

@@ -1,118 +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.editor.types._json = (function() {
-
-
-    var template = '<script type="text/x-red" data-template-name="_json"><div class="form-row" style="margin-bottom: 3px; text-align: right;"><button id="node-input-json-reformat" class="editor-button editor-button-small"><span data-i18n="jsonEditor.format"></span></button></div><div class="form-row node-text-editor-row"><div style="height: 200px;min-height: 150px;" class="node-text-editor" id="node-input-json"></div></div></script>';
-
-    return {
-        init: function() {
-            $(template).appendTo(document.body);
-        },
-        show: function(options) {
-            var value = options.value;
-            var onComplete = options.complete;
-            var type = "_json"
-            RED.view.state(RED.state.EDITING);
-            var expressionEditor;
-            var changeTimer;
-
-            var checkValid = function() {
-                var v = expressionEditor.getValue();
-                try {
-                    JSON.parse(v);
-                    $("#node-dialog-ok").removeClass('disabled');
-                    return true;
-                } catch(err) {
-                    $("#node-dialog-ok").addClass('disabled');
-                    return false;
-                }
-            }
-            var trayOptions = {
-                title: options.title,
-                width: "inherit",
-                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() {
-                            if (options.requireValid && !checkValid()) {
-                                return;
-                            }
-                            onComplete(expressionEditor.getValue());
-                            RED.tray.close();
-                        }
-                    }
-                ],
-                resize: function(dimensions) {
-                    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 = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
-                    expressionEditor = RED.editor.createEditor({
-                        id: 'node-input-json',
-                        value: "",
-                        mode:"ace/mode/json"
-                    });
-                    expressionEditor.getSession().setValue(value||"",-1);
-                    if (options.requireValid) {
-                        expressionEditor.getSession().on('change', function() {
-                            clearTimeout(changeTimer);
-                            changeTimer = setTimeout(checkValid,200);
-                        });
-                        checkValid();
-                    }
-                    $("#node-input-json-reformat").click(function(evt) {
-                        evt.preventDefault();
-                        var v = expressionEditor.getValue()||"";
-                        try {
-                            v = JSON.stringify(JSON.parse(v),null,4);
-                        } catch(err) {
-                            // TODO: do an optimistic auto-format
-                        }
-                        expressionEditor.getSession().setValue(v||"",-1);
-                    });
-                    dialogForm.i18n();
-                },
-                close: function() {
-                    expressionEditor.destroy();
-                    if (options.onclose) {
-                        options.onclose();
-                    }
-                },
-                show: function() {}
-            }
-            RED.tray.show(trayOptions);
-        }
-    }
-})();

editor/js/ui/editors/markdown.js

@@ -1,90 +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.editor.types._markdown = (function() {
-
-
-    var template = '<script type="text/x-red" data-template-name="_markdown"><div class="form-row" id="node-input-markdown-title" style="margin-bottom: 3px; text-align: right;"></div><div class="form-row node-text-editor-row"><div style="height: 200px;min-height: 150px;" class="node-text-editor" id="node-input-markdown"></div></div></script>';
-
-    return {
-        init: function() {
-            $(template).appendTo(document.body);
-        },
-        show: function(options) {
-            var value = options.value;
-            var onComplete = options.complete;
-            var type = "_markdown"
-            RED.view.state(RED.state.EDITING);
-            var expressionEditor;
-
-            var trayOptions = {
-                title: options.title,
-                width: "inherit",
-                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() {
-                            onComplete(expressionEditor.getValue());
-                            RED.tray.close();
-                        }
-                    }
-                ],
-                resize: function(dimensions) {
-                    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 = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
-                    expressionEditor = RED.editor.createEditor({
-                        id: 'node-input-markdown',
-                        value: value,
-                        mode:"ace/mode/markdown"
-                    });
-                    if (options.header) {
-                        options.header.appendTo(tray.find('#node-input-markdown-title'));
-                    }
-
-                    dialogForm.i18n();
-                },
-                close: function() {
-                    expressionEditor.destroy();
-                    if (options.onclose) {
-                        options.onclose();
-                    }
-                },
-                show: function() {}
-            }
-            RED.tray.show(trayOptions);
-
-        }
-    }
-})();

editor/js/ui/keyboard.js

@@ -57,24 +57,8 @@ RED.keyboard = (function() {
         173:189
     }
 
-    function migrateOldKeymap() {
-        if ('localStorage' in window && window['localStorage'] !== null) {
-            var oldKeyMap = localStorage.getItem("keymap");
-            if (oldKeyMap !== null) {
-                localStorage.removeItem("keymap");
-                var currentEditorSettings = RED.settings.get('editor') || {};
-                currentEditorSettings.keymap  = JSON.parse(oldKeyMap);
-                RED.settings.set('editor',currentEditorSettings);
-            }
-        }
-    }
     function init() {
-        // Migrate from pre-0.18
-        migrateOldKeymap();
-
-        var currentEditorSettings = RED.settings.get('editor') || {};
-        var userKeymap = currentEditorSettings.keymap || {};
-
+        var userKeymap = RED.settings.get('keymap') || {};
         $.getJSON("red/keymap.json",function(data) {
             for (var scope in data) {
                 if (data.hasOwnProperty(scope)) {
@@ -83,12 +67,12 @@ RED.keyboard = (function() {
                         if (keys.hasOwnProperty(key)) {
                             if (!userKeymap.hasOwnProperty(keys[key])) {
                                 addHandler(scope,key,keys[key],false);
+                                defaultKeyMap[keys[key]] = {
+                                    scope:scope,
+                                    key:key,
+                                    user:false
+                                };
                             }
-                            defaultKeyMap[keys[key]] = {
-                                scope:scope,
-                                key:key,
-                                user:false
-                            };
                         }
                     }
                 }
@@ -385,12 +369,8 @@ RED.keyboard = (function() {
                 container.removeClass('keyboard-shortcut-entry-expanded');
                 var shortcut = RED.keyboard.getShortcut(object.id);
                 var userKeymap = RED.settings.get('keymap') || {};
-
-                var currentEditorSettings = RED.settings.get('editor') || {};
-                var userKeymap = currentEditorSettings.keymap || {};
-                userKeymap[object.id] = null;
-                currentEditorSettings.keymap = userKeymap;
-                RED.settings.set('editor',currentEditorSettings);
+                delete userKeymap[object.id];
+                RED.settings.set('keymap',userKeymap);
 
                 var obj = {
                     id:object.id,
@@ -439,12 +419,9 @@ RED.keyboard = (function() {
                             object.scope = scope;
                             RED.keyboard.add(object.scope,object.key,object.id,true);
                         }
-
-                        var currentEditorSettings = RED.settings.get('editor') || {};
-                        var userKeymap = currentEditorSettings.keymap || {};
+                        var userKeymap = RED.settings.get('keymap') || {};
                         userKeymap[object.id] = RED.keyboard.getShortcut(object.id);
-                        currentEditorSettings.keymap = userKeymap;
-                        RED.settings.set('editor',currentEditorSettings);
+                        RED.settings.set('keymap',userKeymap);
                     }
                 }
             }

editor/js/ui/library.js

@@ -15,8 +15,8 @@
  **/
 RED.library = (function() {
 
+
     var exportToLibraryDialog;
-    var elementPrefix = "node-input-";
 
     function loadFlowLibrary() {
         $.getJSON("library/flows",function(data) {
@@ -38,7 +38,7 @@ RED.library = (function() {
                             li.className = "dropdown-submenu pull-left";
                             a = document.createElement("a");
                             a.href="#";
-                            var label = i.replace(/^@.*\//,"").replace(/^node-red-contrib-/,"").replace(/^node-red-node-/,"").replace(/-/," ").replace(/_/," ");
+                            var label = i.replace(/^node-red-contrib-/,"").replace(/^node-red-node-/,"").replace(/-/," ").replace(/_/," ");
                             a.innerHTML = label;
                             li.appendChild(a);
                             li.appendChild(buildMenu(data.d[i],root+(root!==""?"/":"")+i));
@@ -86,7 +86,6 @@ RED.library = (function() {
         var libraryData = {};
         var selectedLibraryItem = null;
         var libraryEditor = null;
-        elementPrefix = options.elementPrefix || "node-input-";
 
         // Orion editor has set/getText
         // ACE editor has set/getValue
@@ -158,8 +157,8 @@ RED.library = (function() {
             return ul;
         }
 
-        $('#'+elementPrefix+"name").css("width","calc(100% - 52px)").after(
-            '<div class="btn-group" style="margin-left:5px;">'+
+        $('#node-input-name').css("width","66%").after(
+            '<div class="btn-group" style="margin-left: 5px;">'+
             '<a id="node-input-'+options.type+'-lookup" class="editor-button" data-toggle="dropdown"><i class="fa fa-book"></i> <i class="fa fa-caret-down"></i></a>'+
             '<ul class="dropdown-menu pull-right" role="menu">'+
             '<li><a id="node-input-'+options.type+'-menu-open-library" tabindex="-1" href="#">'+RED._("library.openLibrary")+'</a></li>'+
@@ -188,7 +187,7 @@ RED.library = (function() {
 
         $('#node-input-'+options.type+'-menu-save-library').click(function(e) {
             //var found = false;
-            var name = $("#"+elementPrefix+"name").val().replace(/(^\s*)|(\s*$)/g,"");
+            var name = $("#node-input-name").val().replace(/(^\s*)|(\s*$)/g,"");
 
             //var buildPathList = function(data,root) {
             //    var paths = [];
@@ -265,7 +264,7 @@ RED.library = (function() {
                         if (selectedLibraryItem) {
                             for (var i=0; i<options.fields.length; i++) {
                                 var field = options.fields[i];
-                                $("#"+elementPrefix+field).val(selectedLibraryItem[field]);
+                                $("#node-input-"+field).val(selectedLibraryItem[field]);
                             }
                             options.editor.setValue(libraryEditor.getValue(),-1);
                         }
@@ -287,7 +286,7 @@ RED.library = (function() {
         });
 
         function saveToLibrary(overwrite) {
-            var name = $("#"+elementPrefix+"name").val().replace(/(^\s*)|(\s*$)/g,"");
+            var name = $("#node-input-name").val().replace(/(^\s*)|(\s*$)/g,"");
             if (name === "") {
                 name = RED._("library.unnamedType",{type:options.type});
             }
@@ -331,7 +330,7 @@ RED.library = (function() {
                 if (field == "name") {
                     data.name = name;
                 } else {
-                    data[field] = $("#"+elementPrefix+field).val();
+                    data[field] = $("#node-input-"+field).val();
                 }
             }
 
@@ -414,8 +413,12 @@ RED.library = (function() {
 
             RED.events.on("view:selection-changed",function(selection) {
                 if (!selection.nodes) {
+                    RED.menu.setDisabled("menu-item-export",true);
+                    RED.menu.setDisabled("menu-item-export-clipboard",true);
                     RED.menu.setDisabled("menu-item-export-library",true);
                 } else {
+                    RED.menu.setDisabled("menu-item-export",false);
+                    RED.menu.setDisabled("menu-item-export-clipboard",false);
                     RED.menu.setDisabled("menu-item-export-library",false);
                 }
             });

editor/js/ui/notifications.js

@@ -13,49 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-RED.notifications = (function() {
-
-    /*
-    // Example usage for a modal dialog with buttons
-    var myNotification = RED.notify("This is the message to display",{
-        modal: true,
-        fixed: true,
-        type: 'warning',
-        buttons: [
-            {
-                text: "cancel",
-                click: function(e) {
-                    myNotification.close();
-                }
-            },
-            {
-                text: "okay",
-                class:"primary",
-                click: function(e) {
-                    myNotification.close();
-                }
-            }
-        ]
-    });
-    */
-
-    var persistentNotifications = {};
-
+RED.notify = (function() {
     var currentNotifications = [];
     var c = 0;
-    function notify(msg,type,fixed,timeout) {
-        var options = {};
-        if (type !== null && typeof type === 'object') {
-            options = type;
-            fixed = options.fixed;
-            timeout = options.timeout;
-            type = options.type;
-        }
-
-        if (options.modal) {
-            $("#full-shade").show();
-        }
-
+    return function(msg,type,fixed,timeout) {
         if (currentNotifications.length > 4) {
             var ll = currentNotifications.length;
             for (var i = 0;ll > 4 && i<currentNotifications.length;i+=1) {
@@ -74,123 +35,38 @@ RED.notifications = (function() {
         if (type) {
             n.className = "notification notification-"+type;
         }
-        if (options.width) {
-            var parentWidth = $("#notifications").width();
-            if (options.width > parentWidth) {
-                var margin = -(options.width-parentWidth)/2;
-                $(n).css({
-                    width: options.width+"px",
-                    marginLeft: margin+"px"
-                })
-            }
-        }
         n.style.display = "none";
         if (typeof msg === "string") {
-            if (!/<p>/i.test(msg)) {
-                msg = "<p>"+msg+"</p>";
-            }
             n.innerHTML = msg;
         } else {
             $(n).append(msg);
         }
-        if (options.buttons) {
-            var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(n)
-            options.buttons.forEach(function(buttonDef) {
-                var b = $('<button>').html(buttonDef.text).click(buttonDef.click).appendTo(buttonSet);
-                if (buttonDef.id) {
-                    b.attr('id',buttonDef.id);
-                }
-                if (buttonDef.class) {
-                    b.addClass(buttonDef.class);
-                }
-            })
-        }
-
-
         $("#notifications").append(n);
         $(n).slideDown(300);
         n.close = (function() {
             var nn = n;
             return function() {
-                if (nn.closed) {
-                    return;
-                }
-                nn.closed = true;
                 currentNotifications.splice(currentNotifications.indexOf(nn),1);
-                if (options.id) {
-                    delete persistentNotifications[options.id];
-                    if (Object.keys(persistentNotifications).length === 0) {
-                        notificationButtonWrapper.hide();
-                    }
-                }
                 $(nn).slideUp(300, function() {
                     nn.parentNode.removeChild(nn);
                 });
-                if (options.modal) {
-                    $("#full-shade").hide();
-                }
             };
         })();
-        n.hideNotification = (function() {
-            var nn = n;
-            return function() {
-                if (nn.closed) {
-                    return
-                }
-                nn.hidden = true;
-                $(nn).slideUp(300);
-            }
-        })();
-        n.showNotification = (function() {
-            var nn = n;
-            return function() {
-                if (nn.closed || !nn.hidden) {
-                    return
-                }
-                nn.hidden = false;
-                $(nn).slideDown(300);
-            }
-        })();
 
         n.update = (function() {
             var nn = n;
-            return function(msg,options) {
+            return function(msg,timeout) {
                 if (typeof msg === "string") {
-                    if (!/<p>/i.test(msg)) {
-                        msg = "<p>"+msg+"</p>";
-                    }
                     nn.innerHTML = msg;
                 } else {
                     $(nn).empty().append(msg);
                 }
-                var timeout;
-                if (typeof options === 'number') {
-                    timeout = options;
-                } else if (options !== undefined) {
-                    timeout = options.timeout;
-                    if (options.buttons) {
-                        var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(nn)
-                        options.buttons.forEach(function(buttonDef) {
-                            var b = $('<button>').text(buttonDef.text).click(buttonDef.click).appendTo(buttonSet);
-                            if (buttonDef.id) {
-                                b.attr('id',buttonDef.id);
-                            }
-                            if (buttonDef.class) {
-                                b.addClass(buttonDef.class);
-                            }
-                        })
-                    }
-                }
                 if (timeout !== undefined && timeout > 0) {
                     window.clearTimeout(nn.timeoutid);
                     nn.timeoutid = window.setTimeout(nn.close,timeout);
                 } else {
                     window.clearTimeout(nn.timeoutid);
                 }
-                if (nn.hidden) {
-                    nn.showNotification();
-                }
-
             }
         })();
 
@@ -202,48 +78,10 @@ RED.notifications = (function() {
                     window.clearTimeout(nn.timeoutid);
                 };
             })());
-            n.timeoutid = window.setTimeout(n.close,timeout||5000);
+            n.timeoutid = window.setTimeout(n.close,timeout||3000);
         }
         currentNotifications.push(n);
-        if (options.id) {
-            persistentNotifications[options.id] = n;
-            notificationButtonWrapper.show();
-        }
         c+=1;
         return n;
     }
-
-    RED.notify = notify;
-
-
-    function hidePersistent() {
-        for(var i in persistentNotifications) {
-            if (persistentNotifications.hasOwnProperty(i)) {
-                persistentNotifications[i].hideNotification();
-            }
-        }
-    }
-    function showPersistent() {
-        for(var i in persistentNotifications) {
-            if (persistentNotifications.hasOwnProperty(i)) {
-                persistentNotifications[i].showNotification();
-            }
-        }
-    }
-
-    var notificationButtonWrapper;
-
-    return {
-        init: function() {
-            notificationButtonWrapper = $('<li>'+
-                '<a id="btn-notifications" class="button" href="#">'+
-                '<i class="fa fa-warning"></i>'+
-                '</a>'+
-                '</li>').prependTo(".header-toolbar").hide();
-            $('#btn-notifications').click(function() {
-                showPersistent();
-            })
-        },
-        notify: notify
-    }
 })();

editor/js/ui/palette-editor.js

@@ -75,21 +75,27 @@ RED.palette.editor = (function() {
             });
         })
     }
-    function installNodeModule(id,version,callback) {
+    function installNodeModule(id,version,shade,callback) {
         var requestBody = {
             module: id
         };
-        if (version) {
+        if (callback === undefined) {
+            callback = shade;
+            shade = version;
+        } else {
             requestBody.version = version;
         }
+        shade.show();
         $.ajax({
             url:"nodes",
             type: "POST",
             data: JSON.stringify(requestBody),
             contentType: "application/json; charset=utf-8"
         }).done(function(data,textStatus,xhr) {
+            shade.hide();
             callback();
         }).fail(function(xhr,textStatus,err) {
+            shade.hide();
             callback(xhr);
         });
     }
@@ -208,8 +214,6 @@ RED.palette.editor = (function() {
             if (nodeEntry) {
                 var activeTypeCount = 0;
                 var typeCount = 0;
-                var errorCount = 0;
-                nodeEntry.errorList.empty();
                 nodeEntries[module].totalUseCount = 0;
                 nodeEntries[module].setUseCount = {};
 
@@ -218,10 +222,7 @@ RED.palette.editor = (function() {
                         var inUseCount = 0;
                         var set = moduleInfo.sets[setName];
                         var setElements = nodeEntry.sets[setName];
-                        if (set.err) {
-                            errorCount++;
-                            $("<li>").text(set.err).appendTo(nodeEntry.errorList);
-                        }
+
                         if (set.enabled) {
                             activeTypeCount += set.types.length;
                         }
@@ -233,7 +234,7 @@ RED.palette.editor = (function() {
                             if (set.enabled) {
                                 var def = RED.nodes.getType(t);
                                 if (def && def.color) {
-                                    swatch.css({background:RED.utils.getNodeColor(t,def)});
+                                    swatch.css({background:def.color});
                                     swatch.css({border: "1px solid "+getContrastingBorder(swatch.css('backgroundColor'))})
 
                                 } else {
@@ -247,31 +248,24 @@ RED.palette.editor = (function() {
                         nodeEntries[module].totalUseCount += inUseCount;
 
                         if (inUseCount > 0) {
-                            setElements.enableButton.text(RED._('palette.editor.inuse'));
+                            setElements.enableButton.html(RED._('palette.editor.inuse'));
                             setElements.enableButton.addClass('disabled');
                         } else {
                             setElements.enableButton.removeClass('disabled');
                             if (set.enabled) {
-                                setElements.enableButton.text(RED._('palette.editor.disable'));
+                                setElements.enableButton.html(RED._('palette.editor.disable'));
                             } else {
-                                setElements.enableButton.text(RED._('palette.editor.enable'));
+                                setElements.enableButton.html(RED._('palette.editor.enable'));
                             }
                         }
                         setElements.setRow.toggleClass("palette-module-set-disabled",!set.enabled);
                     }
                 }
-
-                if (errorCount === 0) {
-                    nodeEntry.errorRow.hide()
-                } else {
-                    nodeEntry.errorRow.show();
-                }
-
                 var nodeCount = (activeTypeCount === typeCount)?typeCount:activeTypeCount+" / "+typeCount;
-                nodeEntry.setCount.text(RED._('palette.editor.nodeCount',{count:typeCount,label:nodeCount}));
+                nodeEntry.setCount.html(RED._('palette.editor.nodeCount',{count:typeCount,label:nodeCount}));
 
                 if (nodeEntries[module].totalUseCount > 0) {
-                    nodeEntry.enableButton.text(RED._('palette.editor.inuse'));
+                    nodeEntry.enableButton.html(RED._('palette.editor.inuse'));
                     nodeEntry.enableButton.addClass('disabled');
                     nodeEntry.removeButton.hide();
                 } else {
@@ -280,20 +274,20 @@ RED.palette.editor = (function() {
                         nodeEntry.removeButton.css('display', 'inline-block');
                     }
                     if (activeTypeCount === 0) {
-                        nodeEntry.enableButton.text(RED._('palette.editor.enableall'));
+                        nodeEntry.enableButton.html(RED._('palette.editor.enableall'));
                     } else {
-                        nodeEntry.enableButton.text(RED._('palette.editor.disableall'));
+                        nodeEntry.enableButton.html(RED._('palette.editor.disableall'));
                     }
                     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.text(RED._('palette.editor.updated')).addClass('disabled').show();
+                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.text(RED._('palette.editor.update',{version:loadedIndex[module].version}));
+                    nodeEntry.updateButton.html(RED._('palette.editor.update',{version:loadedIndex[module].version}));
                 } else {
                     nodeEntry.updateButton.hide();
                 }
@@ -367,7 +361,7 @@ RED.palette.editor = (function() {
             loadedIndex = {};
             packageList.editableList('empty');
 
-            $(".palette-module-shade-status").text(RED._('palette.editor.loading'));
+            $(".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;
@@ -473,7 +467,7 @@ RED.palette.editor = (function() {
                 if (filteredList[i].info.id === ns.module) {
                     var installButton = filteredList[i].elements.installButton;
                     installButton.addClass('disabled');
-                    installButton.text(RED._('palette.editor.installed'));
+                    installButton.html(RED._('palette.editor.installed'));
                     break;
                 }
             }
@@ -489,7 +483,7 @@ RED.palette.editor = (function() {
                         if (filteredList[i].info.id === ns.module) {
                             var installButton = filteredList[i].elements.installButton;
                             installButton.removeClass('disabled');
-                            installButton.text(RED._('palette.editor.install'));
+                            installButton.html(RED._('palette.editor.install'));
                             break;
                         }
                     }
@@ -595,38 +589,61 @@ RED.palette.editor = (function() {
                 if (entry) {
                     var headerRow = $('<div>',{class:"palette-module-header"}).appendTo(container);
                     var titleRow = $('<div class="palette-module-meta palette-module-name"><i class="fa fa-cube"></i></div>').appendTo(headerRow);
-                    $('<span>').text(entry.name).appendTo(titleRow);
+                    $('<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>').text(entry.version).appendTo(metaRow);
-
-                    var errorRow = $('<div class="palette-module-meta palette-module-errors"><i class="fa fa-warning"></i></div>').hide().appendTo(headerRow);
-                    var errorList = $('<ul class="palette-module-error-list"></ul>').appendTo(errorRow);
+                    var versionSpan = $('<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);
                     var buttonGroup = $('<div>',{class:"palette-module-button-group"}).appendTo(buttonRow);
 
-                    var updateButton = $('<a href="#" class="editor-button editor-button-small"></a>').text(RED._('palette.editor.update')).appendTo(buttonGroup);
+                    var updateButton = $('<a href="#" class="editor-button editor-button-small"></a>').html(RED._('palette.editor.update')).appendTo(buttonGroup);
                     updateButton.attr('id','up_'+Math.floor(Math.random()*1000000000));
                     updateButton.click(function(evt) {
                         evt.preventDefault();
                         if ($(this).hasClass('disabled')) {
                             return;
                         }
-                        update(entry,loadedIndex[entry.name].version,container,function(err){});
+                        $("#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>').text(RED._('palette.editor.remove')).appendTo(buttonGroup);
+                    var removeButton = $('<a href="#" class="editor-button editor-button-small"></a>').html(RED._('palette.editor.remove')).appendTo(buttonGroup);
                     removeButton.attr('id','up_'+Math.floor(Math.random()*1000000000));
                     removeButton.click(function(evt) {
                         evt.preventDefault();
-                        remove(entry,container,function(err){});
+
+                        $("#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');
                     })
                     if (!entry.local) {
                         removeButton.hide();
                     }
-                    var enableButton = $('<a href="#" class="editor-button editor-button-small"></a>').text(RED._('palette.editor.disableall')).appendTo(buttonGroup);
+                    var enableButton = $('<a href="#" class="editor-button editor-button-small"></a>').html(RED._('palette.editor.disableall')).appendTo(buttonGroup);
 
                     var contentRow = $('<div>',{class:"palette-module-content"}).appendTo(container);
                     var shade = $('<div class="palette-module-shade hide"><img src="red/images/spin.svg" class="palette-spinner"/></div>').appendTo(container);
@@ -635,8 +652,6 @@ RED.palette.editor = (function() {
                         updateButton: updateButton,
                         removeButton: removeButton,
                         enableButton: enableButton,
-                        errorRow: errorRow,
-                        errorList: errorList,
                         setCount: setCount,
                         container: container,
                         shade: shade,
@@ -666,8 +681,9 @@ RED.palette.editor = (function() {
                         set.types.forEach(function(t) {
                             var typeDiv = $('<div>',{class:"palette-module-type"}).appendTo(setRow);
                             typeSwatches[t] = $('<span>',{class:"palette-module-type-swatch"}).appendTo(typeDiv);
-                            $('<span>',{class:"palette-module-type-node"}).text(t).appendTo(typeDiv);
+                            $('<span>',{class:"palette-module-type-node"}).html(t).appendTo(typeDiv);
                         })
+
                         var enableButton = $('<a href="#" class="editor-button editor-button-small"></a>').appendTo(buttonGroup);
                         enableButton.click(function(evt) {
                             evt.preventDefault();
@@ -705,7 +721,7 @@ RED.palette.editor = (function() {
                     })
                     refreshNodeModule(entry.name);
                 } else {
-                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
+                    $('<div>',{class:"red-ui-search-empty"}).html(RED._('search.empty')).appendTo(container);
                 }
             }
         });
@@ -745,7 +761,7 @@ RED.palette.editor = (function() {
             });
 
 
-        $('<span>').text(RED._("palette.editor.sort")+' ').appendTo(toolBar);
+        $('<span>').html(RED._("palette.editor.sort")+' ').appendTo(toolBar);
         var sortGroup = $('<span class="button-group"></span>').appendTo(toolBar);
         var sortAZ = $('<a href="#" class="sidebar-header-button-toggle selected" data-i18n="palette.editor.sortAZ"></a>').appendTo(sortGroup);
         var sortRecent = $('<a href="#" class="sidebar-header-button-toggle" data-i18n="palette.editor.sortRecent"></a>').appendTo(sortGroup);
@@ -787,13 +803,13 @@ RED.palette.editor = (function() {
             scrollOnAdd: false,
             addItem: function(container,i,object) {
                 if (object.count) {
-                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('palette.editor.moduleCount',{count:object.count})).appendTo(container);
+                    $('<div>',{class:"red-ui-search-empty"}).html(RED._('palette.editor.moduleCount',{count:object.count})).appendTo(container);
                     return
                 }
                 if (object.more) {
                     container.addClass('palette-module-more');
                     var moreRow = $('<div>',{class:"palette-module-header palette-module"}).appendTo(container);
-                    var moreLink = $('<a href="#"></a>').text(RED._('palette.editor.more',{count:object.more})).appendTo(moreRow);
+                    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);
@@ -810,158 +826,131 @@ RED.palette.editor = (function() {
                     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"}).text(entry.name||entry.id).appendTo(titleRow);
+                    $('<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"}).text(entry.description).appendTo(descRow);
+                    $('<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 installButton = $('<a href="#" class="editor-button editor-button-small"></a>').text(RED._('palette.editor.install')).appendTo(buttonGroup);
+                    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')) {
-                            install(entry,container,function(xhr) {});
+                            $("#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.text(RED._('palette.editor.installed'));
+                        installButton.html(RED._('palette.editor.installed'));
                     }
 
                     object.elements = {
                         installButton:installButton
                     }
                 } else {
-                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
+                    $('<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);
-    }
-    function update(entry,version,container,done) {
-        if (RED.settings.theme('palette.editable') === false) {
-            done(new Error('Palette not editable'));
-            return;
-        }
-        var notification = RED.notify(RED._("palette.editor.confirm.update.body",{module:entry.name}),{
+
+        $('<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,
-            fixed: true,
+            autoOpen: false,
+            width: 550,
+            height: "auto",
             buttons: [
                 {
                     text: RED._("common.label.cancel"),
                     click: function() {
-                        notification.close();
+                        $( this ).dialog( "close" );
                     }
                 },
                 {
-                    text: RED._("palette.editor.confirm.button.update"),
-                    class: "primary palette-module-install-confirm-button-update",
+                    text: RED._("palette.editor.confirm.button.review"),
+                    class: "primary palette-module-install-confirm-button-install",
                     click: function() {
-                        var spinner = RED.utils.addSpinnerOverlay(container, true);
-                        installNodeModule(entry.name,version,function(xhr) {
-                            spinner.remove();
-                            if (xhr) {
-                                if (xhr.responseJSON) {
-                                    RED.notify(RED._('palette.editor.errors.updateFailed',{module: entry.name,message:xhr.responseJSON.message}));
-                                }
-                            }
-                            done(xhr);
-                        });
-                        notification.close();
+                        var url = $(this).data('url');
+                        window.open(url);
                     }
-                }
-            ]
-        })
-    }
-    function remove(entry,container,done) {
-        if (RED.settings.theme('palette.editable') === false) {
-            done(new Error('Palette not editable'));
-            return;
-        }
-        var notification = RED.notify(RED._("palette.editor.confirm.remove.body",{module:entry.name}),{
-            modal: true,
-            fixed: true,
-            buttons: [
+                },
                 {
-                    text: RED._("common.label.cancel"),
+                    text: RED._("palette.editor.confirm.button.install"),
+                    class: "primary palette-module-install-confirm-button-install",
                     click: function() {
-                        notification.close();
+                        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 spinner = RED.utils.addSpinnerOverlay(container, true);
-                        removeNodeModule(entry.name, function(xhr) {
-                            spinner.remove();
+                        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: entry.name,message:xhr.responseJSON.message}));
+                                    RED.notify(RED._('palette.editor.errors.removeFailed',{module: id,message:xhr.responseJSON.message}));
                                 }
                             }
                         })
-                        notification.close();
+
+                        $( 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" );
                     }
                 }
             ]
         })
     }
-    function install(entry,container,done) {
-        if (RED.settings.theme('palette.editable') === false) {
-            done(new Error('Palette not editable'));
-            return;
-        }
-        var buttons = [
-            {
-                text: RED._("common.label.cancel"),
-                click: function() {
-                    notification.close();
-                }
-            }
-        ];
-        if (entry.url) {
-            buttons.push({
-                text: RED._("palette.editor.confirm.button.review"),
-                class: "primary palette-module-install-confirm-button-install",
-                click: function() {
-                    var url = entry.url||"";
-                    window.open(url);
-                }
-            });
-        }
-        buttons.push({
-            text: RED._("palette.editor.confirm.button.install"),
-            class: "primary palette-module-install-confirm-button-install",
-            click: function() {
-                var spinner = RED.utils.addSpinnerOverlay(container, true);
-                installNodeModule(entry.id,entry.version,function(xhr) {
-                    spinner.remove();
-                     if (xhr) {
-                         if (xhr.responseJSON) {
-                             RED.notify(RED._('palette.editor.errors.installFailed',{module: entry.id,message:xhr.responseJSON.message}));
-                         }
-                     }
-                     done(xhr);
-                });
-                notification.close();
-            }
-        });
-
-        var notification = RED.notify(RED._("palette.editor.confirm.install.body",{module:entry.id}),{
-            modal: true,
-            fixed: true,
-            buttons: buttons
-        })
-    }
 
     return {
-        init: init,
-        install: install
+        init: init
     }
 })();

editor/js/ui/palette.js

@@ -21,18 +21,7 @@ RED.palette = (function() {
 
     var categoryContainers = {};
 
-
-    function createCategory(originalCategory,rootCategory,category,ns) {
-        if ($("#palette-base-category-"+rootCategory).length === 0) {
-            createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
-        }
-        $("#palette-container-"+rootCategory).show();
-        if ($("#palette-"+category).length === 0) {
-            $("#palette-base-category-"+rootCategory).append('<div id="palette-'+category+'"></div>');
-        }
-    }
-    function createCategoryContainer(originalCategory,category, labelId) {
-        var label = RED._(labelId, {defaultValue:category});
+    function createCategoryContainer(category, label){
         label = (label || category).replace(/_/g, " ");
         var catDiv = $('<div id="palette-container-'+category+'" class="palette-category palette-close hide">'+
             '<div id="palette-header-'+category+'" class="palette-header"><i class="expanded fa fa-angle-down"></i><span>'+label+'</span></div>'+
@@ -42,8 +31,7 @@ RED.palette = (function() {
             '<div id="palette-'+category+'-function"></div>'+
             '</div>'+
             '</div>').appendTo("#palette-container");
-        catDiv.data('category',originalCategory);
-        catDiv.data('label',label);
+
         categoryContainers[category] = {
             container: catDiv,
             close: function() {
@@ -128,12 +116,6 @@ RED.palette = (function() {
         el.data('popover').setContent(popOverContent);
     }
 
-    function setIcon(element,sf) {
-        var iconElement = element.find(".palette_icon");
-        var icon_url = RED.utils.getNodeIcon(sf._def,sf);
-        iconElement.attr("style", "background-image: url("+icon_url+")");
-    }
-
     function escapeNodeType(nt) {
         return nt.replace(" ","_").replace(".","_").replace(":","_");
     }
@@ -145,7 +127,6 @@ RED.palette = (function() {
         }
         if (exclusion.indexOf(def.category)===-1) {
 
-            var originalCategory = def.category;
             var category = def.category.replace(/ /g,"_");
             var rootCategory = category.split("-")[0];
 
@@ -166,13 +147,14 @@ RED.palette = (function() {
 
             d.className="palette_node";
 
+
             if (def.icon) {
                 var icon_url = RED.utils.getNodeIcon(def);
                 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);
             }
 
-            d.style.backgroundColor = RED.utils.getNodeColor(nt,def);
+            d.style.backgroundColor = def.color;
 
             if (def.outputs > 0) {
                 var portOut = document.createElement("div");
@@ -186,12 +168,21 @@ RED.palette = (function() {
                 d.appendChild(portIn);
             }
 
-            createCategory(def.category,rootCategory,category,(coreCategories.indexOf(rootCategory) !== -1)?"node-red":def.set.id);
+            if ($("#palette-base-category-"+rootCategory).length === 0) {
+                if(coreCategories.indexOf(rootCategory) !== -1){
+                    createCategoryContainer(rootCategory, RED._("node-red:palette.label."+rootCategory, {defaultValue:rootCategory}));
+                } else {
+                    var ns = def.set.id;
+                    createCategoryContainer(rootCategory, RED._(ns+":palette.label."+rootCategory, {defaultValue:rootCategory}));
+                }
+            }
+            $("#palette-container-"+rootCategory).show();
+
+            if ($("#palette-"+category).length === 0) {
+                $("#palette-base-category-"+rootCategory).append('<div id="palette-'+category+'"></div>');
+            }
 
             $("#palette-"+category).append(d);
-
-            $(d).data('category',rootCategory);
-
             d.onmousedown = function(e) { e.preventDefault(); };
 
             var popover = RED.popover.create({
@@ -215,11 +206,11 @@ RED.palette = (function() {
                 RED.view.focus();
                 var helpText;
                 if (nt.indexOf("subflow:") === 0) {
-                    helpText = marked(RED.nodes.subflow(nt.substring(8)).info||"")||('<span class="node-info-none">'+RED._("sidebar.info.none")+'</span>');
+                    helpText = marked(RED.nodes.subflow(nt.substring(8)).info||"");
                 } else {
-                    helpText = $("script[data-help-name='"+d.type+"']").html()||('<span class="node-info-none">'+RED._("sidebar.info.none")+'</span>');
+                    helpText = $("script[data-help-name='"+d.type+"']").html()||"";
                 }
-                RED.sidebar.info.set(helpText,RED._("sidebar.info.nodeHelp"));
+                RED.sidebar.info.set(helpText);
             });
             var chart = $("#chart");
             var chartOffset = chart.offset();
@@ -228,19 +219,13 @@ RED.palette = (function() {
             var mouseX;
             var mouseY;
             var spliceTimer;
-            var paletteWidth;
-            var paletteTop;
             $(d).draggable({
                 helper: 'clone',
                 appendTo: 'body',
                 revert: true,
                 revertDuration: 50,
                 containment:'#main-container',
-                start: function() {
-                    paletteWidth = $("#palette").width();
-                    paletteTop = $("#palette").parent().position().top + $("#palette-container").position().top;
-                    RED.view.focus();
-                },
+                start: function() {RED.view.focus();},
                 stop: function() { d3.select('.link_splice').classed('link_splice',false); if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null;}},
                 drag: function(e,ui) {
 
@@ -250,8 +235,9 @@ RED.palette = (function() {
                     ui.position.left += 17.5;
 
                     if (def.inputs > 0 && def.outputs > 0) {
-                        mouseX = ui.position.left-paletteWidth+(ui.helper.width()/2) - chartOffset.left + chart.scrollLeft();
-                        mouseY = ui.position.top-paletteTop+(ui.helper.height()/2) - chartOffset.top + chart.scrollTop();
+                        mouseX = ui.position.left+(ui.helper.width()/2) - chartOffset.left + chart.scrollLeft();
+                        mouseY = ui.position.top+(ui.helper.height()/2) - chartOffset.top + chart.scrollTop();
+
                         if (!spliceTimer) {
                             spliceTimer = setTimeout(function() {
                                 var nodes = [];
@@ -273,7 +259,6 @@ RED.palette = (function() {
                                     mouseY /= RED.view.scale();
                                     nodes = RED.view.getLinksAtPoint(mouseX,mouseY);
                                 }
-
                                 for (var i=0;i<nodes.length;i++) {
                                     if (d3.select(nodes[i]).classed('link_background')) {
                                         var length = nodes[i].getTotalLength();
@@ -311,7 +296,7 @@ RED.palette = (function() {
             });
 
             var nodeInfo = null;
-            if (nt.indexOf("subflow:") === 0) {
+            if (def.category == "subflows") {
                 $(d).dblclick(function(e) {
                     RED.workspaces.show(nt.substring(8));
                     e.preventDefault();
@@ -340,26 +325,14 @@ RED.palette = (function() {
             }
         }
     }
-
     function hideNodeType(nt) {
         var nodeTypeId = escapeNodeType(nt);
-        var paletteNode = $("#palette_node_"+nodeTypeId);
-        paletteNode.hide();
-        var categoryNode = paletteNode.closest(".palette-category");
-        var cl = categoryNode.find(".palette_node");
-        var c = 0;
-        for (var i = 0; i < cl.length; i++) {
-            if ($(cl[i]).css('display') === 'none') { c += 1; }
-        }
-        if (c === cl.length) { categoryNode.hide(); }
+        $("#palette_node_"+nodeTypeId).hide();
     }
 
     function showNodeType(nt) {
         var nodeTypeId = escapeNodeType(nt);
-        var paletteNode = $("#palette_node_"+nodeTypeId);
-        var categoryNode = paletteNode.closest(".palette-category");
-        categoryNode.show();
-        paletteNode.show();
+        $("#palette_node_"+nodeTypeId).show();
     }
 
     function refreshNodeTypes() {
@@ -384,32 +357,6 @@ RED.palette = (function() {
                 portOutput.remove();
             }
             setLabel(sf.type+":"+sf.id,paletteNode,sf.name,marked(sf.info||""));
-            setIcon(paletteNode,sf);
-
-            var currentCategory = paletteNode.data('category');
-            var newCategory = (sf.category||"subflows");
-            if (currentCategory !== newCategory) {
-                var category = newCategory.replace(/ /g,"_");
-                createCategory(newCategory,category,category,"node-red");
-
-                var currentCategoryNode = paletteNode.closest(".palette-category");
-                var newCategoryNode = $("#palette-"+category);
-                newCategoryNode.append(paletteNode);
-                if (newCategoryNode.find(".palette_node").length === 1) {
-                    categoryContainers[category].open();
-                }
-
-                paletteNode.data('category',newCategory);
-                if (currentCategoryNode.find(".palette_node").length === 0) {
-                    if (currentCategoryNode.find("i").hasClass("expanded")) {
-                        currentCategoryNode.find(".palette-content").slideToggle();
-                        currentCategoryNode.find("i").toggleClass("expanded");
-                    }
-                }
-
-
-
-            }
         });
     }
 
@@ -449,21 +396,21 @@ RED.palette = (function() {
         RED.events.on('registry:node-type-removed', function(nodeType) {
             removeNodeType(nodeType);
         });
+
         RED.events.on('registry:node-set-enabled', function(nodeSet) {
             for (var j=0;j<nodeSet.types.length;j++) {
                 showNodeType(nodeSet.types[j]);
                 var def = RED.nodes.getType(nodeSet.types[j]);
-                if (def && def.onpaletteadd && typeof def.onpaletteadd === "function") {
+                if (def.onpaletteadd && typeof def.onpaletteadd === "function") {
                     def.onpaletteadd.call(def);
                 }
             }
         });
         RED.events.on('registry:node-set-disabled', function(nodeSet) {
-            console.log(nodeSet);
             for (var j=0;j<nodeSet.types.length;j++) {
                 hideNodeType(nodeSet.types[j]);
                 var def = RED.nodes.getType(nodeSet.types[j]);
-                if (def && def.onpaletteremove && typeof def.onpaletteremove === "function") {
+                if (def.onpaletteremove && typeof def.onpaletteremove === "function") {
                     def.onpaletteremove.call(def);
                 }
             }
@@ -473,13 +420,14 @@ RED.palette = (function() {
                 for (var j=0;j<nodeSet.types.length;j++) {
                     removeNodeType(nodeSet.types[j]);
                     var def = RED.nodes.getType(nodeSet.types[j]);
-                    if (def && def.onpaletteremove && typeof def.onpaletteremove === "function") {
+                    if (def.onpaletteremove && typeof def.onpaletteremove === "function") {
                         def.onpaletteremove.call(def);
                     }
                 }
             }
         });
 
+
         $("#palette > .palette-spinner").show();
 
         $("#palette-search input").searchBox({
@@ -499,7 +447,7 @@ RED.palette = (function() {
             categoryList = coreCategories
         }
         categoryList.forEach(function(category){
-            createCategoryContainer(category, category, "palette.label."+category);
+            createCategoryContainer(category, RED._("palette.label."+category,{defaultValue:category}));
         });
 
         $("#palette-collapse-all").on("click", function(e) {
@@ -519,20 +467,13 @@ RED.palette = (function() {
             }
         });
     }
-    function getCategories() {
-        var categories = [];
-        $("#palette-container .palette-category").each(function(i,d) {
-            categories.push({id:$(d).data('category'),label:$(d).data('label')});
-        })
-        return categories;
-    }
+
     return {
         init: init,
         add:addNodeType,
         remove:removeNodeType,
         hide:hideNodeType,
         show:showNodeType,
-        refresh:refreshNodeTypes,
-        getCategories: getCategories
+        refresh:refreshNodeTypes
     };
 })();

editor/js/ui/projects/projectUserSettings.js

@@ -1,418 +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.projects.userSettings = (function() {
-
-    var gitUsernameInput;
-    var gitEmailInput;
-
-    function createGitUserSection(pane) {
-
-        var currentGitSettings = RED.settings.get('git') || {};
-        currentGitSettings.user = currentGitSettings.user || {};
-
-        var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.committerDetail")).appendTo(pane);
-
-        var gitconfigContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
-        $('<div style="color:#aaa;"></div>').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committerTip"));
-
-        var row = $('<div class="user-settings-row"></div>').appendTo(gitconfigContainer);
-        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row);
-        gitUsernameInput = $('<input type="text">').appendTo(row);
-        gitUsernameInput.val(currentGitSettings.user.name||"");
-
-        row = $('<div class="user-settings-row"></div>').appendTo(gitconfigContainer);
-        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.email")).appendTo(row);
-        gitEmailInput = $('<input type="text">').appendTo(row);
-        gitEmailInput.val(currentGitSettings.user.email||"");
-    }
-
-
-    function createSSHKeySection(pane) {
-        var container = $('<div class="user-settings-section"></div>').appendTo(pane);
-        var popover;
-        var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.sshKeys")).appendTo(container);
-        var subtitle = $('<div style="color:#aaa;"></div>').appendTo(container).text(RED._("editor:sidebar.project.userSettings.sshKeysTip"));
-
-        var addKeyButton = $('<button id="user-settings-gitconfig-add-key" class="editor-button editor-button-small" style="float: right; margin-right: 10px;">'+RED._("editor:sidebar.project.userSettings.add")+'</button>')
-            .appendTo(subtitle)
-            .click(function(evt) {
-                addKeyButton.attr('disabled',true);
-                saveButton.attr('disabled',true);
-                // bg.children().removeClass("selected");
-                // addLocalButton.click();
-                addKeyDialog.slideDown(200);
-                keyNameInput.focus();
-            });
-
-        var validateForm = function() {
-            var valid = /^[a-zA-Z0-9\-_]+$/.test(keyNameInput.val());
-            keyNameInput.toggleClass('input-error',keyNameInputChanged&&!valid);
-
-            // var selectedButton = bg.find(".selected");
-            // if (selectedButton[0] === addLocalButton[0]) {
-            //     valid = valid && localPublicKeyPathInput.val().length > 0 && localPrivateKeyPathInput.val().length > 0;
-            // } else if (selectedButton[0] === uploadButton[0]) {
-            //     valid = valid && publicKeyInput.val().length > 0 && privateKeyInput.val().length > 0;
-            // } else if (selectedButton[0] === generateButton[0]) {
-                var passphrase = passphraseInput.val();
-                var validPassphrase = passphrase.length === 0 || passphrase.length >= 8;
-                passphraseInput.toggleClass('input-error',!validPassphrase);
-                if (!validPassphrase) {
-                    passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.passphraseShort"));
-                } else if (passphrase.length === 0) {
-                    passphraseInputSubLabel.text(RED._("editor:sidebar.project.userSettings.optional"));
-                } else {
-                    passphraseInputSubLabel.text("");
-                }
-                valid = valid && validPassphrase;
-            // }
-
-            saveButton.attr('disabled',!valid);
-
-            if (popover) {
-                popover.close();
-                popover = null;
-            }
-        };
-
-        var row = $('<div class="user-settings-row"></div>').appendTo(container);
-        var addKeyDialog = $('<div class="projects-dialog-list-dialog"></div>').hide().appendTo(row);
-        $('<div class="projects-dialog-list-dialog-header">').text(RED._("editor:sidebar.project.userSettings.addSshKey")).appendTo(addKeyDialog);
-        var addKeyDialogBody = $('<div>').appendTo(addKeyDialog);
-
-        row = $('<div class="user-settings-row"></div>').appendTo(addKeyDialogBody);
-        $('<div style="color:#aaa;"></div>').appendTo(row).text(RED._("editor:sidebar.project.userSettings.addSshKeyTip"));
-        // var bg = $('<div></div>',{class:"button-group", style:"text-align: center"}).appendTo(row);
-        // var addLocalButton = $('<button class="editor-button toggle selected">use local key</button>').appendTo(bg);
-        // var uploadButton = $('<button class="editor-button toggle">upload key</button>').appendTo(bg);
-        // var generateButton = $('<button class="editor-button toggle">generate key</button>').appendTo(bg);
-        // bg.children().click(function(e) {
-        //     e.preventDefault();
-        //     if ($(this).hasClass("selected")) {
-        //         return;
-        //     }
-        //     bg.children().removeClass("selected");
-        //     $(this).addClass("selected");
-        //     if (this === addLocalButton[0]) {
-        //         addLocalKeyPane.show();
-        //         generateKeyPane.hide();
-        //         uploadKeyPane.hide();
-        //     } else if (this === uploadButton[0]) {
-        //         addLocalKeyPane.hide();
-        //         generateKeyPane.hide();
-        //         uploadKeyPane.show();
-        //     } else if (this === generateButton[0]){
-        //         addLocalKeyPane.hide();
-        //         generateKeyPane.show();
-        //         uploadKeyPane.hide();
-        //     }
-        //     validateForm();
-        // })
-
-
-        row = $('<div class="user-settings-row"></div>').appendTo(addKeyDialogBody);
-        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.name")).appendTo(row);
-        var keyNameInputChanged = false;
-        var keyNameInput = $('<input type="text">').appendTo(row).on("change keyup paste",function() {
-            keyNameInputChanged = true;
-            validateForm();
-        });
-        $('<label class="projects-edit-form-sublabel"><small>'+RED._("editor:sidebar.project.userSettings.nameRule")+'</small></label>').appendTo(row).find("small");
-
-        var generateKeyPane = $('<div>').appendTo(addKeyDialogBody);
-        row = $('<div class="user-settings-row"></div>').appendTo(generateKeyPane);
-        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.passphrase")).appendTo(row);
-        var passphraseInput = $('<input type="password">').appendTo(row).on("change keyup paste",validateForm);
-        var passphraseInputSubLabel = $('<label class="projects-edit-form-sublabel"><small>'+RED._("editor:sidebar.project.userSettings.optional")+'</small></label>').appendTo(row).find("small");
-
-        // var addLocalKeyPane = $('<div>').hide().appendTo(addKeyDialogBody);
-        // row = $('<div class="user-settings-row"></div>').appendTo(addLocalKeyPane);
-        // $('<label for=""></label>').text('Public key').appendTo(row);
-        // var localPublicKeyPathInput = $('<input type="text">').appendTo(row).on("change keyup paste",validateForm);
-        // $('<label class="projects-edit-form-sublabel"><small>Public key file path, for example: ~/.ssh/id_rsa.pub</small></label>').appendTo(row).find("small");
-        // row = $('<div class="user-settings-row"></div>').appendTo(addLocalKeyPane);
-        // $('<label for=""></label>').text('Private key').appendTo(row);
-        // var localPrivateKeyPathInput = $('<input type="text">').appendTo(row).on("change keyup paste",validateForm);
-        // $('<label class="projects-edit-form-sublabel"><small>Private key file path, for example: ~/.ssh/id_rsa</small></label>').appendTo(row).find("small");
-        //
-        // var uploadKeyPane = $('<div>').hide().appendTo(addKeyDialogBody);
-        // row = $('<div class="user-settings-row"></div>').appendTo(uploadKeyPane);
-        // $('<label for=""></label>').text('Public key').appendTo(row);
-        // var publicKeyInput = $('<textarea>').appendTo(row).on("change keyup paste",validateForm);
-        // $('<label class="projects-edit-form-sublabel"><small>Paste in public key contents, for example: ~/.ssh/id_rsa.pub</small></label>').appendTo(row).find("small");
-        // row = $('<div class="user-settings-row"></div>').appendTo(uploadKeyPane);
-        // $('<label for=""></label>').text('Private key').appendTo(row);
-        // var privateKeyInput = $('<textarea>').appendTo(row).on("change keyup paste",validateForm);
-        // $('<label class="projects-edit-form-sublabel"><small>Paste in private key contents, for example: ~/.ssh/id_rsa</small></label>').appendTo(row).find("small");
-
-
-
-
-        var hideEditForm = function() {
-            addKeyButton.attr('disabled',false);
-            addKeyDialog.hide();
-
-            keyNameInput.val("");
-            keyNameInputChanged = false;
-            passphraseInput.val("");
-            // localPublicKeyPathInput.val("");
-            // localPrivateKeyPathInput.val("");
-            // publicKeyInput.val("");
-            // privateKeyInput.val("");
-            if (popover) {
-                popover.close();
-                popover = null;
-            }
-        }
-        var formButtons = $('<span class="button-row" style="position: relative; float: right; margin: 10px;"></span>').appendTo(addKeyDialog);
-        $('<button class="editor-button">'+RED._("editor:sidebar.project.userSettings.cancel")+'</button>')
-            .appendTo(formButtons)
-            .click(function(evt) {
-                evt.preventDefault();
-                hideEditForm();
-            });
-        var saveButton = $('<button class="editor-button">'+RED._("editor:sidebar.project.userSettings.generate")+'</button>')
-            .appendTo(formButtons)
-            .click(function(evt) {
-                evt.preventDefault();
-                var spinner = utils.addSpinnerOverlay(addKeyDialog).addClass('projects-dialog-spinner-contain');
-                var payload = {
-                    name: keyNameInput.val()
-                };
-
-                // var selectedButton = bg.find(".selected");
-                // if (selectedButton[0] === addLocalButton[0]) {
-                //     payload.type = "local";
-                //     payload.publicKeyPath = localPublicKeyPathInput.val();
-                //     payload.privateKeyPath = localPrivateKeyPathInput.val();
-                // } else if (selectedButton[0] === uploadButton[0]) {
-                //     payload.type = "upload";
-                //     payload.publicKey = publicKeyInput.val();
-                //     payload.privateKey = privateKeyInput.val();
-                // } else if (selectedButton[0] === generateButton[0]) {
-                    payload.type = "generate";
-                    payload.comment = gitEmailInput.val();
-                    payload.password = passphraseInput.val();
-                    payload.size = 4096;
-                // }
-                var done = function(err) {
-                    spinner.remove();
-                    if (err) {
-                        return;
-                    }
-                    hideEditForm();
-                }
-                // console.log(JSON.stringify(payload,null,4));
-                RED.deploy.setDeployInflight(true);
-                utils.sendRequest({
-                    url: "settings/user/keys",
-                    type: "POST",
-                    responses: {
-                        0: function(error) {
-                            done(error);
-                        },
-                        200: function(data) {
-                            refreshSSHKeyList(payload.name);
-                            done();
-                        },
-                        400: {
-                            'unexpected_error': function(error) {
-                                console.log(error);
-                                done(error);
-                            }
-                        },
-                    }
-                },payload);
-            });
-
-        row = $('<div class="user-settings-row projects-dialog-list"></div>').appendTo(container);
-        var emptyItem = { empty: true };
-        var expandKey = function(container,entry) {
-            var row = $('<div class="projects-dialog-ssh-public-key">',{style:"position:relative"}).appendTo(container);
-            var keyBox = $('<pre>',{style:"min-height: 80px"}).appendTo(row);
-            var spinner = utils.addSpinnerOverlay(keyBox).addClass('projects-dialog-spinner-contain');
-            var options = {
-                url: 'settings/user/keys/'+entry.name,
-                type: "GET",
-                responses: {
-                    200: function(data) {
-                        keyBox.text(data.publickey);
-                        spinner.remove();
-                    },
-                    400: {
-                        'unexpected_error': function(error) {
-                            console.log(error);
-                            spinner.remove();
-                        }
-                    },
-                }
-            }
-            utils.sendRequest(options);
-
-            var formButtons = $('<span class="button-row" style="position: relative; float: right; margin: 10px;"></span>').appendTo(row);
-            $('<button class="editor-button editor-button-small">'+RED._("editor:sidebar.project.userSettings.copyPublicKey")+'</button>')
-                .appendTo(formButtons)
-                .click(function(evt) {
-                    try {
-                        evt.stopPropagation();
-                        evt.preventDefault();
-                        document.getSelection().selectAllChildren(keyBox[0]);
-                        var ret = document.execCommand('copy');
-                        document.getSelection().empty();
-                    } catch(err) {
-
-                    }
-
-                });
-
-            return row;
-        }
-        var keyList = $('<ol class="projects-dialog-ssh-key-list">').appendTo(row).editableList({
-            height: 'auto',
-            addButton: false,
-            scrollOnAdd: false,
-            addItem: function(row,index,entry) {
-                var container = $('<div class="projects-dialog-list-entry">').appendTo(row);
-                if (entry.empty) {
-                    container.addClass('red-ui-search-empty');
-                    container.text(RED._("editor:sidebar.project.userSettings.noSshKeys"));
-                    return;
-                }
-                var topRow = $('<div class="projects-dialog-ssh-key-header">').appendTo(container);
-                $('<span class="entry-icon"><i class="fa fa-key"></i></span>').appendTo(topRow);
-                $('<span class="entry-name">').text(entry.name).appendTo(topRow);
-                var tools = $('<span class="button-row entry-tools">').appendTo(topRow);
-                var expandedRow;
-                topRow.click(function(e) {
-                    if (expandedRow) {
-                        expandedRow.slideUp(200,function() {
-                            expandedRow.remove();
-                            expandedRow = null;
-                        })
-                    } else {
-                        expandedRow = expandKey(container,entry);
-                    }
-                    })
-                if (!entry.system) {
-                    $('<button class="editor-button editor-button-small"><i class="fa fa-trash"></i></button>')
-                        .appendTo(tools)
-                        .click(function(e) {
-                            e.stopPropagation();
-                            var spinner = utils.addSpinnerOverlay(row).addClass('projects-dialog-spinner-contain');
-                            var notification = RED.notify(RED._("editor:sidebar.project.userSettings.deleteConfirm", {name:entry.name}), {
-                                type: 'warning',
-                                modal: true,
-                                fixed: true,
-                                buttons: [
-                                    {
-                                        text: RED._("common.label.cancel"),
-                                        click: function() {
-                                            spinner.remove();
-                                            notification.close();
-                                        }
-                                    },
-                                    {
-                                        text: RED._("editor:sidebar.project.userSettings.delete"),
-                                        click: function() {
-                                            notification.close();
-                                            var url = "settings/user/keys/"+entry.name;
-                                            var options = {
-                                                url: url,
-                                                type: "DELETE",
-                                                responses: {
-                                                    200: function(data) {
-                                                        row.fadeOut(200,function() {
-                                                            keyList.editableList('removeItem',entry);
-                                                            setTimeout(spinner.remove, 100);
-                                                            if (keyList.editableList('length') === 0) {
-                                                                keyList.editableList('addItem',emptyItem);
-                                                            }
-                                                        });
-                                                    },
-                                                    400: {
-                                                        'unexpected_error': function(error) {
-                                                            console.log(error);
-                                                            spinner.remove();
-                                                        }
-                                                    },
-                                                }
-                                            }
-                                            utils.sendRequest(options);
-                                        }
-                                    }
-                                ]
-                            });
-                        });
-                }
-                if (entry.expand) {
-                    expandedRow = expandKey(container,entry);
-                }
-            }
-        });
-
-        var refreshSSHKeyList = function(justAdded) {
-            $.getJSON("settings/user/keys",function(result) {
-                if (result.keys) {
-                    result.keys.sort(function(A,B) {
-                        return A.name.localeCompare(B.name);
-                    });
-                    keyList.editableList('empty');
-                    result.keys.forEach(function(key) {
-                        if (key.name === justAdded) {
-                            key.expand = true;
-                        }
-                        keyList.editableList('addItem',key);
-                    });
-                    if (keyList.editableList('length') === 0) {
-                        keyList.editableList('addItem',emptyItem);
-                    }
-
-                }
-            })
-        }
-        refreshSSHKeyList();
-
-    }
-
-    function createSettingsPane(activeProject) {
-        var pane = $('<div id="user-settings-tab-gitconfig" class="project-settings-tab-pane node-help"></div>');
-        createGitUserSection(pane);
-        createSSHKeySection(pane);
-        return pane;
-    }
-
-    var utils;
-    function init(_utils) {
-        utils = _utils;
-        RED.userSettings.add({
-            id:'gitconfig',
-            title: RED._("editor:sidebar.project.userSettings.gitConfig"),
-            get: createSettingsPane,
-            close: function() {
-                var currentGitSettings = RED.settings.get('git') || {};
-                currentGitSettings.user = currentGitSettings.user || {};
-                currentGitSettings.user.name = gitUsernameInput.val();
-                currentGitSettings.user.email = gitEmailInput.val();
-                RED.settings.set('git', currentGitSettings);
-            }
-        });
-    }
-
-    return {
-        init: init,
-    };
-})();

editor/js/ui/search.js

@@ -26,24 +26,6 @@ RED.search = (function() {
     var keys = [];
     var results = [];
 
-
-    function indexProperty(node,label,property) {
-        if (typeof property === 'string' || typeof property === 'number') {
-            property = (""+property).toLowerCase();
-            index[property] = index[property] || {};
-            index[property][node.id] = {node:node,label:label};
-        } else if (Array.isArray(property)) {
-            property.forEach(function(prop) {
-                indexProperty(node,label,prop);
-            })
-        } else if (typeof property === 'object') {
-            for (var prop in property) {
-                if (property.hasOwnProperty(prop)) {
-                    indexProperty(node,label,property[prop])
-                }
-            }
-        }
-    }
     function indexNode(n) {
         var l = RED.utils.getNodeLabel(n);
         if (l) {
@@ -60,11 +42,17 @@ RED.search = (function() {
         }
         for (var i=0;i<properties.length;i++) {
             if (n.hasOwnProperty(properties[i])) {
-                indexProperty(n, l, n[properties[i]]);
+                var v = n[properties[i]];
+                if (typeof v === 'string' || typeof v === 'number') {
+                    v = (""+v).toLowerCase();
+                    index[v] = index[v] || {};
+                    index[v][n.id] = {node:n,label:l};
+                }
             }
         }
-    }
 
+
+    }
     function indexWorkspace() {
         index = {};
         RED.nodes.eachWorkspace(indexNode);
@@ -186,14 +174,14 @@ RED.search = (function() {
             addItem: function(container,i,object) {
                 var node = object.node;
                 if (node === undefined) {
-                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
+                    $('<div>',{class:"red-ui-search-empty"}).html(RED._('search.empty')).appendTo(container);
 
                 } else {
                     var def = node._def;
                     var div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
 
                     var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
-                    var colour = RED.utils.getNodeColor(node.type,def);
+                    var colour = def.color;
                     var icon_url = RED.utils.getNodeIcon(def,node);
                     if (node.type === 'tab') {
                         colour = "#C0DEED";
@@ -212,12 +200,12 @@ RED.search = (function() {
                         } else {
                             workspace = "flow:"+workspace.label;
                         }
-                        $('<div>',{class:"red-ui-search-result-node-flow"}).text(workspace).appendTo(contentDiv);
+                        $('<div>',{class:"red-ui-search-result-node-flow"}).html(workspace).appendTo(contentDiv);
                     }
 
-                    $('<div>',{class:"red-ui-search-result-node-label"}).text(object.label || node.id).appendTo(contentDiv);
-                    $('<div>',{class:"red-ui-search-result-node-type"}).text(node.type).appendTo(contentDiv);
-                    $('<div>',{class:"red-ui-search-result-node-id"}).text(node.id).appendTo(contentDiv);
+                    $('<div>',{class:"red-ui-search-result-node-label"}).html(object.label || 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);
 
                     div.click(function(evt) {
                         evt.preventDefault();

editor/js/ui/sidebar.js

@@ -35,9 +35,7 @@ RED.sidebar = (function() {
                 tab.onremove.call(tab);
             }
         },
-        // minimumActiveTabWidth: 70,
-        collapsible: true
-        // scrollable: true
+        minimumActiveTabWidth: 110
     });
 
     var knownTabs = {
@@ -60,8 +58,6 @@ RED.sidebar = (function() {
             options = title;
         }
 
-        delete options.closeable;
-
         options.wrapper = $('<div>',{style:"height:100%"}).appendTo("#sidebar-content")
         options.wrapper.append(options.content);
         options.wrapper.hide();
@@ -85,8 +81,6 @@ RED.sidebar = (function() {
             group: "sidebar-tabs"
         });
 
-        options.iconClass = options.iconClass || "fa fa-square-o"
-
         knownTabs[options.id] = options;
 
         if (options.visible !== false) {
@@ -218,7 +212,6 @@ RED.sidebar = (function() {
         showSidebar();
         RED.sidebar.info.init();
         RED.sidebar.config.init();
-        RED.sidebar.context.init();
         // hide info bar at start if screen rather narrow...
         if ($(window).width() < 600) { RED.menu.setSelected("menu-item-sidebar",false); }
     }

editor/js/ui/state.js

@@ -23,6 +23,5 @@ RED.state = {
     EXPORT: 6,
     IMPORT: 7,
     IMPORT_DRAGGING: 8,
-    QUICK_JOINING: 9,
-    PANNING: 10
+    QUICK_JOINING: 9
 }

editor/js/ui/subflow.js

@@ -139,7 +139,7 @@ RED.subflow = (function() {
         RED.view.select();
         RED.nodes.dirty(true);
         RED.view.redraw();
-        $("#workspace-subflow-output .spinner-value").text(subflow.out.length);
+        $("#workspace-subflow-output .spinner-value").html(subflow.out.length);
     }
 
     function removeSubflowOutput(removedSubflowOutputs) {
@@ -216,7 +216,7 @@ RED.subflow = (function() {
             $("#workspace-subflow-input-add").toggleClass("active", activeSubflow.in.length !== 0);
             $("#workspace-subflow-input-remove").toggleClass("active",activeSubflow.in.length === 0);
 
-            $("#workspace-subflow-output .spinner-value").text(activeSubflow.out.length);
+            $("#workspace-subflow-output .spinner-value").html(activeSubflow.out.length);
         }
     }
 

editor/js/ui/tab-config.js

@@ -221,7 +221,8 @@ RED.sidebar.config = (function() {
             name: RED._("sidebar.config.name"),
             content: content,
             toolbar: toolbar,
-            iconClass: "fa fa-cog",
+            closeable: true,
+            visible: false,
             onchange: function() { refreshConfigNodeList(); }
         });
         RED.actions.add("core:show-config-tab",function() {RED.sidebar.show('config')});

editor/js/ui/tab-context.js

@@ -1,292 +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.sidebar.context = (function() {
-
-    var content;
-    var sections;
-
-    var localCache = {};
-
-
-    var nodeSection;
-    // var subflowSection;
-    var flowSection;
-    var globalSection;
-
-    var currentNode;
-    var currentFlow;
-
-    function init() {
-
-        content = $("<div>").css({"position":"relative","height":"100%"});
-        content.className = "sidebar-context"
-        // var toolbar = $('<div class="sidebar-header">'+
-        //     '</div>').appendTo(content);
-
-        var footerToolbar = $('<div>'+
-            // '<span class="button-group"><a class="sidebar-footer-button" href="#" data-i18n="[title]node-red:debug.sidebar.openWindow"><i class="fa fa-desktop"></i></a></span> ' +
-            '</div>');
-
-
-
-        var stackContainer = $("<div>",{class:"sidebar-context-stack"}).appendTo(content);
-        sections = RED.stack.create({
-            container: stackContainer
-        });
-
-        nodeSection = sections.add({
-            title: RED._("sidebar.context.node"),
-            collapsible: true,
-            // onexpand: function() {
-            //     updateNode(currentNode,true);
-            // }
-        });
-        nodeSection.expand();
-        nodeSection.content.css({height:"100%"});
-        nodeSection.timestamp = $('<div class="sidebar-context-updated">&nbsp;</div>').appendTo(nodeSection.content);
-        var table = $('<table class="node-info"></table>').appendTo(nodeSection.content);
-        nodeSection.table = $('<tbody>').appendTo(table);
-        var bg = $('<div style="float: right"></div>').appendTo(nodeSection.header);
-        $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
-            .appendTo(bg)
-            .click(function(evt) {
-                evt.stopPropagation();
-                evt.preventDefault();
-                updateNode(currentNode, true);
-            })
-
-        // subflowSection  = sections.add({
-        //     title: "Subflow",
-        //     collapsible: true
-        // });
-        // subflowSection.expand();
-        // subflowSection.content.css({height:"100%"});
-        // bg = $('<div style="float: right"></div>').appendTo(subflowSection.header);
-        // $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
-        //     .appendTo(bg)
-        //     .click(function(evt) {
-        //         evt.stopPropagation();
-        //         evt.preventDefault();
-        //     })
-        //
-        // subflowSection.container.hide();
-
-        flowSection = sections.add({
-            title: RED._("sidebar.context.flow"),
-            collapsible: true
-        });
-        flowSection.expand();
-        flowSection.content.css({height:"100%"});
-        flowSection.timestamp = $('<div class="sidebar-context-updated">&nbsp;</div>').appendTo(flowSection.content);
-        var table = $('<table class="node-info"></table>').appendTo(flowSection.content);
-        flowSection.table = $('<tbody>').appendTo(table);
-        bg = $('<div style="float: right"></div>').appendTo(flowSection.header);
-        $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
-            .appendTo(bg)
-            .click(function(evt) {
-                evt.stopPropagation();
-                evt.preventDefault();
-                updateFlow(currentFlow);
-            })
-
-        globalSection = sections.add({
-            title: RED._("sidebar.context.global"),
-            collapsible: true
-        });
-        globalSection.expand();
-        globalSection.content.css({height:"100%"});
-        globalSection.timestamp = $('<div class="sidebar-context-updated">&nbsp;</div>').appendTo(globalSection.content);
-        var table = $('<table class="node-info"></table>').appendTo(globalSection.content);
-        globalSection.table = $('<tbody>').appendTo(table);
-
-        bg = $('<div style="float: right"></div>').appendTo(globalSection.header);
-        $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
-            .appendTo(bg)
-            .click(function(evt) {
-                evt.stopPropagation();
-                evt.preventDefault();
-                updateEntry(globalSection,"context/global","global");
-            })
-
-
-        RED.actions.add("core:show-context-tab",show);
-
-        RED.sidebar.addTab({
-            id: "context",
-            label: RED._("sidebar.context.label"),
-            name: RED._("sidebar.context.name"),
-            iconClass: "fa fa-database",
-            content: content,
-            toolbar: footerToolbar,
-            // pinned: true,
-            enableOnEdit: false
-        });
-
-        // var toggleLiveButton = $("#sidebar-context-toggle-live");
-        // toggleLiveButton.click(function(evt) {
-        //     evt.preventDefault();
-        //     if ($(this).hasClass("selected")) {
-        //         $(this).removeClass("selected");
-        //         $(this).find("i").removeClass("fa-pause");
-        //         $(this).find("i").addClass("fa-play");
-        //     } else {
-        //         $(this).addClass("selected");
-        //         $(this).find("i").removeClass("fa-play");
-        //         $(this).find("i").addClass("fa-pause");
-        //     }
-        // });
-        // RED.popover.tooltip(toggleLiveButton, function() {
-        //     if (toggleLiveButton.hasClass("selected")) {
-        //         return "Pause live updates"
-        //     } else {
-        //         return "Start live updates"
-        //     }
-        // });
-
-
-        RED.events.on("view:selection-changed", function(event) {
-            var selectedNode = event.nodes && event.nodes.length === 1 && event.nodes[0];
-            updateNode(selectedNode);
-        })
-
-        RED.events.on("workspace:change", function(event) {
-            updateFlow(RED.nodes.workspace(event.workspace));
-        })
-
-        updateEntry(globalSection,"context/global","global");
-
-    }
-
-    function updateNode(node,force) {
-        currentNode = node;
-        if (force) {
-            if (node) {
-                updateEntry(nodeSection,"context/node/"+node.id,node.id);
-                // if (/^subflow:/.test(node.type)) {
-                //     subflowSection.container.show();
-                //     updateEntry(subflowSection,"context/flow/"+node.id,node.id);
-                // } else {
-                //     subflowSection.container.hide();
-                // }
-            } else {
-                // subflowSection.container.hide();
-                updateEntry(nodeSection)
-            }
-        } else {
-            $(nodeSection.table).empty();
-            if (node) {
-                $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.refresh"></td></tr>').appendTo(nodeSection.table).i18n();
-            } else {
-                $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.none"></td></tr>').appendTo(nodeSection.table).i18n();
-            }
-            nodeSection.timestamp.html("&nbsp;");
-
-        }
-    }
-    function updateFlow(flow) {
-        currentFlow = flow;
-        if (flow) {
-            updateEntry(flowSection,"context/flow/"+flow.id,flow.id);
-        } else {
-            updateEntry(flowSection)
-        }
-    }
-
-    function refreshEntry(section,baseUrl,id) {
-
-        var contextStores = RED.settings.context.stores;
-        var container = section.table;
-
-        $.getJSON(baseUrl, function(data) {
-            $(container).empty();
-            var sortedData = {};
-            for (var store in data) {
-                if (data.hasOwnProperty(store)) {
-                    for (var key in data[store]) {
-                        if (data[store].hasOwnProperty(key)) {
-                            if (!sortedData.hasOwnProperty(key)) {
-                                sortedData[key] = [];
-                            }
-                            data[store][key].store = store;
-                            sortedData[key].push(data[store][key])
-                        }
-                    }
-                }
-            }
-            var keys = Object.keys(sortedData);
-            keys.sort();
-            var l = keys.length;
-            for (var i = 0; i < l; i++) {
-                sortedData[keys[i]].forEach(function(v) {
-                    var k = keys[i];
-                    var l2 = sortedData[k].length;
-                    var propRow = $('<tr class="node-info-node-row"><td class="sidebar-context-property"></td><td></td></tr>').appendTo(container);
-                    var obj = $(propRow.children()[0]);
-                    obj.text(k);
-                    var tools = $('<span class="debug-message-tools button-group"></span>').appendTo(obj);
-                    var refreshItem = $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>').appendTo(tools).click(function(e) {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        $.getJSON(baseUrl+"/"+k+"?store="+v.store, function(data) {
-                            $(propRow.children()[1]).empty();
-                            var payload = data.msg;
-                            var format = data.format;
-                            payload = RED.utils.decodeObject(payload,format);
-                            RED.utils.createObjectElement(payload, {
-                                typeHint: data.format,
-                                sourceId: id+"."+k
-                            }).appendTo(propRow.children()[1]);
-                        })
-                    });
-
-
-                    var payload = v.msg;
-                    var format = v.format;
-                    payload = RED.utils.decodeObject(payload,format);
-                    RED.utils.createObjectElement(payload, {
-                        typeHint: v.format,
-                        sourceId: id+"."+k
-                    }).appendTo(propRow.children()[1]);
-                    if (contextStores.length > 1) {
-                        $("<span>",{class:"sidebar-context-property-storename"}).text(v.store).appendTo($(propRow.children()[0]))
-                    }
-                });
-            }
-            if (l === 0) {
-                $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.empty"></td></tr>').appendTo(container).i18n();
-            }
-            $(section.timestamp).text(new Date().toLocaleString());
-        });
-    }
-    function updateEntry(section,baseUrl,id) {
-        var container = section.table;
-        if (id) {
-            refreshEntry(section,baseUrl,id);
-        } else {
-            $(container).empty();
-            $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.none"></td></tr>').appendTo(container).i18n();
-        }
-    }
-
-
-
-    function show() {
-        RED.sidebar.show("context");
-    }
-    return {
-        init: init
-    }
-})();

editor/js/ui/tab-info.js

@@ -50,15 +50,13 @@ RED.sidebar.info = (function() {
         }).hide();
 
         nodeSection = sections.add({
-            title: RED._("sidebar.info.info"),
-            collapsible: true
+            title: RED._("sidebar.info.node"),
+            collapsible: false
         });
-        nodeSection.expand();
         infoSection = sections.add({
-            title: RED._("sidebar.info.nodeHelp"),
-            collapsible: true
+            title: RED._("sidebar.info.information"),
+            collapsible: false
         });
-        infoSection.expand();
         infoSection.content.css("padding","6px");
         infoSection.container.css("border-bottom","none");
 
@@ -83,9 +81,7 @@ RED.sidebar.info = (function() {
             id: "info",
             label: RED._("sidebar.info.label"),
             name: RED._("sidebar.info.name"),
-            iconClass: "fa fa-info",
             content: content,
-            pinned: true,
             enableOnEdit: true
         });
         if (tips.enabled()) {
@@ -100,7 +96,23 @@ RED.sidebar.info = (function() {
         RED.sidebar.show("info");
     }
 
-    // TODO: DRY - projects.js
+    function jsonFilter(key,value) {
+        if (key === "") {
+            return value;
+        }
+        var t = typeof value;
+        if ($.isArray(value)) {
+            return "[array:"+value.length+"]";
+        } else if (t === "object") {
+            return "[object]"
+        } else if (t === "string") {
+            if (value.length > 30) {
+                return value.substring(0,30)+" ...";
+            }
+        }
+        return value;
+    }
+
     function addTargetToExternalLinks(el) {
         $(el).find("a").each(function(el) {
             var href = $(this).attr('href');
@@ -111,42 +123,76 @@ RED.sidebar.info = (function() {
         return el;
     }
     function refresh(node) {
-        if (node === undefined) {
-            refreshSelection();
-            return;
-        }
         sections.show();
         $(nodeSection.content).empty();
         $(infoSection.content).empty();
 
-        var propRow;
-
-        var table = $('<table class="node-info"></table>').appendTo(nodeSection.content);
+        var table = $('<table class="node-info"></table>');
         var tableBody = $('<tbody>').appendTo(table);
+        var propRow;
         var subflowNode;
-        var subflowUserCount;
-
-        var activeProject = RED.projects.getActiveProject();
-        if (activeProject) {
-            propRow = $('<tr class="node-info-node-row"><td>Project</td><td></td></tr>').appendTo(tableBody);
-            $(propRow.children()[1]).text(activeProject.name||"");
-            $('<tr class="node-info-property-expand blank"><td colspan="2"></td></tr>').appendTo(tableBody);
-            $('<button class="editor-button editor-button-small" style="position:absolute;right:2px;"><i class="fa fa-ellipsis-h"></i></button>')
-                .appendTo(propRow.children()[1])
-                .click(function(evt) {
-                    evt.preventDefault();
-                    RED.projects.editProject();
-                });
-        }
-        infoSection.container.show();
-        if (node === null) {
-            return;
-        } else if (Array.isArray(node)) {
-            infoSection.container.hide();
-            propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.selection")+"</td><td></td></tr>").appendTo(tableBody);
-            $(propRow.children()[1]).text(RED._("sidebar.info.nodes",{count:node.length}))
+        if (node.type === "tab") {
+            nodeSection.title.html(RED._("sidebar.info.flow"));
+            propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.tabName")+'</td><td></td></tr>').appendTo(tableBody);
+            $(propRow.children()[1]).html('&nbsp;'+(node.label||""))
+            propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.id")+"</td><td></td></tr>").appendTo(tableBody);
+            RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
+            propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.status")+'</td><td></td></tr>').appendTo(tableBody);
+            $(propRow.children()[1]).html((!!!node.disabled)?RED._("sidebar.info.enabled"):RED._("sidebar.info.disabled"))
         } else {
+            nodeSection.title.html(RED._("sidebar.info.node"));
+            if (node.type !== "subflow" && node.name) {
+                $('<tr class="node-info-node-row"><td>'+RED._("common.label.name")+'</td><td>&nbsp;<span class="bidiAware" dir="'+RED.text.bidi.resolveBaseTextDir(node.name)+'">'+node.name+'</span></td></tr>').appendTo(tableBody);
+            }
+            $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.type")+"</td><td>&nbsp;"+node.type+"</td></tr>").appendTo(tableBody);
+            propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.id")+"</td><td></td></tr>").appendTo(tableBody);
+            RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
+
             var m = /^subflow(:(.+))?$/.exec(node.type);
+
+            if (!m && node.type != "subflow" && node.type != "comment") {
+                if (node._def) {
+                    var count = 0;
+                    var defaults = node._def.defaults;
+                    for (var n in defaults) {
+                        if (n != "name" && defaults.hasOwnProperty(n)) {
+                            var val = node[n];
+                            var type = typeof val;
+                            count++;
+                            propRow = $('<tr class="node-info-property-row'+(expandedSections.property?"":" hide")+'"><td>'+n+"</td><td></td></tr>").appendTo(tableBody);
+                            if (defaults[n].type) {
+                                var configNode = RED.nodes.node(val);
+                                if (!configNode) {
+                                    RED.utils.createObjectElement(undefined).appendTo(propRow.children()[1]);
+                                } else {
+                                    var configLabel = RED.utils.getNodeLabel(configNode,val);
+                                    var container = propRow.children()[1];
+
+                                    var div = $('<span>',{class:""}).appendTo(container);
+                                    var nodeDiv = $('<div>',{class:"palette_node palette_node_small"}).appendTo(div);
+                                    var colour = configNode._def.color;
+                                    var icon_url = RED.utils.getNodeIcon(configNode._def);
+                                    nodeDiv.css({'backgroundColor':colour, "cursor":"pointer"});
+                                    var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
+                                    $('<div/>',{class:"palette_icon",style:"background-image: url("+icon_url+")"}).appendTo(iconContainer);
+                                    var nodeContainer = $('<span></span>').css({"verticalAlign":"top","marginLeft":"6px"}).html(configLabel).appendTo(container);
+
+                                    nodeDiv.on('dblclick',function() {
+                                        RED.editor.editConfig("", configNode.type, configNode.id);
+                                    })
+
+                                }
+                            } else {
+                                RED.utils.createObjectElement(val).appendTo(propRow.children()[1]);
+                            }
+                        }
+                    }
+                    if (count > 0) {
+                        $('<tr class="node-info-property-expand blank"><td colspan="2"><a href="#" class=" node-info-property-header'+(expandedSections.property?" expanded":"")+'"><span class="node-info-property-show-more">'+RED._("sidebar.info.showMore")+'</span><span class="node-info-property-show-less">'+RED._("sidebar.info.showLess")+'</span> <i class="fa fa-caret-down"></i></a></td></tr>').appendTo(tableBody);
+                    }
+                }
+            }
+
             if (m) {
                 if (m[2]) {
                     subflowNode = RED.nodes.subflow(m[2]);
@@ -154,140 +200,49 @@ RED.sidebar.info = (function() {
                     subflowNode = node;
                 }
 
-                subflowUserCount = 0;
+                $('<tr class="blank"><th colspan="2">'+RED._("sidebar.info.subflow")+'</th></tr>').appendTo(tableBody);
+
+                var userCount = 0;
                 var subflowType = "subflow:"+subflowNode.id;
                 RED.nodes.eachNode(function(n) {
                     if (n.type === subflowType) {
-                        subflowUserCount++;
+                        userCount++;
                     }
                 });
+                $('<tr class="node-info-subflow-row"><td>'+RED._("common.label.name")+'</td><td><span class="bidiAware" dir=\"'+RED.text.bidi.resolveBaseTextDir(subflowNode.name)+'">'+subflowNode.name+'</span></td></tr>').appendTo(tableBody);
+                $('<tr class="node-info-subflow-row"><td>'+RED._("sidebar.info.instances")+"</td><td>"+userCount+'</td></tr>').appendTo(tableBody);
             }
-            if (node.type === "tab" || node.type === "subflow") {
-                propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info."+(node.type==='tab'?'flow':'subflow'))+'</td><td></td></tr>').appendTo(tableBody);
-                RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
-                propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.tabName")+"</td><td></td></tr>").appendTo(tableBody);
-                $(propRow.children()[1]).text(node.label||node.name||"");
-                if (node.type === "tab") {
-                    propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.status")+'</td><td></td></tr>').appendTo(tableBody);
-                    $(propRow.children()[1]).text((!!!node.disabled)?RED._("sidebar.info.enabled"):RED._("sidebar.info.disabled"))
-                } else if (node.type === "subflow") {
-                    propRow = $('<tr class="node-info-node-row"><td>'+RED._("subflow.category")+'</td><td></td></tr>').appendTo(tableBody);
-                    var category = node.category||"subflows";
-                    $(propRow.children()[1]).text(RED._("palette.label."+category,{defaultValue:category}))
-                }
-            } else {
-                propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.node")+"</td><td></td></tr>").appendTo(tableBody);
-                RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
-
-
-                if (node.type !== "subflow" && node.type !== "unknown" && node.name) {
-                    propRow = $('<tr class="node-info-node-row"><td>'+RED._("common.label.name")+'</td><td></td></tr>').appendTo(tableBody);
-                    $('<span class="bidiAware" dir="'+RED.text.bidi.resolveBaseTextDir(node.name)+'"></span>').text(node.name).appendTo(propRow.children()[1]);
-                }
-                if (!m) {
-                    propRow = $('<tr class="node-info-node-row"><td>'+RED._("sidebar.info.type")+"</td><td></td></tr>").appendTo(tableBody);
-                    $(propRow.children()[1]).text((node.type === "unknown")?node._orig.type:node.type);
-                    if (node.type === "unknown") {
-                        $('<span style="float: right; font-size: 0.8em"><i class="fa fa-warning"></i></span>').prependTo($(propRow.children()[1]))
-                    }
-                }
-                if (!m && node.type != "subflow" && node.type != "comment") {
-                    var defaults;
-                    if (node.type === 'unknown') {
-                        defaults = {};
-                        Object.keys(node._orig).forEach(function(k) {
-                            if (k !== 'type') {
-                                defaults[k] = {};
-                            }
-                        })
-                    } else if (node._def) {
-                        defaults = node._def.defaults;
-                    }
-                    if (defaults) {
-                        var count = 0;
-                        for (var n in defaults) {
-                            if (n != "name" && defaults.hasOwnProperty(n)) {
-                                var val = node[n];
-                                var type = typeof val;
-                                count++;
-                                propRow = $('<tr class="node-info-property-row'+(expandedSections.property?"":" hide")+'"><td>'+n+"</td><td></td></tr>").appendTo(tableBody);
-                                if (defaults[n].type) {
-                                    var configNode = RED.nodes.node(val);
-                                    if (!configNode) {
-                                        RED.utils.createObjectElement(undefined).appendTo(propRow.children()[1]);
-                                    } else {
-                                        var configLabel = RED.utils.getNodeLabel(configNode,val);
-                                        var container = propRow.children()[1];
-
-                                        var div = $('<span>',{class:""}).appendTo(container);
-                                        var nodeDiv = $('<div>',{class:"palette_node palette_node_small"}).appendTo(div);
-                                        var colour = RED.utils.getNodeColor(configNode.type,configNode._def);
-                                        var icon_url = RED.utils.getNodeIcon(configNode._def);
-                                        nodeDiv.css({'backgroundColor':colour, "cursor":"pointer"});
-                                        var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
-                                        $('<div/>',{class:"palette_icon",style:"background-image: url("+icon_url+")"}).appendTo(iconContainer);
-                                        var nodeContainer = $('<span></span>').css({"verticalAlign":"top","marginLeft":"6px"}).text(configLabel).appendTo(container);
-
-                                        nodeDiv.on('dblclick',function() {
-                                            RED.editor.editConfig("", configNode.type, configNode.id);
-                                        })
-
-                                    }
-                                } else {
-                                    RED.utils.createObjectElement(val).appendTo(propRow.children()[1]);
-                                }
-                            }
-                        }
-                        if (count > 0) {
-                            $('<tr class="node-info-property-expand blank"><td colspan="2"><a href="#" class=" node-info-property-header'+(expandedSections.property?" expanded":"")+'"><span class="node-info-property-show-more">'+RED._("sidebar.info.showMore")+'</span><span class="node-info-property-show-less">'+RED._("sidebar.info.showLess")+'</span> <i class="fa fa-caret-down"></i></a></td></tr>').appendTo(tableBody);
-                        }
-                    }
-                }
-                if (node.type !== 'tab') {
-                    if (m) {
-                        $('<tr class="blank"><th colspan="2">'+RED._("sidebar.info.subflow")+'</th></tr>').appendTo(tableBody);
-                        $('<tr class="node-info-subflow-row"><td>'+RED._("common.label.name")+'</td><td><span class="bidiAware" dir=\"'+RED.text.bidi.resolveBaseTextDir(subflowNode.name)+'">'+subflowNode.name+'</span></td></tr>').appendTo(tableBody);
-                    }
-                }
-            }
-            if (m) {
-                propRow = $('<tr class="node-info-node-row"><td>'+RED._("subflow.category")+'</td><td></td></tr>').appendTo(tableBody);
-                var category = subflowNode.category||"subflows";
-                $(propRow.children()[1]).text(RED._("palette.label."+category,{defaultValue:category}))
-                $('<tr class="node-info-subflow-row"><td>'+RED._("sidebar.info.instances")+"</td><td>"+subflowUserCount+'</td></tr>').appendTo(tableBody);
-            }
-
-            var infoText = "";
-            if (!subflowNode && node.type !== "comment" && node.type !== "tab") {
-                infoSection.title.text(RED._("sidebar.info.nodeHelp"));
-                var helpText = $("script[data-help-name='"+node.type+"']").html()||('<span class="node-info-none">'+RED._("sidebar.info.none")+'</span>');
-                infoText = helpText;
-            } else if (node.type === "tab") {
-                infoSection.title.text(RED._("sidebar.info.flowDesc"));
-                infoText = marked(node.info||"")||('<span class="node-info-none">'+RED._("sidebar.info.none")+'</span>');
-            }
-
-            if (subflowNode) {
-                infoText = infoText + (marked(subflowNode.info||"")||('<span class="node-info-none">'+RED._("sidebar.info.none")+'</span>'));
-                infoSection.title.text(RED._("sidebar.info.subflowDesc"));
-            } else if (node._def && node._def.info) {
-                infoSection.title.text(RED._("sidebar.info.nodeHelp"));
-                var info = node._def.info;
-                var textInfo = (typeof info === "function" ? info.call(node) : info);
-                // TODO: help
-                infoText = infoText + marked(textInfo);
-            }
-            if (infoText) {
-                setInfoText(infoText);
-            }
-            $(".sidebar-node-info-stack").scrollTop(0);
-            $(".node-info-property-header").click(function(e) {
-                e.preventDefault();
-                expandedSections["property"] = !expandedSections["property"];
-                $(this).toggleClass("expanded",expandedSections["property"]);
-                $(".node-info-property-row").toggle(expandedSections["property"]);
-            });
         }
+        $(table).appendTo(nodeSection.content);
+
+        var infoText = "";
+
+        if (!subflowNode && node.type !== "comment" && node.type !== "tab") {
+            var helpText = $("script[data-help-name='"+node.type+"']").html()||"";
+            infoText = helpText;
+        } else if (node.type === "tab") {
+            infoText = marked(node.info||"");
+        }
+
+        if (subflowNode) {
+            infoText = infoText + marked(subflowNode.info||"");
+        } else if (node._def && node._def.info) {
+            var info = node._def.info;
+            var textInfo = (typeof info === "function" ? info.call(node) : info);
+            // TODO: help
+            infoText = infoText + marked(textInfo);
+        }
+        if (infoText) {
+            setInfoText(infoText);
+        }
+
+
+        $(".node-info-property-header").click(function(e) {
+            e.preventDefault();
+            expandedSections["property"] = !expandedSections["property"];
+            $(this).toggleClass("expanded",expandedSections["property"]);
+            $(".node-info-property-row").toggle(expandedSections["property"]);
+        });
     }
     function setInfoText(infoText) {
         var info = addTargetToExternalLinks($('<div class="node-help"><span class="bidiAware" dir=\"'+RED.text.bidi.resolveBaseTextDir(infoText)+'">'+infoText+'</span></div>')).appendTo(infoSection.content);
@@ -387,24 +342,22 @@ RED.sidebar.info = (function() {
     })();
 
     function clear() {
-        // sections.hide();
-        refresh(null);
+        sections.hide();
+        //
     }
 
-    function set(html,title) {
+    function set(html) {
         // tips.stop();
-        // sections.show();
-        refresh(null);
+        sections.show();
         nodeSection.container.hide();
-        infoSection.title.text(title||RED._("sidebar.info.info"));
+        $(infoSection.content).empty();
         setInfoText(html);
         $(".sidebar-node-info-stack").scrollTop(0);
     }
 
-    function refreshSelection(selection) {
-        if (selection === undefined) {
-            selection = RED.view.selection();
-        }
+
+
+    RED.events.on("view:selection-changed",function(selection) {
         if (selection.nodes) {
             if (selection.nodes.length == 1) {
                 var node = selection.nodes[0];
@@ -413,8 +366,6 @@ RED.sidebar.info = (function() {
                 } else {
                     refresh(node);
                 }
-            } else {
-                refresh(selection.nodes);
             }
         } else {
             var activeWS = RED.workspaces.active();
@@ -427,15 +378,11 @@ RED.sidebar.info = (function() {
                 if (workspace && workspace.info) {
                     refresh(workspace);
                 } else {
-                    refresh(null)
-                    // clear();
+                    clear();
                 }
             }
         }
-    }
-
-
-    RED.events.on("view:selection-changed",refreshSelection);
+    });
 
     return {
         init: init,

editor/js/ui/tray.js

@@ -32,11 +32,7 @@ RED.tray = (function() {
         // var growButton = $('<a class="editor-tray-resize-button" style="cursor: w-resize;"><i class="fa fa-angle-left"></i></a>').appendTo(resizer);
         // var shrinkButton = $('<a class="editor-tray-resize-button" style="cursor: e-resize;"><i style="margin-left: 1px;" class="fa fa-angle-right"></i></a>').appendTo(resizer);
         if (options.title) {
-            var titles = stack.map(function(e) { return e.options.title });
-            titles.push(options.title);
-            var title = '<ul class="editor-tray-breadcrumbs"><li>'+titles.join("</li><li>")+'</li></ul>';
-
-            $('<div class="editor-tray-titlebar">'+title+'</div>').appendTo(header);
+            $('<div class="editor-tray-titlebar">'+options.title+'</div>').appendTo(header);
         }
         if (options.width === Infinity) {
             options.maximized = true;
@@ -52,7 +48,7 @@ RED.tray = (function() {
                     b.attr('id',button.id);
                 }
                 if (button.text) {
-                    b.text(button.text);
+                    b.html(button.text);
                 }
                 if (button.click) {
                     b.click((function(action) {
@@ -119,10 +115,10 @@ RED.tray = (function() {
             $("#editor-shade").show();
             $("#palette-shade").show();
             $(".sidebar-shade").show();
+
             tray.preferredWidth = Math.max(el.width(),500);
-            if (!options.maximized) {
-                body.css({"minWidth":tray.preferredWidth-40});
-            }
+            body.css({"minWidth":tray.preferredWidth-40});
+
             if (options.width) {
                 if (options.width > $("#editor-stack").position().left-8) {
                     options.width = $("#editor-stack").position().left-8;
@@ -214,11 +210,8 @@ RED.tray = (function() {
             });
         },
         show: function show(options) {
-            if (stack.length > 0 && !options.overlay) {
+            if (stack.length > 0) {
                 var oldTray = stack[stack.length-1];
-                if (options.width === "inherit") {
-                    options.width = oldTray.tray.width();
-                }
                 oldTray.tray.css({
                     right: -(oldTray.tray.width()+10)+"px"
                 });
@@ -245,21 +238,14 @@ RED.tray = (function() {
                     tray.tray.remove();
                     if (stack.length > 0) {
                         var oldTray = stack[stack.length-1];
-                        if (!oldTray.options.overlay) {
-                            oldTray.tray.appendTo("#editor-stack");
-                            setTimeout(function() {
-                                handleWindowResize();
-                                oldTray.tray.css({right:0});
-                                if (oldTray.options.show) {
-                                    oldTray.options.show();
-                                }
-                            },0);
-                        } else {
+                        oldTray.tray.appendTo("#editor-stack");
+                        setTimeout(function() {
                             handleWindowResize();
+                            oldTray.tray.css({right:0});
                             if (oldTray.options.show) {
                                 oldTray.options.show();
                             }
-                        }
+                        },0);
                     }
                     if (done) {
                         done();

editor/js/ui/typeSearch.js

@@ -12,14 +12,12 @@ RED.typeSearch = (function() {
 
     var activeFilter = "";
     var addCallback;
-    var cancelCallback;
 
     var typesUsed = {};
 
     function search(val) {
         activeFilter = val.toLowerCase();
         var visible = searchResults.editableList('filter');
-        searchResults.editableList('sort');
         setTimeout(function() {
             selected = 0;
             searchResults.children().removeClass('selected');
@@ -102,23 +100,6 @@ RED.typeSearch = (function() {
                 }
                 return (activeFilter==="")||(data.index.indexOf(activeFilter) > -1);
             },
-            sort: function(A,B) {
-                if (activeFilter === "") {
-                    return A.i - B.i;
-                }
-                var Ai = A.index.indexOf(activeFilter);
-                var Bi = B.index.indexOf(activeFilter);
-                if (Ai === -1) {
-                    return 1;
-                }
-                if (Bi === -1) {
-                    return -1;
-                }
-                if (Ai === Bi) {
-                    return sortTypeLabels(A,B);
-                }
-                return Ai-Bi;
-            },
             addItem: function(container,i,object) {
                 var def = object.def;
                 object.index = object.type.toLowerCase();
@@ -128,7 +109,7 @@ RED.typeSearch = (function() {
                 var div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
 
                 var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
-                var colour = RED.utils.getNodeColor(object.type,def);
+                var colour = def.color;
                 var icon_url = RED.utils.getNodeIcon(def);
                 nodeDiv.css('backgroundColor',colour);
 
@@ -147,7 +128,7 @@ RED.typeSearch = (function() {
                 var label = object.label;
                 object.index += "|"+label.toLowerCase();
 
-                $('<div>',{class:"red-ui-search-result-node-label"}).text(label).appendTo(contentDiv);
+                $('<div>',{class:"red-ui-search-result-node-label"}).html(label).appendTo(contentDiv);
 
                 div.click(function(evt) {
                     evt.preventDefault();
@@ -174,19 +155,11 @@ RED.typeSearch = (function() {
                 t = t.parent();
             }
             hide(true);
-            if (cancelCallback) {
-                cancelCallback();
-            }
         }
     }
     function show(opts) {
         if (!visible) {
-            RED.keyboard.add("*","escape",function(){
-                hide();
-                if (cancelCallback) {
-                    cancelCallback();
-                }
-            });
+            RED.keyboard.add("*","escape",function(){hide()});
             if (dialog === null) {
                 createDialog();
             }
@@ -202,7 +175,6 @@ RED.typeSearch = (function() {
         }
         refreshTypeList();
         addCallback = opts.add;
-        closeCallback = opts.close;
         RED.events.emit("type-search:open");
         //shade.show();
         dialog.css({left:opts.x+"px",top:opts.y+"px"}).show();
@@ -243,17 +215,7 @@ RED.typeSearch = (function() {
         }
         return label;
     }
-    function sortTypeLabels(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;
-        }
-    }
+
     function refreshTypeList() {
         var i;
         searchResults.editableList('empty');
@@ -278,33 +240,37 @@ RED.typeSearch = (function() {
                 items.push({type:t,def: def, label:getTypeLabel(t,def)});
             }
         });
-        items.sort(sortTypeLabels);
+        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;
-        var index = 0;
         for(i=0;i<common.length;i++) {
-            var itemDef = RED.nodes.getType(common[i]);
-            if (itemDef) {
-                item = {
-                    type: common[i],
-                    common: true,
-                    def: itemDef,
-                    i: index++
-                };
-                item.label = getTypeLabel(item.type,item.def);
-                if (i === common.length-1) {
-                    item.separator = true;
-                }
-                searchResults.editableList('addItem', item);
+            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,
-                i: index++
+                recent: true
             };
             item.label = getTypeLabel(item.type,item.def);
             if (i === recentlyUsed.length-1) {
@@ -313,7 +279,6 @@ RED.typeSearch = (function() {
             searchResults.editableList('addItem', item);
         }
         for (i=0;i<items.length;i++) {
-            items[i].i = index++;
             searchResults.editableList('addItem', items[i]);
         }
         setTimeout(function() {

editor/js/ui/userSettings.js

@@ -29,10 +29,6 @@ RED.userSettings = (function() {
         if (settingsVisible) {
             return;
         }
-        if (!RED.user.hasPermission("settings.write")) {
-            RED.notify(RED._("user.errors.settings"),"error");
-            return;
-        }
         settingsVisible = true;
         var tabContainer;
 
@@ -131,13 +127,10 @@ RED.userSettings = (function() {
 
         var pane = $('<div id="user-settings-tab-view" class="node-help"></div>');
 
-        var currentEditorSettings = RED.settings.get('editor') || {};
-        currentEditorSettings.view = currentEditorSettings.view || {};
-
         viewSettings.forEach(function(section) {
             $('<h3></h3>').text(RED._(section.title)).appendTo(pane);
             section.options.forEach(function(opt) {
-                var initialState = currentEditorSettings.view[opt.setting];
+                var initialState = RED.settings.get(opt.setting);
                 var row = $('<div class="user-settings-row"></div>').appendTo(pane);
                 var input;
                 if (opt.toggle) {
@@ -149,15 +142,38 @@ RED.userSettings = (function() {
                 }
             });
         })
+        addBidiPreferences(pane);
         return pane;
     }
+    
+    function addBidiPreferences(pane) {
+        $('<h3></h3>').text(RED._("menu.label.bidi")).appendTo(pane);                
+        var row;
+        
+        // Bidi enabled toggle
+        row = $('<div class="user-settings-row"></div>').appendTo(pane);
+        var input = $('<label for="user-settings-view-bidi-enabled"><input id="user-settings-view-bidi-enabled" type="checkbox"> '+RED._("menu.label.bidiSupport") +'</label>').appendTo(row).find("input");
+        input.prop('checked',RED.text.bidi.getBidiEnabled());
+        
+        // Text Direction combo
+        row = $('<div class="user-settings-row"></div>').appendTo(pane);
+        $('<label for="user-settings-view-text-direction">'+RED._("menu.label.view.textDir")+'</label>').appendTo(row);
+        var select = $('<select id="user-settings-view-text-direction"><option value="ltr">' + RED._("menu.label.view.ltr") + '</option><option value="rtl">'  + RED._("menu.label.view.rtl") + '</option><option value="auto">'  + RED._("menu.label.view.auto") + '</option></select>').appendTo(row);        
+        select.val(RED.text.bidi.getTextDirPref());
+        select.prop('disabled', !RED.text.bidi.getBidiEnabled());
+        
+        input.change(function() {
+            RED.text.bidi.setBidiEnabled(input.prop('checked'));
+            select.prop('disabled', !RED.text.bidi.getBidiEnabled());
+        });
+        select.change(function() {
+            RED.text.bidi.setTextDirPref(select.val());
+        });
+    }
 
     function setSelected(id, value) {
         var opt = allSettings[id];
-        var currentEditorSettings = RED.settings.get('editor') || {};
-        currentEditorSettings.view = currentEditorSettings.view || {};
-        currentEditorSettings.view[opt.setting] = value;
-        RED.settings.set('editor', currentEditorSettings);
+        RED.settings.set(opt.setting,value);
         var callback = opt.onchange;
         if (typeof callback === 'string') {
             callback = RED.actions.get(callback);
@@ -168,9 +184,8 @@ RED.userSettings = (function() {
     }
     function toggle(id) {
         var opt = allSettings[id];
-        var currentEditorSettings = RED.settings.get('editor') || {};
-        currentEditorSettings.view = currentEditorSettings.view || {};
-        setSelected(id,!currentEditorSettings.view[opt.setting]);
+        var state = RED.settings.get(opt.setting);
+        setSelected(id,!state);
     }
 
 
@@ -196,26 +211,21 @@ RED.userSettings = (function() {
             }
         })
 
-        var currentEditorSettings = RED.settings.get('editor') || {};
-        currentEditorSettings.view = currentEditorSettings.view || {};
-        var editorSettingsChanged = false;
         viewSettings.forEach(function(section) {
             section.options.forEach(function(opt) {
                 if (opt.oldSetting) {
                     var oldValue = RED.settings.get(opt.oldSetting);
                     if (oldValue !== undefined && oldValue !== null) {
-                        currentEditorSettings.view[opt.setting] = oldValue;
-                        editorSettingsChanged = true;
+                        RED.settings.set(opt.setting,oldValue);
                         RED.settings.remove(opt.oldSetting);
                     }
                 }
                 allSettings[opt.setting] = opt;
                 if (opt.onchange) {
-                    var value = currentEditorSettings.view[opt.setting];
-                    if ((value === null || value === undefined) && opt.hasOwnProperty('default')) {
+                    var value = RED.settings.get(opt.setting);
+                    if (value === null && opt.hasOwnProperty('default')) {
                         value = opt.default;
-                        currentEditorSettings.view[opt.setting] = value;
-                        editorSettingsChanged = true;
+                        RED.settings.set(opt.setting,value);
                     }
 
                     var callback = opt.onchange;
@@ -228,9 +238,6 @@ RED.userSettings = (function() {
                 }
             });
         });
-        if (editorSettingsChanged) {
-            RED.settings.set('editor',currentEditorSettings);
-        }
 
     }
     return {

editor/js/ui/utils.js

@@ -26,18 +26,14 @@ RED.utils = (function() {
     function buildMessageSummaryValue(value) {
         var result;
         if (Array.isArray(value)) {
-            result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('array['+value.length+']');
+            result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').html('array['+value.length+']');
         } else if (value === null) {
             result = $('<span class="debug-message-object-value debug-message-type-null">null</span>');
         } else if (typeof value === 'object') {
             if (value.hasOwnProperty('type') && value.type === 'Buffer' && value.hasOwnProperty('data')) {
-                result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('buffer['+value.length+']');
+                result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').html('buffer['+value.length+']');
             } else if (value.hasOwnProperty('type') && value.type === 'array' && value.hasOwnProperty('data')) {
-                result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('array['+value.length+']');
-            } else if (value.hasOwnProperty('type') && value.type === 'function') {
-                result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').text('function');
-            } else if (value.hasOwnProperty('type') && value.type === 'number') {
-                result = $('<span class="debug-message-object-value debug-message-type-number"></span>').text(value.data);
+                result = $('<span class="debug-message-object-value debug-message-type-meta"></span>').html('array['+value.length+']');
             } else {
                 result = $('<span class="debug-message-object-value debug-message-type-meta">object</span>');
             }
@@ -49,8 +45,6 @@ RED.utils = (function() {
                 subvalue = sanitize(value);
             }
             result = $('<span class="debug-message-object-value debug-message-type-string"></span>').html('"'+formatString(subvalue)+'"');
-        } else if (typeof value === 'number') {
-            result = $('<span class="debug-message-object-value debug-message-type-number"></span>').text(""+value);
         } else {
             result = $('<span class="debug-message-object-value debug-message-type-other"></span>').text(""+value);
         }
@@ -131,7 +125,7 @@ RED.utils = (function() {
             e.stopPropagation();
             RED.clipboard.copyText(msg,copyPayload,"clipboard.copyMessageValue");
         })
-        if (strippedKey !== undefined && strippedKey !== '') {
+        if (strippedKey !== '') {
             var isPinned = pinnedPaths[sourceId].hasOwnProperty(strippedKey);
 
             var pinPath = $('<button class="editor-button editor-button-small debug-message-tools-pin"><i class="fa fa-map-pin"></i></button>').appendTo(tools).click(function(e) {
@@ -177,7 +171,7 @@ RED.utils = (function() {
     }
 
     function formatNumber(element,obj,sourceId,path,cycle,initialFormat) {
-        var format = (formattedPaths[sourceId] && formattedPaths[sourceId][path] && formattedPaths[sourceId][path]['number']) || initialFormat || "dec";
+        var format = (formattedPaths[sourceId] && formattedPaths[sourceId][path]) || initialFormat || "dec";
         if (cycle) {
             if (format === 'dec') {
                 if ((obj.toString().length===13) && (obj<=2147483647000)) {
@@ -193,12 +187,10 @@ RED.utils = (function() {
                 format = 'dec';
             }
             formattedPaths[sourceId] = formattedPaths[sourceId]||{};
-            formattedPaths[sourceId][path] = formattedPaths[sourceId][path]||{};
-            formattedPaths[sourceId][path]['number'] = format;
+            formattedPaths[sourceId][path] = format;
         } else if (initialFormat !== undefined){
             formattedPaths[sourceId] = formattedPaths[sourceId]||{};
-            formattedPaths[sourceId][path] = formattedPaths[sourceId][path]||{};
-            formattedPaths[sourceId][path]['number'] = format;
+            formattedPaths[sourceId][path] = format;
         }
         if (format === 'dec') {
             element.text(""+obj);
@@ -212,7 +204,7 @@ RED.utils = (function() {
     }
 
     function formatBuffer(element,button,sourceId,path,cycle) {
-        var format = (formattedPaths[sourceId] && formattedPaths[sourceId][path] && formattedPaths[sourceId][path]['buffer']) || "raw";
+        var format = (formattedPaths[sourceId] && formattedPaths[sourceId][path]) || "raw";
         if (cycle) {
             if (format === 'raw') {
                 format = 'string';
@@ -220,8 +212,7 @@ RED.utils = (function() {
                 format = 'raw';
             }
             formattedPaths[sourceId] = formattedPaths[sourceId]||{};
-            formattedPaths[sourceId][path] = formattedPaths[sourceId][path]||{};
-            formattedPaths[sourceId][path]['buffer'] = format;
+            formattedPaths[sourceId][path] = format;
         }
         if (format === 'raw') {
             button.text('raw');
@@ -298,24 +289,19 @@ RED.utils = (function() {
 
         var isArray = Array.isArray(obj);
         var isArrayObject = false;
-        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data') && ((obj.__enc__ && obj.type === 'array') || obj.type === 'Buffer')) {
+        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data') && ((obj.__encoded__ && obj.type === 'array') || obj.type === 'Buffer')) {
             isArray = true;
             isArrayObject = true;
         }
+
         if (obj === null || obj === undefined) {
             $('<span class="debug-message-type-null">'+obj+'</span>').appendTo(entryObj);
-        } else if (obj.__enc__ && obj.type === 'number') {
-            e = $('<span class="debug-message-type-number debug-message-object-header"></span>').text(obj.data).appendTo(entryObj);
-        } else if (typeHint === "function" || (obj.__enc__ && obj.type === 'function')) {
-            e = $('<span class="debug-message-type-meta debug-message-object-header"></span>').text("function").appendTo(entryObj);
-        } else if (typeHint === "internal" || (obj.__enc__ && obj.type === 'internal')) {
-            e = $('<span class="debug-message-type-meta debug-message-object-header"></span>').text("[internal]").appendTo(entryObj);
         } else if (typeof obj === 'string') {
             if (/[\t\n\r]/.test(obj)) {
                 element.addClass('collapsed');
                 $('<i class="fa fa-caret-right debug-message-object-handle"></i> ').prependTo(header);
                 makeExpandable(header, function() {
-                    $('<span class="debug-message-type-meta debug-message-object-type-header"></span>').text(typeHint||'string').appendTo(header);
+                    $('<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);
                 },function(state) {if (ontoggle) { ontoggle(path,state);}}, checkExpanded(strippedKey,expandPaths));
@@ -354,7 +340,7 @@ RED.utils = (function() {
                 if (originalLength === undefined) {
                     originalLength = data.length;
                 }
-                if (data.__enc__) {
+                if (data.__encoded__) {
                     data = data.data;
                 }
                 type = obj.type.toLowerCase();
@@ -369,7 +355,7 @@ RED.utils = (function() {
                 element.addClass('debug-message-buffer-raw');
             }
             if (key) {
-                headerHead = $('<span class="debug-message-type-meta"></span>').text(typeHint||(type+'['+originalLength+']')).appendTo(entryObj);
+                headerHead = $('<span class="debug-message-type-meta"></span>').html(typeHint||(type+'['+originalLength+']')).appendTo(entryObj);
             } else {
                 headerHead = $('<span class="debug-message-object-header"></span>').appendTo(entryObj);
                 $('<span>[ </span>').appendTo(headerHead);
@@ -392,7 +378,7 @@ RED.utils = (function() {
 
                 makeExpandable(header,function() {
                     if (!key) {
-                        headerHead = $('<span class="debug-message-type-meta debug-message-object-type-header"></span>').text(typeHint||(type+'['+originalLength+']')).appendTo(header);
+                        headerHead = $('<span class="debug-message-type-meta debug-message-object-type-header"></span>').html(typeHint||(type+'['+originalLength+']')).appendTo(header);
                     }
                     if (type === 'buffer') {
                         var stringRow = $('<div class="debug-message-string-rows"></div>').appendTo(element);
@@ -405,7 +391,7 @@ RED.utils = (function() {
                         }
                         $('<pre class="debug-message-type-string"></pre>').text(stringEncoding).appendTo(sr);
                         var bufferOpts = $('<span class="debug-message-buffer-opts"></span>').appendTo(headerHead);
-                        var switchFormat = $('<a href="#"></a>').addClass('selected').text('raw').appendTo(bufferOpts).click(function(e) {
+                        var switchFormat = $('<a href="#"></a>').addClass('selected').html('raw').appendTo(bufferOpts).click(function(e) {
                             e.preventDefault();
                             e.stopPropagation();
                             formatBuffer(element,$(this),sourceId,path,true);
@@ -482,12 +468,12 @@ RED.utils = (function() {
                 $('<i class="fa fa-caret-right debug-message-object-handle"></i> ').prependTo(header);
                 makeExpandable(header, function() {
                     if (!key) {
-                        $('<span class="debug-message-type-meta debug-message-object-type-header"></span>').text('object').appendTo(header);
+                        $('<span class="debug-message-type-meta debug-message-object-type-header"></span>').html('object').appendTo(header);
                     }
                     for (i=0;i<keys.length;i++) {
                         var row = $('<div class="debug-message-object-entry collapsed"></div>').appendTo(element);
                         var newPath = path;
-                        if (newPath !== undefined) {
+                        if (newPath) {
                             if (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(keys[i])) {
                                 newPath += (newPath.length > 0?".":"")+keys[i];
                             } else {
@@ -518,7 +504,7 @@ RED.utils = (function() {
                 checkExpanded(strippedKey,expandPaths));
             }
             if (key) {
-                $('<span class="debug-message-type-meta"></span>').text('object').appendTo(entryObj);
+                $('<span class="debug-message-type-meta"></span>').html('object').appendTo(entryObj);
             } else {
                 headerHead = $('<span class="debug-message-object-header"></span>').appendTo(entryObj);
                 $('<span>{ </span>').appendTo(headerHead);
@@ -703,25 +689,18 @@ RED.utils = (function() {
         return result;
     }
 
-    function separateIconPath(icon) {
-        var result = {module: "", file: ""};
-        if (icon) {
-            var index = icon.indexOf('/');
-            if (index !== -1) {
-                result.module = icon.slice(0, index);
-                result.file = icon.slice(index + 1);
-            } else {
-                result.file = icon;
-            }
+    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"
+        } else if (node && node.type === 'subflow') {
+            return "icons/node-red/subflow.png"
         }
-        return result;
-    }
-
-    function getDefaultNodeIcon(def,node) {
         var icon_url;
-        if (node && node.type === "subflow") {
-            icon_url = "node-red/subflow.png";
-        } else if (typeof def.icon === "function") {
+        if (typeof def.icon === "function") {
             try {
                 icon_url = def.icon.call(node);
             } catch(err) {
@@ -731,50 +710,7 @@ RED.utils = (function() {
         } else {
             icon_url = def.icon;
         }
-
-        var iconPath = separateIconPath(icon_url);
-        if (!iconPath.module) {
-            if (def.set) {
-                iconPath.module = def.set.module;
-            } else {
-                // Handle subflow instance nodes that don't have def.set
-                iconPath.module = "node-red";
-            }
-        }
-        return iconPath;
-    }
-
-    function isIconExists(iconPath) {
-        var iconSets = RED.nodes.getIconSets();
-        var iconFileList = iconSets[iconPath.module];
-        if (iconFileList && iconFileList.indexOf(iconPath.file) !== -1) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    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"
-        } else if (node && node.icon) {
-            var iconPath = separateIconPath(node.icon);
-            if (isIconExists(iconPath)) {
-                return "icons/" + node.icon;
-            }
-        }
-
-        var iconPath = getDefaultNodeIcon(def, node);
-        if (def.category === 'subflows') {
-            if (!isIconExists(iconPath)) {
-                return "icons/node-red/subflow.png";
-            }
-        }
-        return "icons/"+iconPath.module+"/"+iconPath.file;
+        return "icons/"+def.set.module+"/"+icon_url;
     }
 
     function getNodeLabel(node,defaultLabel) {
@@ -794,101 +730,12 @@ RED.utils = (function() {
         return RED.text.bidi.enforceTextDirectionWithUCC(l);
     }
 
-    var nodeColorCache = {};
-    function getNodeColor(type, def) {
-        var result = def.color;
-        var paletteTheme = RED.settings.theme('palette.theme') || [];
-        if (paletteTheme.length > 0) {
-            if (!nodeColorCache.hasOwnProperty(type)) {
-                var l = paletteTheme.length;
-                for (var i=0;i<l;i++ ){
-                    var themeRule = paletteTheme[i];
-                    if (themeRule.hasOwnProperty('category')) {
-                        if (!themeRule.hasOwnProperty('_category')) {
-                            themeRule._category = new RegExp(themeRule.category);
-                        }
-                        if (!themeRule._category.test(def.category)) {
-                            continue;
-                        }
-                    }
-                    if (themeRule.hasOwnProperty('type')) {
-                        if (!themeRule.hasOwnProperty('_type')) {
-                            themeRule._type = new RegExp(themeRule.type);
-                        }
-                        if (!themeRule._type.test(type)) {
-                            continue;
-                        }
-                    }
-                    nodeColorCache[type] = themeRule.color || def.color;
-                    break;
-                }
-            }
-            result = nodeColorCache[type];
-        }
-        return result;
-    }
-
-    function addSpinnerOverlay(container,contain) {
-        var spinner = $('<div class="projects-dialog-spinner "><img src="red/images/spin.svg"/></div>').appendTo(container);
-        if (contain) {
-            spinner.addClass('projects-dialog-spinner-contain');
-        }
-        return spinner;
-    }
-
-    function decodeObject(payload,format) {
-        if ((format === 'number') && (payload === "NaN")) {
-            payload = Number.NaN;
-        } else if ((format === 'number') && (payload === "Infinity")) {
-            payload = Infinity;
-        } else if ((format === 'number') && (payload === "-Infinity")) {
-            payload = -Infinity;
-        } else if (format === 'Object' || /^array/.test(format) || format === 'boolean' || format === 'number' ) {
-            payload = JSON.parse(payload);
-        } else if (/error/i.test(format)) {
-            payload = JSON.parse(payload);
-            payload = (payload.name?payload.name+": ":"")+payload.message;
-        } else if (format === 'null') {
-            payload = null;
-        } else if (format === 'undefined') {
-            payload = undefined;
-        } else if (/^buffer/.test(format)) {
-            var buffer = payload;
-            payload = [];
-            for (var c = 0; c < buffer.length; c += 2) {
-                payload.push(parseInt(buffer.substr(c, 2), 16));
-            }
-        }
-        return payload;
-    }
-
-    function parseContextKey(key) {
-        var parts = {};
-        var m = /^#:\((\S+?)\)::(.*)$/.exec(key);
-        if (m) {
-            parts.store = m[1];
-            parts.key = m[2];
-        } else {
-            parts.key = key;
-            if (RED.settings.context) {
-                parts.store = RED.settings.context.default;
-            }
-        }
-        return parts;
-    }
-
     return {
         createObjectElement: buildMessageElement,
         getMessageProperty: getMessageProperty,
         normalisePropertyExpression: normalisePropertyExpression,
         validatePropertyExpression: validatePropertyExpression,
-        separateIconPath: separateIconPath,
-        getDefaultNodeIcon: getDefaultNodeIcon,
         getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel,
-        getNodeColor: getNodeColor,
-        addSpinnerOverlay: addSpinnerOverlay,
-        decodeObject: decodeObject,
-        parseContextKey: parseContextKey
     }
 })();

editor/js/ui/view-navigator.js

@@ -1,168 +0,0 @@
-/**
- * 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.
- * 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.view.navigator = (function() {
-
-     var nav_scale = 25;
-     var nav_width = 5000/nav_scale;
-     var nav_height = 5000/nav_scale;
-
-     var navContainer;
-     var navBox;
-     var navBorder;
-     var navVis;
-     var scrollPos;
-     var scaleFactor;
-     var chartSize;
-     var dimensions;
-     var isDragging;
-     var isShowing = false;
-
-     function refreshNodes() {
-         if (!isShowing) {
-             return;
-         }
-         var navNode = navVis.selectAll(".navnode").data(RED.view.getActiveNodes(),function(d){return d.id});
-         navNode.exit().remove();
-         navNode.enter().insert("rect")
-             .attr('class','navnode')
-             .attr("pointer-events", "none");
-         navNode.each(function(d) {
-             d3.select(this).attr("x",function(d) { return (d.x-d.w/2)/nav_scale })
-             .attr("y",function(d) { return (d.y-d.h/2)/nav_scale })
-             .attr("width",function(d) { return Math.max(9,d.w/nav_scale) })
-             .attr("height",function(d) { return Math.max(3,d.h/nav_scale) })
-             .attr("fill",function(d) { return RED.utils.getNodeColor(d.type,d._def);})
-         });
-     }
-     function onScroll() {
-         if (!isDragging) {
-             resizeNavBorder();
-         }
-     }
-     function resizeNavBorder() {
-         if (navBorder) {
-             scaleFactor = RED.view.scale();
-             chartSize = [ $("#chart").width(), $("#chart").height()];
-             scrollPos = [$("#chart").scrollLeft(),$("#chart").scrollTop()];
-             navBorder.attr('x',scrollPos[0]/nav_scale)
-                      .attr('y',scrollPos[1]/nav_scale)
-                      .attr('width',chartSize[0]/nav_scale/scaleFactor)
-                      .attr('height',chartSize[1]/nav_scale/scaleFactor)
-         }
-     }
-     function toggle() {
-         if (!isShowing) {
-             isShowing = true;
-             $("#btn-navigate").addClass("selected");
-             resizeNavBorder();
-             refreshNodes();
-             $("#chart").on("scroll",onScroll);
-             navContainer.fadeIn(200);
-         } else {
-             isShowing = false;
-             navContainer.fadeOut(100);
-             $("#chart").off("scroll",onScroll);
-             $("#btn-navigate").removeClass("selected");
-         }
-     }
-
-     return {
-         init: function() {
-
-             $(window).resize(resizeNavBorder);
-             RED.events.on("sidebar:resize",resizeNavBorder);
-             RED.actions.add("core:toggle-navigator",toggle);
-             var hideTimeout;
-
-             navContainer = $('<div>').css({
-                 "position":"absolute",
-                 "bottom":$("#workspace-footer").height(),
-                 "right":0,
-                 zIndex: 1
-             }).appendTo("#workspace").hide();
-
-             navBox = d3.select(navContainer[0])
-                 .append("svg:svg")
-                 .attr("width", nav_width)
-                 .attr("height", nav_height)
-                 .attr("pointer-events", "all")
-                 .style({
-                     position: "absolute",
-                     bottom: 0,
-                     right:0,
-                     zIndex: 101,
-                     "border-left": "1px solid #ccc",
-                     "border-top": "1px solid #ccc",
-                     background: "rgba(245,245,245,0.5)",
-                     "box-shadow": "-1px 0 3px rgba(0,0,0,0.1)"
-                 });
-
-             navBox.append("rect").attr("x",0).attr("y",0).attr("width",nav_width).attr("height",nav_height).style({
-                 fill:"none",
-                 stroke:"none",
-                 pointerEvents:"all"
-             }).on("mousedown", function() {
-                 // Update these in case they have changed
-                 scaleFactor = RED.view.scale();
-                 chartSize = [ $("#chart").width(), $("#chart").height()];
-                 dimensions = [chartSize[0]/nav_scale/scaleFactor, chartSize[1]/nav_scale/scaleFactor];
-                 var newX = Math.max(0,Math.min(d3.event.offsetX+dimensions[0]/2,nav_width)-dimensions[0]);
-                 var newY = Math.max(0,Math.min(d3.event.offsetY+dimensions[1]/2,nav_height)-dimensions[1]);
-                 navBorder.attr('x',newX).attr('y',newY);
-                 isDragging = true;
-                 $("#chart").scrollLeft(newX*nav_scale*scaleFactor);
-                 $("#chart").scrollTop(newY*nav_scale*scaleFactor);
-             }).on("mousemove", function() {
-                 if (!isDragging) { return }
-                 if (d3.event.buttons === 0) {
-                     isDragging = false;
-                     return;
-                 }
-                 var newX = Math.max(0,Math.min(d3.event.offsetX+dimensions[0]/2,nav_width)-dimensions[0]);
-                 var newY = Math.max(0,Math.min(d3.event.offsetY+dimensions[1]/2,nav_height)-dimensions[1]);
-                 navBorder.attr('x',newX).attr('y',newY);
-                 $("#chart").scrollLeft(newX*nav_scale*scaleFactor);
-                 $("#chart").scrollTop(newY*nav_scale*scaleFactor);
-             }).on("mouseup", function() {
-                 isDragging = false;
-             })
-
-             navBorder = navBox.append("rect")
-                 .attr("stroke-dasharray","5,5")
-                 .attr("pointer-events", "none")
-                 .style({
-                     stroke: "#999",
-                     strokeWidth: 1,
-                     fill: "white",
-                 });
-
-             navVis = navBox.append("svg:g")
-
-
-            $("#btn-navigate").click(function(evt) {
-                evt.preventDefault();
-                toggle();
-            })
-        },
-        refresh: refreshNodes,
-        resize: resizeNavBorder,
-        toggle: toggle
-    }
-
-
-})();

editor/js/ui/view.js

@@ -58,10 +58,7 @@ RED.view = (function() {
         lastClickNode = null,
         dblClickPrimed = null,
         clickTime = 0,
-        clickElapsed = 0,
-        scroll_position = [],
-        quickAddActive = false,
-        quickAddLink = null;
+        clickElapsed = 0;
 
     var clipboard = "";
 
@@ -76,8 +73,6 @@ RED.view = (function() {
     var PORT_TYPE_INPUT = 1;
     var PORT_TYPE_OUTPUT = 0;
 
-    var chart = $("#chart");
-
     var outer = d3.select("#chart")
         .append("svg:svg")
         .attr("width", space_width)
@@ -86,9 +81,6 @@ RED.view = (function() {
         .style("cursor","crosshair")
         .on("mousedown", function() {
             focusView();
-        })
-        .on("contextmenu", function(){
-            d3.event.preventDefault();
         });
 
     var vis = outer
@@ -99,16 +91,6 @@ RED.view = (function() {
         .on("mousemove", canvasMouseMove)
         .on("mousedown", canvasMouseDown)
         .on("mouseup", canvasMouseUp)
-        .on("mouseenter", function() {
-            if (lasso) {
-                if (d3.event.buttons !== 1) {
-                    lasso.remove();
-                    lasso = null;
-                }
-            } else if (mouse_mode === RED.state.PANNING && d3.event.buttons !== 4) {
-                resetMouseVars();
-            }
-        })
         .on("touchend", function() {
             clearTimeout(touchStartTime);
             touchStartTime = null;
@@ -298,6 +280,7 @@ RED.view = (function() {
     function init() {
 
         RED.events.on("workspace:change",function(event) {
+            var chart = $("#chart");
             if (event.old !== 0) {
                 workspaceScrollPositions[event.old] = {
                     left:chart.scrollLeft(),
@@ -334,8 +317,6 @@ RED.view = (function() {
             redraw();
         });
 
-        RED.view.navigator.init();
-
         $("#btn-zoom-out").click(function() {zoomOut();});
         $("#btn-zoom-zero").click(function() {zoomZero();});
         $("#btn-zoom-in").click(function() {zoomIn();});
@@ -415,10 +396,10 @@ RED.view = (function() {
             }
         });
         $("#chart").focus(function() {
-            $("#workspace-tabs").addClass("workspace-focussed");
+            $("#workspace-tabs").addClass("workspace-focussed")
         });
         $("#chart").blur(function() {
-            $("#workspace-tabs").removeClass("workspace-focussed");
+            $("#workspace-tabs").removeClass("workspace-focussed")
         });
 
         RED.actions.add("core:copy-selection-to-internal-clipboard",copySelection);
@@ -464,82 +445,6 @@ RED.view = (function() {
         RED.actions.add("core:step-selection-left", function() { moveSelection(-20,0);});
     }
 
-    function generateLinkPath(origX,origY, destX, destY, sc) {
-        var dy = destY-origY;
-        var dx = destX-origX;
-        var delta = Math.sqrt(dy*dy+dx*dx);
-        var scale = lineCurveScale;
-        var scaleY = 0;
-        if (dx*sc > 0) {
-            if (delta < node_width) {
-                scale = 0.75-0.75*((node_width-delta)/node_width);
-                // scale += 2*(Math.min(5*node_width,Math.abs(dx))/(5*node_width));
-                // if (Math.abs(dy) < 3*node_height) {
-                //     scaleY = ((dy>0)?0.5:-0.5)*(((3*node_height)-Math.abs(dy))/(3*node_height))*(Math.min(node_width,Math.abs(dx))/(node_width)) ;
-                // }
-            }
-        } else {
-            scale = 0.4-0.2*(Math.max(0,(node_width-Math.min(Math.abs(dx),Math.abs(dy)))/node_width));
-        }
-        if (dx*sc > 0) {
-            return "M "+origX+" "+origY+
-                " C "+(origX+sc*(node_width*scale))+" "+(origY+scaleY*node_height)+" "+
-                (destX-sc*(scale)*node_width)+" "+(destY-scaleY*node_height)+" "+
-                destX+" "+destY
-        } else {
-
-            var midX = Math.floor(destX-dx/2);
-            var midY = Math.floor(destY-dy/2);
-            //
-            if (dy === 0) {
-                midY = destY + node_height;
-            }
-            var cp_height = node_height/2;
-            var y1 = (destY + midY)/2
-            var topX =origX + sc*node_width*scale;
-            var topY = dy>0?Math.min(y1 - dy/2 , origY+cp_height):Math.max(y1 - dy/2 , origY-cp_height);
-            var bottomX = destX - sc*node_width*scale;
-            var bottomY = dy>0?Math.max(y1, destY-cp_height):Math.min(y1, destY+cp_height);
-            var x1 = (origX+topX)/2;
-            var scy = dy>0?1:-1;
-            var cp = [
-                // Orig -> Top
-                [x1,origY],
-                [topX,dy>0?Math.max(origY, topY-cp_height):Math.min(origY, topY+cp_height)],
-                // Top -> Mid
-                // [Mirror previous cp]
-                [x1,dy>0?Math.min(midY, topY+cp_height):Math.max(midY, topY-cp_height)],
-                // Mid -> Bottom
-                // [Mirror previous cp]
-                [bottomX,dy>0?Math.max(midY, bottomY-cp_height):Math.min(midY, bottomY+cp_height)],
-                // Bottom -> Dest
-                // [Mirror previous cp]
-                [(destX+bottomX)/2,destY]
-            ];
-            if (cp[2][1] === topY+scy*cp_height) {
-                if (Math.abs(dy) < cp_height*10) {
-                    cp[1][1] = topY-scy*cp_height/2;
-                    cp[3][1] = bottomY-scy*cp_height/2;
-                }
-                cp[2][0] = topX;
-            }
-            return "M "+origX+" "+origY+
-                " C "+
-                   cp[0][0]+" "+cp[0][1]+" "+
-                   cp[1][0]+" "+cp[1][1]+" "+
-                   topX+" "+topY+
-                " S "+
-                   cp[2][0]+" "+cp[2][1]+" "+
-                   midX+" "+midY+
-               " S "+
-                  cp[3][0]+" "+cp[3][1]+" "+
-                  bottomX+" "+bottomY+
-                " S "+
-                    cp[4][0]+" "+cp[4][1]+" "+
-                    destX+" "+destY
-        }
-    }
-
 
     function addNode(type,x,y) {
         var m = /^subflow:(.+)$/.exec(type);
@@ -582,7 +487,6 @@ RED.view = (function() {
             }
         } else {
             var subflow = RED.nodes.subflow(m[1]);
-            nn.name = "";
             nn.inputs = subflow.in.length;
             nn.outputs = subflow.out.length;
         }
@@ -618,15 +522,6 @@ RED.view = (function() {
     function canvasMouseDown() {
         var point;
 
-        if (d3.event.button === 1) {
-            // Middle Click pan
-            mouse_mode = RED.state.PANNING;
-            mouse_position = [d3.event.pageX,d3.event.pageY]
-            scroll_position = [chart.scrollLeft(),chart.scrollTop()];
-
-            return;
-        }
-
         if (!mousedown_node && !mousedown_link) {
             selected_link = null;
             updateSelection();
@@ -647,16 +542,11 @@ RED.view = (function() {
                     mouse_mode = RED.state.QUICK_JOINING;
                     $(window).on('keyup',disableQuickJoinEventHandler);
                 }
-                quickAddActive = true;
+
                 RED.typeSearch.show({
                     x:d3.event.clientX-mainPos.left-node_width/2,
                     y:d3.event.clientY-mainPos.top-node_height/2,
-                    cancel: function() {
-                        quickAddActive = false;
-                        resetMouseVars();
-                    },
                     add: function(type) {
-                        quickAddActive = false;
                         var result = addNode(type);
                         if (!result) {
                             return;
@@ -665,10 +555,11 @@ RED.view = (function() {
                         var historyEvent = result.historyEvent;
                         nn.x = point[0];
                         nn.y = point[1];
-                        if (mouse_mode === RED.state.QUICK_JOINING || quickAddLink) {
-                            if (quickAddLink || drag_lines.length > 0) {
-                                var drag_line = quickAddLink||drag_lines[0];
+                        if (mouse_mode === RED.state.QUICK_JOINING) {
+                            if (drag_lines.length > 0) {
+                                var drag_line = drag_lines[0];
                                 var src = null,dst,src_port;
+
                                 if (drag_line.portType === PORT_TYPE_OUTPUT && nn.inputs > 0) {
                                     src = drag_line.node;
                                     src_port = drag_line.port;
@@ -683,9 +574,9 @@ RED.view = (function() {
                                     RED.nodes.addLink(link);
                                     historyEvent.links = [link];
                                     hideDragLines();
-                                    if (!quickAddLink && drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
+                                    if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
                                         showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                    } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
+                                    } else if (drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
                                         showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
                                     } else {
                                         resetMouseVars();
@@ -703,9 +594,9 @@ RED.view = (function() {
                                     resetMouseVars();
                                 }
                             }
-                            quickAddLink = null;
                         }
 
+
                         RED.history.push(historyEvent);
                         RED.nodes.add(nn);
                         RED.editor.validateNode(nn);
@@ -746,6 +637,7 @@ RED.view = (function() {
     function canvasMouseMove() {
         var i;
         var node;
+        mouse_position = d3.touches(this)[0]||d3.mouse(this);
         // Prevent touch scrolling...
         //if (d3.touches(this)[0]) {
         //    d3.event.preventDefault();
@@ -756,22 +648,6 @@ RED.view = (function() {
         //if (point[0]-container.scrollLeft < 30 && container.scrollLeft > 0) { container.scrollLeft -= 15; }
         //console.log(d3.mouse(this),container.offsetWidth,container.offsetHeight,container.scrollLeft,container.scrollTop);
 
-        if (mouse_mode === RED.state.PANNING) {
-
-            var pos = [d3.event.pageX,d3.event.pageY];
-            var deltaPos = [
-                mouse_position[0]-pos[0],
-                mouse_position[1]-pos[1]
-            ];
-
-            chart.scrollLeft(scroll_position[0]+deltaPos[0])
-            chart.scrollTop(scroll_position[1]+deltaPos[1])
-            return
-        }
-
-        mouse_position = d3.touches(this)[0]||d3.mouse(this);
-
-
         if (lasso) {
             var ox = parseInt(lasso.attr("ox"));
             var oy = parseInt(lasso.attr("oy"));
@@ -807,7 +683,7 @@ RED.view = (function() {
         var mousePos;
         if (mouse_mode == RED.state.JOINING || mouse_mode === RED.state.QUICK_JOINING) {
             // update drag line
-            if (drag_lines.length === 0 && mousedown_port_type !== null) {
+            if (drag_lines.length === 0) {
                 if (d3.event.shiftKey) {
                     // Get all the wires we need to detach.
                     var links = [];
@@ -870,7 +746,28 @@ RED.view = (function() {
 
                 var sc = (drag_line.portType === PORT_TYPE_OUTPUT)?1:-1;
 
-                drag_line.el.attr("d",generateLinkPath(drag_line.node.x+sc*drag_line.node.w/2,drag_line.node.y+portY,mousePos[0],mousePos[1],sc));
+                var dy = mousePos[1]-(drag_line.node.y+portY);
+                var dx = mousePos[0]-(drag_line.node.x+sc*drag_line.node.w/2);
+                var delta = Math.sqrt(dy*dy+dx*dx);
+                var scale = lineCurveScale;
+                var scaleY = 0;
+
+                if (delta < node_width) {
+                    scale = 0.75-0.75*((node_width-delta)/node_width);
+                }
+                if (dx*sc < 0) {
+                    scale += 2*(Math.min(5*node_width,Math.abs(dx))/(5*node_width));
+                    if (Math.abs(dy) < 3*node_height) {
+                        scaleY = ((dy>0)?0.5:-0.5)*(((3*node_height)-Math.abs(dy))/(3*node_height))*(Math.min(node_width,Math.abs(dx))/(node_width)) ;
+                    }
+                }
+
+                drag_line.el.attr("d",
+                    "M "+(drag_line.node.x+sc*drag_line.node.w/2)+" "+(drag_line.node.y+portY)+
+                    " C "+(drag_line.node.x+sc*(drag_line.node.w/2+node_width*scale))+" "+(drag_line.node.y+portY+scaleY*node_height)+" "+
+                    (mousePos[0]-sc*(scale)*node_width)+" "+(mousePos[1]-scaleY*node_height)+" "+
+                    mousePos[0]+" "+mousePos[1]
+                    );
             }
             d3.event.preventDefault();
         } else if (mouse_mode == RED.state.MOVING) {
@@ -1002,10 +899,6 @@ RED.view = (function() {
     function canvasMouseUp() {
         var i;
         var historyEvent;
-        if (mouse_mode === RED.state.PANNING) {
-            resetMouseVars();
-            return
-        }
         if (mouse_mode === RED.state.QUICK_JOINING) {
             return;
         }
@@ -1120,20 +1013,17 @@ RED.view = (function() {
     function zoomIn() {
         if (scaleFactor < 2) {
             scaleFactor += 0.1;
-            RED.view.navigator.resize();
             redraw();
         }
     }
     function zoomOut() {
         if (scaleFactor > 0.3) {
             scaleFactor -= 0.1;
-            RED.view.navigator.resize();
             redraw();
         }
     }
     function zoomZero() {
         scaleFactor = 1;
-        RED.view.navigator.resize();
         redraw();
     }
 
@@ -1251,6 +1141,7 @@ RED.view = (function() {
                 }
             }
         }
+
         var selectionJSON = activeWorkspace+":"+JSON.stringify(selection,function(key,value) {
             if (key === 'nodes') {
                 return value.map(function(n) { return n.id })
@@ -1457,7 +1348,7 @@ RED.view = (function() {
         mouseup_node = null;
         mousedown_link = null;
         mouse_mode = 0;
-        mousedown_port_type = null;
+        mousedown_port_type = PORT_TYPE_OUTPUT;
         activeSpliceLink = null;
         spliceActive = false;
         d3.select(".link_splice").classed("link_splice",false);
@@ -1470,9 +1361,6 @@ RED.view = (function() {
     function disableQuickJoinEventHandler(evt) {
         // Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari)
         if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91) {
-            if (quickAddActive && drag_lines.length > 0) {
-                quickAddLink = drag_lines[0];
-            }
             resetMouseVars();
             hideDragLines();
             redraw();
@@ -1484,10 +1372,6 @@ RED.view = (function() {
         //console.log(d,portType,portIndex);
         // disable zoom
         //vis.call(d3.behavior.zoom().on("zoom"), null);
-        if (d3.event.button === 1) {
-            return;
-        }
-
         mousedown_node = d;
         mousedown_port_type = portType;
         mousedown_port_index = portIndex || 0;
@@ -1506,7 +1390,7 @@ RED.view = (function() {
 
     function portMouseUp(d,portType,portIndex) {
         var i;
-        if (mouse_mode === RED.state.QUICK_JOINING && drag_lines.length > 0) {
+        if (mouse_mode === RED.state.QUICK_JOINING) {
             if (drag_lines[0].node===d) {
                 return
             }
@@ -1719,9 +1603,6 @@ RED.view = (function() {
 
     function nodeMouseDown(d) {
         focusView();
-        if (d3.event.button === 1) {
-            return;
-        }
         //var touch0 = d3.event;
         //var pos = [touch0.pageX,touch0.pageY];
         //RED.touch.radialMenu.show(d3.select(this),pos);
@@ -1765,9 +1646,7 @@ RED.view = (function() {
         clickElapsed = now-clickTime;
         clickTime = now;
 
-        dblClickPrimed = (lastClickNode == mousedown_node &&
-            d3.event.buttons === 1 &&
-            !d3.event.shiftKey && !d3.event.metaKey && !d3.event.altKey && !d3.event.ctrlKey);
+        dblClickPrimed = (lastClickNode == mousedown_node);
         lastClickNode = mousedown_node;
 
         var i;
@@ -2038,7 +1917,7 @@ RED.view = (function() {
                             .attr("ry",4)
                             .attr("width",16)
                             .attr("height",node_height-12)
-                            .attr("fill",function(d) { return RED.utils.getNodeColor(d.type,d._def); /*d._def.color;*/})
+                            .attr("fill",function(d) { return d._def.color;})
                             .attr("cursor","pointer")
                             .on("mousedown",function(d) {if (!lasso && isButtonEnabled(d)) {focusView();d3.select(this).attr("fill-opacity",0.2);d3.event.preventDefault(); d3.event.stopPropagation();}})
                             .on("mouseup",function(d) {if (!lasso && isButtonEnabled(d)) { d3.select(this).attr("fill-opacity",0.4);d3.event.preventDefault();d3.event.stopPropagation();}})
@@ -2059,7 +1938,7 @@ RED.view = (function() {
                         .classed("node_unknown",function(d) { return d.type == "unknown"; })
                         .attr("rx", 5)
                         .attr("ry", 5)
-                        .attr("fill",function(d) { return RED.utils.getNodeColor(d.type,d._def); /*d._def.color;*/})
+                        .attr("fill",function(d) { return d._def.color;})
                         .on("mouseup",nodeMouseUp)
                         .on("mousedown",nodeMouseDown)
                         .on("touchstart",function(d) {
@@ -2456,17 +2335,32 @@ RED.view = (function() {
                         var numOutputs = d.source.outputs || 1;
                         var sourcePort = d.sourcePort || 0;
                         var y = -((numOutputs-1)/2)*13 +13*sourcePort;
+
+                        var dy = d.target.y-(d.source.y+y);
+                        var dx = (d.target.x-d.target.w/2)-(d.source.x+d.source.w/2);
+                        var delta = Math.sqrt(dy*dy+dx*dx);
+                        var scale = lineCurveScale;
+                        var scaleY = 0;
+                        if (delta < node_width) {
+                            scale = 0.75-0.75*((node_width-delta)/node_width);
+                        }
+
+                        if (dx < 0) {
+                            scale += 2*(Math.min(5*node_width,Math.abs(dx))/(5*node_width));
+                            if (Math.abs(dy) < 3*node_height) {
+                                scaleY = ((dy>0)?0.5:-0.5)*(((3*node_height)-Math.abs(dy))/(3*node_height))*(Math.min(node_width,Math.abs(dx))/(node_width)) ;
+                            }
+                        }
+
                         d.x1 = d.source.x+d.source.w/2;
                         d.y1 = d.source.y+y;
                         d.x2 = d.target.x-d.target.w/2;
                         d.y2 = d.target.y;
 
-                        // return "M "+d.x1+" "+d.y1+
-                        //     " C "+(d.x1+scale*node_width)+" "+(d.y1+scaleY*node_height)+" "+
-                        //     (d.x2-scale*node_width)+" "+(d.y2-scaleY*node_height)+" "+
-                        //     d.x2+" "+d.y2;
-
-                        return generateLinkPath(d.x1,d.y1,d.x2,d.y2,1);
+                        return "M "+d.x1+" "+d.y1+
+                            " C "+(d.x1+scale*node_width)+" "+(d.y1+scaleY*node_height)+" "+
+                            (d.x2-scale*node_width)+" "+(d.y2-scaleY*node_height)+" "+
+                            d.x2+" "+d.y2;
                     });
                 }
             })
@@ -2602,7 +2496,7 @@ RED.view = (function() {
                 }
             ).classed("link_selected", false);
         }
-        RED.view.navigator.refresh();
+
         if (d3.event) {
             d3.event.preventDefault();
         }
@@ -2873,12 +2767,10 @@ RED.view = (function() {
             if (v === undefined) {
                 return gridSize;
             } else {
-                gridSize = Math.max(5,v);
+                gridSize = v;
                 updateGrid();
             }
-        },
-        getActiveNodes: function() {
-            return activeNodes;
         }
+
     };
 })();

editor/js/ui/workspaces.js

@@ -43,7 +43,7 @@ RED.workspaces = (function() {
         return ws;
     }
     function deleteWorkspace(ws) {
-        if (workspaceTabCount === 1) {
+        if (workspace_tabs.count() == 1) {
             return;
         }
         removeWorkspace(ws);
@@ -65,7 +65,7 @@ RED.workspaces = (function() {
             buttons: [
                 {
                     id: "node-dialog-delete",
-                    class: 'leftButton'+((workspaceTabCount === 1)?" disabled":""),
+                    class: 'leftButton'+((workspace_tabs.count() == 1)?" disabled":""),
                     text: RED._("common.label.delete"), //'<i class="fa fa-trash"></i>',
                     click: function() {
                         deleteWorkspace(workspace);
@@ -172,12 +172,12 @@ RED.workspaces = (function() {
                         i.addClass('fa-toggle-on');
                         i.removeClass('fa-toggle-off');
                         $("#node-input-disabled").prop("checked",false);
-                        $("#node-input-disabled-label").text(RED._("editor:workspace.enabled"));
+                        $("#node-input-disabled-label").html(RED._("editor:workspace.enabled"));
                     } else {
                         i.addClass('fa-toggle-off');
                         i.removeClass('fa-toggle-on');
                         $("#node-input-disabled").prop("checked",true);
-                        $("#node-input-disabled-label").text(RED._("editor:workspace.disabled"));
+                        $("#node-input-disabled-label").html(RED._("editor:workspace.disabled"));
                     }
                 })
 
@@ -185,13 +185,13 @@ RED.workspaces = (function() {
                     $("#node-input-disabled").prop("checked",workspace.disabled);
                     if (workspace.disabled) {
                         dialogForm.find("#node-input-disabled-btn i").removeClass('fa-toggle-on').addClass('fa-toggle-off');
-                        $("#node-input-disabled-label").text(RED._("editor:workspace.disabled"));
+                        $("#node-input-disabled-label").html(RED._("editor:workspace.disabled"));
                     } else {
-                        $("#node-input-disabled-label").text(RED._("editor:workspace.enabled"));
+                        $("#node-input-disabled-label").html(RED._("editor:workspace.enabled"));
                     }
                 } else {
                     workspace.disabled = false;
-                    $("#node-input-disabled-label").text(RED._("editor:workspace.enabled"));
+                    $("#node-input-disabled-label").html(RED._("editor:workspace.enabled"));
                 }
 
                 $('<input type="text" style="display: none;" />').prependTo(dialogForm);
@@ -214,7 +214,6 @@ RED.workspaces = (function() {
 
 
     var workspace_tabs;
-    var workspaceTabCount = 0;
     function createWorkspaceTabs() {
         workspace_tabs = RED.tabs.create({
             id: "workspace-tabs",
@@ -241,26 +240,14 @@ RED.workspaces = (function() {
                 }
             },
             onadd: function(tab) {
-                if (tab.type === "tab") {
-                    workspaceTabCount++;
-                }
                 $('<span class="workspace-disabled-icon"><i class="fa fa-ban"></i> </span>').prependTo("#red-ui-tab-"+(tab.id.replace(".","-"))+" .red-ui-tab-label");
                 if (tab.disabled) {
                     $("#red-ui-tab-"+(tab.id.replace(".","-"))).addClass('workspace-disabled');
                 }
-                RED.menu.setDisabled("menu-item-workspace-delete",workspaceTabCount <= 1);
-                if (workspaceTabCount === 1) {
-                    showWorkspace();
-                }
+                RED.menu.setDisabled("menu-item-workspace-delete",workspace_tabs.count() == 1);
             },
             onremove: function(tab) {
-                if (tab.type === "tab") {
-                    workspaceTabCount--;
-                }
-                RED.menu.setDisabled("menu-item-workspace-delete",workspaceTabCount <= 1);
-                if (workspaceTabCount === 0) {
-                    hideWorkspace();
-                }
+                RED.menu.setDisabled("menu-item-workspace-delete",workspace_tabs.count() == 1);
             },
             onreorder: function(oldOrder, newOrder) {
                 RED.history.push({t:'reorder',order:oldOrder,dirty:RED.nodes.dirty()});
@@ -273,17 +260,6 @@ RED.workspaces = (function() {
                 addWorkspace();
             }
         });
-        workspaceTabCount = 0;
-    }
-    function showWorkspace() {
-        $("#workspace .red-ui-tabs").show()
-        $("#chart").show()
-        $("#workspace-footer").children().show()
-    }
-    function hideWorkspace() {
-        $("#workspace .red-ui-tabs").hide()
-        $("#chart").hide()
-        $("#workspace-footer").children().hide()
     }
 
     function init() {
@@ -304,8 +280,6 @@ RED.workspaces = (function() {
         RED.actions.add("core:add-flow",addWorkspace);
         RED.actions.add("core:edit-flow",editWorkspace);
         RED.actions.add("core:remove-flow",removeWorkspace);
-
-        hideWorkspace();
     }
 
     function editWorkspace(id) {
@@ -320,9 +294,6 @@ RED.workspaces = (function() {
                 workspace_tabs.removeTab(ws.id);
             }
         }
-        if (ws.id === activeWorkspace) {
-            activeWorkspace = 0;
-        }
     }
 
     function setWorkspaceOrder(order) {
@@ -342,7 +313,7 @@ RED.workspaces = (function() {
             return workspace_tabs.contains(id);
         },
         count: function() {
-            return workspaceTabCount;
+            return workspace_tabs.count();
         },
         active: function() {
             return activeWorkspace

editor/js/user.js

@@ -188,7 +188,6 @@ RED.user = (function() {
                         RED.settings.load(function() {
                             RED.notify(RED._("user.loggedInAs",{name:RED.settings.user.username}),"success");
                             updateUserMenu();
-                            RED.events.emit("login",RED.settings.user.username);
                         });
                     });
                 }
@@ -231,66 +230,10 @@ RED.user = (function() {
         }
 
     }
-
-    var readRE = /^((.+)\.)?read$/
-    var writeRE = /^((.+)\.)?write$/
-
-    function hasPermission(permission) {
-        if (permission === "") {
-            return true;
-        }
-        if (!RED.settings.user) {
-            return true;
-        }
-        return checkPermission(RED.settings.user.permissions||"",permission);
-    }
-    function checkPermission(userScope,permission) {
-        if (permission === "") {
-            return true;
-        }
-        var i;
-
-        if (Array.isArray(permission)) {
-            // Multiple permissions requested - check each one
-            for (i=0;i<permission.length;i++) {
-                if (!checkPermission(userScope,permission[i])) {
-                    return false;
-                }
-            }
-            // All permissions check out
-            return true;
-        }
-
-        if (Array.isArray(userScope)) {
-            if (userScope.length === 0) {
-                return false;
-            }
-            for (i=0;i<userScope.length;i++) {
-                if (checkPermission(userScope[i],permission)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        if (userScope === "*" || userScope === permission) {
-            return true;
-        }
-
-        if (userScope === "read" || userScope === "*.read") {
-            return readRE.test(permission);
-        } else if (userScope === "write" || userScope === "*.write") {
-            return writeRE.test(permission);
-        }
-        return false;
-    }
-
-
     return {
         init: init,
         login: login,
-        logout: logout,
-        hasPermission: hasPermission
+        logout: logout
     }
 
 })();

editor/sass/bootstrap.scss

@@ -19,7 +19,3 @@
 div.btn-group, a.btn {
    @include disable-selection;
 }
-
-.dropdown-menu>li>a {
-    color: #444;
-}

editor/sass/colors.scss

@@ -66,4 +66,4 @@ $editor-button-background-primary-hover: #6E0A1E;
 $editor-button-color: #999;
 $editor-button-background: #fff;
 
-$shade-color: rgba(160,160,160,0.5);
+$shade-color: rgba(200,200,200,0.5);

editor/sass/debug.scss

@@ -64,22 +64,22 @@
             display: inline-block;
         }
     }
-}
-.debug-message-row {
-    .debug-message-tools-pin {
-        display: none;
-    }
-    &.debug-message-row-pinned .debug-message-tools-pin {
-        display: inline-block;
-    }
-    &:hover {
-        background: #f3f3f3;
-        &>.debug-message-tools {
-            .debug-message-tools-copy {
-                display: inline-block;
-            }
-            .debug-message-tools-pin {
-                display: inline-block;
+    .debug-message-row {
+        .debug-message-tools-pin {
+            display: none;
+        }
+        &.debug-message-row-pinned .debug-message-tools-pin {
+            display: inline-block;
+        }
+        &:hover {
+            background: #f3f3f3;
+            &>.debug-message-tools {
+                .debug-message-tools-copy {
+                    display: inline-block;
+                }
+                .debug-message-tools-pin {
+                    display: inline-block;
+                }
             }
         }
     }
@@ -113,8 +113,8 @@
 
 .debug-message-meta {
     background: #fff;
-    font-size: 11px;
-    color: #707070;
+    font-size: 10px;
+    color: #777;
 }
 .debug-message-date {
     padding: 1px 5px 1px 1px;
@@ -125,7 +125,7 @@
 }
 .debug-message-name {
     padding: 1px 5px;
-    color: #707070;
+    color: #777;
 }
 .debug-message-tools {
     position: absolute;
@@ -159,7 +159,7 @@
 .debug-message-element {
     color: #333;
     font-family: Menlo, monospace;
-    font-size: 13px !important;
+    font-size: 12px !important;
     line-height: 1.3em;
 }
 .debug-message-object-key {
@@ -188,9 +188,11 @@
 .debug-message-element.collapsed>span>.debug-message-object-handle {
     transform: rotate(0deg);
 }
+
 .debug-message-object-entry.collapsed > .debug-message-object-entry {
     display:none;
 }
+
 .debug-message-element.collapsed .debug-message-object-entry {
     display:none;
 }
@@ -200,13 +202,14 @@
 .debug-message-element.collapsed .debug-message-buffer-opts {
     display: none;
 }
+
 .debug-message-element.collapsed .debug-message-object-type-header {
     display:none;
 }
 .debug-message-object-entry pre {
     font-family: Menlo, monospace;
-    font-size: 13px;
-    line-height: 1.2em;
+    font-size: 12px;
+    line-height: 1.4em;
     margin: 0 0 0 -1em;
 }
 

editor/sass/diff.scss

@@ -15,17 +15,18 @@
  **/
 
 
-.node-dialog-view-diff-panel {
-    padding: 5px;
-    padding-top: 30px;
-    position: relative;
-
+#node-dialog-view-diff {
     .red-ui-editableList-container {
         border-radius:1px;
         padding:0;
         background: #f9f9f9;
     }
-    .node-dialog-view-diff-diff {
+    #node-dialog-view-diff-diff {
+        position: absolute;
+        top:80px;
+        bottom:10px;
+        left:10px;
+        right:10px;
         li {
             background: #f9f9f9;
             padding: 0px;
@@ -38,29 +39,16 @@
         // padding-bottom: 5px;
     }
 }
-.node-diff-container {
+#node-dialog-view-diff-headers {
     position: absolute;
-    top: 40px;
-    right:0;
-    bottom: 0;
-    left: 0;
-    overflow-y: scroll;
-}
-
-.node-dialog-view-diff-headers {
-    position: absolute;
-    left:232px;
-    right:12px;
-    top: 5px;
+    left:237px;
+    right:18px;
+    top: 55px;
     height: 25px;
     div {
         height: 25px;
         display: inline-block;
         box-sizing: border-box;
-        padding-top: 2px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
         width: 50%;
         background: #f9f9f9;
         text-align: center;
@@ -74,6 +62,11 @@
 }
 
 .node-diff-toolbar {
+    position:absolute;
+    top:0;
+    left:0;
+    right:0;
+    height: 43px;
     box-sizing: border-box;
     color: #666;
     text-align: right;
@@ -364,7 +357,6 @@
 .node-diff-added { color: #009900}
 .node-diff-deleted { color: #f80000}
 .node-diff-changed { color: #f89406}
-.node-diff-unchanged { color: #bbb}
 .node-diff-conflicted { color: purple}
 
 
@@ -508,169 +500,37 @@
 }
 
 
-ul.node-dialog-configm-deploy-list {
-    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;
+#node-dialog-confirm-deploy {
+    .node-dialog-confirm-row {
+        text-align: left; padding-top: 10px;
     }
-    i {
-        vertical-align:middle;
-        text-align: center;
-        font-size: 30px;
-        width: 30px;
-        margin-right: 10px;
+    ul {
+        font-size: 0.9em;
+        width: 400px;
+        margin: 10px auto;
+        text-align: left;
     }
-    div {
-        vertical-align: middle;
-        width: calc(100% - 60px);
-        display:inline-block;
+    .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;
 }
-.node-diff-text-diff-button {
-    float: right;
-    margin: 2px 3px;
-    line-height: 14px;
-    height: 16px;
-
-}
-.node-text-diff {
-    height: 100%;
-    overflow-y:auto;
-
-    table.node-text-diff-content {
-        margin: 10px;
-        border: 1px solid $secondary-border-color;
-        border-radius: 3px;
-        table-layout: fixed;
-        width: calc(100% - 20px);
-        td {
-            vertical-align: top;
-            word-wrap: break-word;
-        }
-        td.lineno {
-            font-family: monospace;
-            text-align: right;
-            color: #aaa;
-            background: #f6f6f6;
-            padding: 1px 5px;
-        }
-        td.lineno:nth-child(3) {
-            border-left: 1px solid $secondary-border-color;
-        }
-        td.linetext {
-            font-family: monospace;
-            white-space: pre-wrap;
-            padding: 1px 5px;
-            span.prefix {
-                width: 30px;
-                display: inline-block;
-                text-align: center;
-                color: #999;
-            }
-        }
-        td.blank {
-            background: #f6f6f6;
-        }
-        td.added {
-            background: #eefaee;
-        }
-        td.removed {
-            background: #fadddd;
-        }
-        tr.mergeHeader td {
-            color: #800080;
-            background: #e5f9ff;
-            height: 26px;
-            vertical-align: middle;
-        }
-        tr.mergeHeader-separator td {
-            color: #800080;
-            background: darken(#e5f9ff, 10%);
-            height: 0px;
-        }
-        tr.mergeHeader-ours td {
-            border-top: 2px solid darken(#e5f9ff, 10%);
-        }
-        tr.mergeHeader-theirs td {
-            border-bottom: 2px solid darken(#e5f9ff, 10%);
-        }
-        td.unchanged {
-            color: #999;
-        }
-        tr.unchanged {
-            background: #fefefe;
-        }
-        tr.start-block {
-            border-top: 1px solid #f0f0f0;
-        }
-        tr.end-block {
-            border-bottom: 1px solid #f0f0f0;
-        }
-        tr.node-text-diff-file-header td {
-            .filename {
-                font-family: monospace;
-            }
-            background: #f3f3f3;
-            padding: 5px 10px 5px 0;
-            color: #333;
-            cursor: pointer;
-            i.node-diff-chevron {
-                width: 30px;
-            }
-        }
-        tr.node-text-diff-file-header.collapsed {
-            td i.node-diff-chevron {
-                transform: rotate(-90deg);
-            }
-        }
-        tr.node-text-diff-commit-header td {
-            background: #f3f3f3;
-            padding: 5px 10px;
-            color: #333;
-            h3 {
-                font-size: 1.4em;
-                margin: 0;
-            }
-            .commit-summary {
-                border-top: 1px solid $secondary-border-color;
-                padding-top: 5px;
-                color: #999;
-            }
-            .commit-body {
-                margin-bottom:15px;
-                white-space: pre;
-                line-height: 1.2em;
-            }
-        }
-
-        tr.node-text-diff-header > td:not(.flow-diff) {
-            font-family: monospace;
-            padding: 5px 10px;
-            text-align: left;
-            color: #666;
-            background: #ffd;
-            height: 30px;
-            vertical-align: middle;
-            border-top: 1px solid #f0f0f0;
-            border-bottom: 1px solid #f0f0f0;
-        }
-        tr.node-text-diff-expand td {
-            cursor: pointer;
-            &:hover {
-                background: #ffc;
-            }
-        }
-    }
-}

editor/sass/editor.scss

@@ -158,10 +158,7 @@
     top: -1px;
     bottom: -1px;
 }
-#full-shade {
-    @include shade;
-    z-index: 15;
-}
+
 
 .dialog-form,#dialog-form, #node-config-dialog-edit-form {
     height: 100%;
@@ -199,16 +196,12 @@
     text-decoration: underline;
 }
 
-.form-warning {
-    border-color: #d6615f;
-}
-
 .node-text-editor {
     border:1px solid #ccc;
     border-radius:5px;
     overflow: hidden;
     font-size: 14px !important;
-    font-family: Menlo, Consolas, 'DejaVu Sans Mono', Courier, monospace !important;
+    font-family: monospace !important;
 }
 
 .editor-button {
@@ -216,10 +209,8 @@
     height: 34px;
     line-height: 32px;
     font-size: 13px;
-    border-radius: 2px;
+    border-radius: 4px;
     padding: 0 10px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
     &.toggle {
         @include workspace-button-toggle;
     }
@@ -228,7 +219,6 @@
 
 .editor-button-small {
     height: 20px;
-    min-width: 20px;
     line-height: 18px;
     font-size: 10px;
     border-radius: 2px;
@@ -330,13 +320,6 @@
     input {
         width: calc(100% - 100px);
     }
-    #node-settings-icon-module {
-        width: calc(55% - 50px);
-    }
-    #node-settings-icon-file {
-        width: calc(45% - 55px);
-        margin-left: 5px;
-    }
 }
 .node-label-form-none {
     span {
@@ -353,64 +336,3 @@
     }
 
 }
-#node-settings-icon {
-    margin-left: 10px;
-    width: calc(100% - 163px);
-}
-.red-ui-icon-picker {
-    position: absolute;
-    border: 1px solid $primary-border-color;
-    box-shadow: 0 1px 6px -3px black;
-    background: white;
-    z-Index: 21;
-    display: none;
-    select {
-        box-sizing: border-box;
-        margin: 3px;
-        width: calc(100% - 6px);
-    }
-}
-.red-ui-icon-list {
-    width: 308px;
-    height: 200px;
-    overflow-y: scroll;
-    line-height: 0px;
-}
-.red-ui-icon-list-icon {
-    display: inline-block;
-    margin: 2px;
-    padding: 4px;
-    cursor: pointer;
-    border-radius: 4px;
-    &:hover {
-        background: lighten($node-selected-color,20%);
-    }
-    &.selected {
-        background: lighten($node-selected-color,20%);
-        .red-ui-search-result-node {
-            border-color: white;
-        }
-    }
-}
-.red-ui-icon-list-module {
-    background: $palette-header-background;
-    font-size: 0.9em;
-    padding: 3px;
-    color: #666;
-    clear: both;
-    i {
-        margin-right: 5px;
-    }
-}
-.red-ui-icon-meta {
-    border-top: 1px solid $secondary-border-color;
-    span {
-        padding: 4px;
-        color: #666;
-        font-size: 0.9em;
-    }
-    button {
-        float: right;
-        margin: 2px;
-    }
-}

editor/sass/flow.scss

@@ -248,7 +248,7 @@
 
 .link_outline {
     stroke: #fff;
-    stroke-width: 5;
+    stroke-width: 4;
     cursor: crosshair;
     fill: none;
     pointer-events: none;

editor/sass/forms.scss

@@ -501,11 +501,6 @@ textarea.span1,
   padding-top: 5px;
 }
 
-label.disabled {
-    color: #bbb !important;
-    cursor: default;
-}
-
 input[disabled],
 select[disabled],
 textarea[disabled],

editor/sass/jquery.scss

@@ -79,7 +79,6 @@
     font-size: 14px;
     padding: 6px 14px;
     margin-right: 8px;
-    border-radius: 2px;
     color: $editor-button-color;
     background: $editor-button-background;
 
@@ -143,10 +142,3 @@
         outline: none;
     }
 }
-
-
-.ui-widget-overlay {
-    @include shade;
-    z-index: 100;
-    opacity: 1;
-}

editor/sass/mixins.scss

@@ -48,30 +48,29 @@
     text-decoration: none;
     cursor:pointer;
 
-    &.disabled, &:disabled  {
+    &.disabled {
         cursor: default;
         color: $workspace-button-color-disabled !important;
     }
     &:hover, &:focus {
         text-decoration: none;
     }
-    &:not(.disabled):not(:disabled):hover, {
+    &:not(.disabled):hover {
         color: $workspace-button-color-hover !important;
         background: $workspace-button-background-hover;
     }
-    &:not(.disabled):not(:disabled):focus {
+    &:not(.disabled):focus {
         color: $workspace-button-color-focus !important;
     }
-    &:not(.disabled):not(:disabled):active {
+    &:not(.disabled):active {
         color: $workspace-button-color-active !important;
         background: $workspace-button-background-active;
         text-decoration: none;
     }
-    // &.selected:not(.disabled):not(:disabled) {
-    //     color: $workspace-button-color-selected !important;
-    //     background: $workspace-button-background-active;
-    //     background: #9f9;
-    // }
+    &.selected:not(.disabled) {
+        color: $workspace-button-color-selected !important;
+        background: $workspace-button-background-active;
+    }
     .button-group &:not(:first-child) {
         border-left: none;
         border-top-left-radius: 0;
@@ -95,13 +94,43 @@
         border-bottom-right-radius: 0;
     }
 
-    .button-row &:not(:first-child) {
-        margin-left: 15px;
-    }
-
     &:focus {
         outline: 1px solid $workspace-button-color-focus-outline;
     }
+}
+.button-group-vertical {
+    display: inline-block;
+    vertical-align: middle;
+}
+.button-group:not(:last-child) {
+    margin-right: 10px;
+}
+
+
+@mixin workspace-button-toggle {
+    @include workspace-button;
+    color: $workspace-button-toggle-color !important;
+    background:$workspace-button-background-active;
+    margin-bottom: 1px;
+    &.selected:not(.disabled) {
+        color: $workspace-button-toggle-color-selected !important;
+        background: $workspace-button-background;
+        border-bottom-width: 2px;
+        border-bottom-color: $form-input-border-selected-color;
+        margin-bottom: 0;
+        cursor: default;
+    }
+    &.disabled {
+        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;
@@ -118,60 +147,6 @@
             color: $editor-button-color-primary !important;
         }
     }
-
-}
-.button-group-vertical {
-    display: inline-block;
-    vertical-align: middle;
-}
-.button-group:not(:last-child) {
-    margin-right: 10px;
-}
-
-
-@mixin workspace-button-toggle {
-    @include workspace-button;
-    color: $workspace-button-toggle-color !important;
-    background:$workspace-button-background-active;
-    margin-bottom: 1px;
-
-    &.selected:not(.disabled):not(:disabled) {
-        color: $workspace-button-toggle-color-selected !important;
-        background: $workspace-button-background;
-        border-bottom-width: 2px;
-        border-bottom-color: $form-input-border-selected-color;
-        margin-bottom: 0;
-        &:not(.single) {
-            cursor: default;
-        }
-    }
-    &.disabled,&:disabled {
-        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;
     }
@@ -206,7 +181,7 @@
     height: 25px;
     line-height: 23px;
     padding: 0 10px;
-    user-select: none;
+
 
     .button-group:not(:last-child) {
         margin-right: 5px;
@@ -230,7 +205,6 @@
     font-size: 11px;
     line-height: 17px;
     height: 18px;
-    width: 18px;
     &.text-button {
         width: auto;
         padding: 0 5px;
@@ -252,6 +226,3 @@
     background: $shade-color;
     z-index: 5;
 }
-.component-shade {
-    @include shade
-}

editor/sass/notifications.scss

@@ -15,7 +15,7 @@
  **/
 
 #notifications {
-    z-index: 100;
+    z-index: 10000;
     width: 500px;
     margin-left: -250px;
     left: 50%;
@@ -34,10 +34,6 @@
     border-left-width: 16px;
     overflow: hidden;
 }
-.notification p:first-child {
-    font-size: 1.1em;
-    font-weight: 400;
-}
 .notification a {
     text-decoration: none;
     &:hover {

editor/sass/palette-editor.scss

@@ -49,12 +49,7 @@
                 .palette-module-version {
                     color: #aaa;
                 }
-                .palette-module-errors .fa-warning {
-                    opacity: 0.5;
-                }
-                ul.palette-module-error-list li {
-                    color: #aaa;
-                }
+
 
 
             }
@@ -81,9 +76,48 @@
         border-bottom: 1px solid $primary-border-color;
         text-align: right;
     }
+    .palette-module-button-group {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        a {
+            margin-left: 5px;
+        }
+    }
+    .palette-module-shade {
+        @include shade;
+        text-align: center;
+        padding-top: 20px;
+    }
+    #palette-module-install-shade {
+        padding-top: 80px;
+    }
     .palette-module-shade-status {
         color: #666;
     }
+
+    .palette-module-meta {
+        color: #666;
+        position: relative;
+        &.disabled {
+            color: #ccc;
+        }
+
+        .fa {
+            width: 15px;
+            text-align: center;
+            margin-right: 5px;
+        }
+    }
+    .palette-module-name {
+        white-space: nowrap;
+        @include enable-selection;
+    }
+    .palette-module-version, .palette-module-updated, .palette-module-link {
+        font-style:italic;
+        font-size: 0.8em;
+        @include enable-selection;
+    }
     .palette-module-updated {
         margin-left: 10px;
     }
@@ -190,62 +224,3 @@
     }
 
 }
-.palette-module-meta {
-    color: #666;
-    position: relative;
-    &.disabled {
-        color: #ccc;
-    }
-
-    .fa {
-        width: 15px;
-        text-align: center;
-        margin-right: 5px;
-    }
-}
-.palette-module-name {
-    white-space: nowrap;
-    @include enable-selection;
-}
-.palette-module-version, .palette-module-updated, .palette-module-link {
-    font-style:italic;
-    font-size: 0.8em;
-    @include enable-selection;
-}
-.palette-module-section {
-    padding:0 !important;
-    background: #f9f9f9 !important;
-    font-size: 0.9em;
-    color: #666;
-
-}
-.palette-module-button-group {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    a {
-        margin-left: 5px;
-    }
-}
-.palette-module-meta .fa-warning {
-    color: #AD1625;
-}
-ul.palette-module-error-list {
-    display: inline-block;
-    list-style-type: none;
-    margin: 0;
-    font-size: 0.9em;
-    li {
-        border: none;
-        background: none;
-    }
-}
-
-.palette-module-shade {
-    @include shade;
-    text-align: center;
-    padding-top: 20px;
-}
-#palette-module-install-shade {
-    padding-top: 80px;
-}

editor/sass/palette.scss

@@ -90,14 +90,13 @@
     text-align: left;
     padding: 9px;
     font-weight: bold;
-    padding-left: 30px;
     overflow: hidden;
-    user-select: none;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
 }
-.palette-header > i {
-    position: absolute;
-    left: 11px;
-    top: 12px;
+.palette-header i {
+    margin: 3px 10px 3px 3px;
     -webkit-transition: all 0.2s ease-in-out;
     -moz-transition: all 0.2s ease-in-out;
     -o-transition: all 0.2s ease-in-out;

editor/sass/popover.scss

@@ -30,6 +30,7 @@
 }
 
 .red-ui-popover:after, .red-ui-popover:before {
+    top: 50%;
     border: solid transparent;
     content: " ";
     height: 0;
@@ -38,18 +39,12 @@
     pointer-events: none;
 }
 .red-ui-popover.red-ui-popover-right:after, .red-ui-popover.red-ui-popover-right:before {
-    top: 50%;
     right: 100%;
 }
 .red-ui-popover.red-ui-popover-left:after, .red-ui-popover.red-ui-popover-left:before {
-    top: 50%;
     left: 100%;
 }
 
-.red-ui-popover.red-ui-popover-bottom:after, .red-ui-popover.red-ui-popover-bottom:before {
-    bottom: 100%;
-    left: 50%;
-}
 
 .red-ui-popover.red-ui-popover-right:after {
     border-color: rgba(136, 183, 213, 0);
@@ -77,21 +72,6 @@
     margin-top: -11px;
 }
 
-
-.red-ui-popover.red-ui-popover-bottom:after {
-    border-color: rgba(136, 183, 213, 0);
-    border-bottom-color: #fff;
-    border-width: 10px;
-    margin-left: -10px;
-}
-.red-ui-popover.red-ui-popover-bottom:before {
-    border-color: rgba(194, 225, 245, 0);
-    border-bottom-color: $primary-border-color;
-    border-width: 11px;
-    margin-left: -11px;
-}
-
-
 .red-ui-popover-size-small {
     font-size: 11px;
     padding: 5px;
@@ -113,12 +93,4 @@
         border-width: 6px;
         margin-top: -6px;
     }
-    &.red-ui-popover-bottom:after {
-        border-width: 5px;
-        margin-left: -5px;
-    }
-    &.red-ui-popover-bottom:before {
-        border-width: 6px;
-        margin-left: -6px;
-    }
 }

editor/sass/projects.scss

@@ -1,875 +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.
- **/
-
-#projects-dialog {
-    .red-ui-editableList-container {
-        padding: 0px;
-    }
-
-}
-#project-settings-tab-settings {
-    overflow-y: scroll;
-}
-.sidebar-version-control-shade {
-    background: #f3f3f3;
-}
-
-.projects-edit-form form {
-    margin: 0;
-    .form-row {
-        margin-bottom: 15px;
-        label {
-            color: #555;
-            width: 100%;
-            display: block;
-            &.projects-edit-form-inline-label {
-                font-weight: normal;
-                color: inherit;
-                width: auto;
-            }
-        }
-        input[type=text], input[type=password],textarea {
-            width: 100%;
-        }
-        input[type=checkbox], input[type=radio] {
-            width: auto;
-            vertical-align: top;
-        }
-    }
-
-}
-.projects-edit-form-sublabel {
-    color: #999;
-    text-align: right;
-    margin-bottom: -15px;
-    font-weight: normal;
-}
-.project-settings-tab-pane {
-    & * .projects-edit-form-sublabel {
-        margin-right: 50px;
-        margin-top: -10px;
-        margin-bottom: 5px;
-    }
-}
-.projects-dialog-spinner {
-    position: absolute;
-    top: 1px;
-    bottom: 1px;
-    left: 1px;
-    right: 1px;
-    text-align: center;
-    padding: 40px;
-    background: white;
-    &:before {
-      content: '';
-      display: inline-block;
-      height: 100%;
-      vertical-align: middle;
-      margin-right: -0.25em;
-    }
-    img {
-        display: inline-block;
-        vertical-align: middle;
-        width: 80px;
-    }
-    &.projects-dialog-spinner-sidebar {
-        background: white;
-        padding:0;
-        img {
-            width: 40px;
-        }
-    }
-    &.projects-version-control-spinner-sidebar {
-        background: white;
-        padding:0;
-        img {
-            width: 20px;
-        }
-    }
-
-    &.projects-dialog-spinner-contain {
-        padding: 0;
-        img {
-            width: auto;
-            height: 100%;
-            max-height: 50px;
-        }
-    }
-
-}
-.projects-dialog-screen-start {
-    .projects-dialog-screen-start-hero {
-        // background: url(https://nodered.org/images/title-wave.png) no-repeat 0% 100% #8f0000;
-        // background-size: contain;
-        text-align: center;
-        font-size: 2em;
-        padding: 10px;
-        min-height: 60px;
-        color: #555;
-        h1 {
-            text-align: center;
-            color: #f0f0f0;
-            font-size: 2em;
-            font-weight: normal;
-        }
-    }
-    .projects-dialog-screen-start-body {
-        min-height: 400px;
-        line-height: 1.6em;
-        p {
-            font-size: 1.1em;
-            margin-bottom: 20px;
-        }
-        p:first-child {
-            font-weight: 500;
-            font-size: 1.2em;
-        }
-    }
-    button.editor-button {
-        width: calc(50% - 80px);
-        margin: 20px;
-        height: auto;
-        line-height: 2em;
-        padding: 10px;
-        border-color: #aaa;
-        i {
-            color: #aaa;
-        }
-        &:hover i {
-            color: #999;
-        }
-    }
-    .button-group {
-        text-align: center;
-    }
-}
-.projects-dialog-screen-create {
-    min-height: 500px;
-    button.projects-dialog-screen-create-type {
-        height: auto;
-        padding: 10px;
-    }
-    .button-group {
-        text-align: center;
-    }
-}
-
-.projects-dialog-screen-secret {
-    min-height: auto;
-}
-.projects-dialog-project-list-container {
-    border: 1px solid $secondary-border-color;
-    border-radius: 2px;
-}
-.projects-dialog-project-list-inner-container {
-    height: 300px;
-    overflow-y: scroll;
-    position:relative;
-    .red-ui-editableList-border {
-        border: none;
-    }
-}
-.projects-dialog-project-list {
-    li {
-        padding: 0 !important;
-    }
-}
-.projects-dialog-project-list-entry {
-    padding: 12px 0;
-    border-left: 3px solid #fff;
-    border-right: 3px solid #fff;
-    &.projects-list-entry-current {
-        &:not(.selectable) {
-            background: #f9f9f9;
-        }
-        i {
-            color: #999;
-        }
-    }
-    &.selectable {
-        cursor: pointer;
-        &:hover {
-            background: #f3f3f3;
-            // border-left-color: #aaa;
-            // border-right-color: #aaa;
-        }
-    }
-    .projects-dialog-project-list-entry-icon {
-        i {
-            color: #ccc;
-            font-size: 2em;
-
-        }
-    }
-    &.selected {
-        background: #efefef;
-        border-left-color:#999;
-        border-right-color:#999;
-    }
-    span {
-        display: inline-block;
-        vertical-align:middle;
-    }
-    .projects-dialog-project-list-entry-icon {
-         margin: 0 10px 0 5px;
-    }
-    .projects-dialog-project-list-entry-name {
-        font-size: 1.2em;
-    }
-    .projects-dialog-project-list-entry-current {
-        float: right;
-        margin-right: 20px;
-        font-size: 0.9em;
-        color: #999;
-        padding-top: 4px;
-    }
-    .projects-dialog-project-list-entry-tools {
-        position: absolute;
-        top: 16px;
-        right: 30px;
-        display: none;
-        color: #999;
-    }
-    &:hover {
-        .projects-dialog-project-list-entry-tools {
-            display: block;
-        }
-    }
-}
-.projects-dialog-screen-create-type.editor-button.toggle.selected:not(.disabled):not(:disabled) {
-    background: #fff !important;
-    color: #666 !important;
-}
-.projects-dialog-screen-input-status {
-    text-align: right;
-    position: absolute;
-    top: 2px;
-    right: 8px;
-    width: 70px;
-    height: 30px;
-    color: #999;
-}
-
-.sidebar-version-control {
-    height: 100%;
-}
-.sidebar-version-control-stack-info {
-    height: 100px;
-    box-sizing: border-box;
-    border-bottom: 1px solid $secondary-border-color;
-    color: #333;
-    i {
-        color: #999;
-    }
-}
-.sidebar-version-control-stack {
-    position: absolute;
-    top: 0px;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    overflow: hidden;
-
-    .palette-category {
-        &:not(.palette-category-expanded) button {
-            display: none;
-        }
-    }
-}
-
-#project-settings-tab-deps {
-    .red-ui-editableList-container {
-        padding: 0;
-    }
-    .red-ui-editableList-border {
-        border-radius: 0;
-    }
-    .red-ui-editableList-item-content {
-        padding: 0px 6px;
-    }
-    .palette-module-header {
-        padding: 6px 4px;
-    }
-    .palette-module-button {
-        float: right;
-    }
-    .palette-module-unused {
-        & > * {
-            color: #bbb;
-        }
-        // border: 1px dashed #bbb;
-    }
-    .palette-module-unknown {
-        border: 1px dashed #aaa;
-        background: #fafafa;
-    }
-    .palette-module-not-installed {
-        border: 1px dashed #b07575;
-        background: #fee;
-        i.fa-warning {
-            color: #b07575; //#b72828;
-        }
-    }
-}
-
-
-.project-settings-tab-pane {
-    position: absolute;
-    top:0;
-    left:0;
-    right:0;
-    bottom:0;
-    overflow-y: auto;
-    padding: 8px 20px 20px;
-}
-.sidebar-version-control {
-    .red-ui-editableList-container {
-        background: #f9f9f9;
-        padding: 0;
-        li {
-            padding:0;
-            background: #fff;
-        }
-    }
-    .red-ui-editableList-border {
-        border: none;
-        border-radius: 0;
-    }
-}
-
-.sidebar-version-control-change-container {
-    position: relative;
-    height: 50%;
-    box-sizing: border-box;
-    transition: height 0.2s ease-in-out;
-    &:first-child {
-        // border-bottom: 1px solid $primary-border-color;
-    }
-}
-.sidebar-version-control-merging {
-    .sidebar-version-control-change-container {
-        height: 33%;
-    }
-}
-.sidebar-version-control-slide-box {
-    position:absolute;
-    bottom: 0;
-    left:0;
-    right:0;
-    height:0;
-    transition: height 0.2s ease-in-out;
-    background: #f6f6f6;
-    box-sizing: border-box;
-    overflow: hidden;
-    &.sidebar-version-control-slide-box-top {
-        z-index: 4;
-        top: 0px;
-        left: auto;
-        width: 100%;
-        max-width: 280px;
-        border-left: 1px solid $primary-border-color;
-        border-right: 1px solid $primary-border-color;
-        border-bottom: 1px solid $primary-border-color;
-        box-shadow: 1px 1px 4px rgba(0,0,0,0.2);
-
-        color: #666;
-        background: #f6f6f6;
-        padding: 10px;
-        box-sizing: border-box;
-
-    }
-    &.sidebar-version-control-slide-box-bottom {
-        bottom: 0px;
-        border-top: 1px solid $secondary-border-color;
-    }
-
-    textarea {
-        height: 110px;
-        margin: 10px;
-        width: calc(100% - 20px);
-        box-sizing: border-box;
-        border-radius: 1px;
-        resize: none;
-    }
-
-}
-.projects-branch-list {
-    position: relative;
-    .red-ui-searchBox-container {
-        border-top: 1px solid $secondary-border-color;
-        border-left: 1px solid $secondary-border-color;
-        border-right: 1px solid $secondary-border-color;
-        border-top-left-radius: 2px;
-        border-top-right-radius: 2px;
-        overflow: hidden;
-    }
-    .red-ui-editableList {
-        border: 1px solid $secondary-border-color;
-        border-bottom-left-radius: 2px;
-        border-bottom-right-radius: 2px;
-        & > .red-ui-editableList-border {
-            border-radius: 0;
-            border: none;
-        }
-        .red-ui-editableList-container {
-            padding: 0;
-            li {
-                padding: 0;
-                background: #fff;
-            }
-        }
-    }
-}
-.uneditable-input .projects-branch-list {
-    .red-ui-editableList {
-        border-left: none;
-        border-bottom: none;
-        border-right: none;
-    }
-    .red-ui-searchBox-container {
-        border-left: none;
-        border-right: none;
-    }
-}
-.sidebar-version-control-slide-box-header {
-    margin-bottom: 10px;
-}
-
-.sidebar-version-control-slide-box-toolbar {
-    padding: 0 20px;
-    text-align: right;
-}
-.sidebar-version-control-branch-list-entry {
-    padding: 5px 8px;
-    color: #666;
-    cursor: pointer;
-    &.selected {
-        border-left-color:#999;
-        border-right-color:#999;
-    }
-    border-left: 2px solid #fff;
-    border-right: 2px solid #fff;
-    margin: 0 1px;
-    i { width: 16px; text-align: center}
-    &.input-error {
-        cursor: default;
-    }
-    &:not(.input-error):hover {
-        background: #f3f3f3;
-        border-left-color:#999;
-        border-right-color:#999;
-    }
-    span {
-        margin-left: 5px;
-    }
-    span.current {
-        float: right;
-        font-size: 0.8em;
-        color: #999;
-    }
-}
-
-.sidebar-version-control-change-entry {
-    height: 20px;
-    padding: 5px 10px;
-    position: relative;
-    white-space: nowrap;
-    span {
-        margin: 0 6px;
-    }
-    a {
-        color: currentColor;
-        &.disabled {
-            pointer-events: none;
-        }
-    }
-    .sidebar-version-control-change-entry-tools {
-        position: absolute;
-        top: 4px;
-        right: 4px;
-        display: none;
-        button {
-            width: 24px;
-        }
-    }
-
-    &:hover {
-        .sidebar-version-control-change-entry-tools {
-            display: block;
-        }
-    }
-    &.node-info-none {
-        text-align: center;
-        background: #fefefe;
-        white-space: normal;
-        height: auto;
-    }
-}
-
-.sidebar-version-control-commit-entry {
-    min-height: 20px;
-    padding: 5px 10px;
-    position: relative;
-    white-space: nowrap;
-    overflow: hidden;
-    cursor: pointer;
-    &:hover {
-        background: #eee;
-    }
-}
-.sidebar-version-control-commit-more {
-    color: #999;
-    text-align: center;
-    padding: 10px;
-    font-style: italic;
-}
-.sidebar-version-control-commit-sha {
-    float: right;
-    font-family: monospace;
-    color: #c38888;
-    display: inline-block;
-    font-size: 0.85em;
-    margin-left: 5px;
-}
-.sidebar-version-control-commit-subject {
-    color: #666;
-}
-.sidebar-version-control-commit-refs {
-    min-height: 22px;
-}
-.sidebar-version-control-commit-ref {
-    color: #aaa;
-    font-size: 0.7em;
-    border: 1px solid #ccc;
-    border-radius: 10px;
-    padding: 2px 5px;
-    margin-right: 5px;
-}
-.sidebar-version-control-commit-date {
-    color: #999;
-    font-size: 0.85em;
-}
-.sidebar-version-control-commit-user {
-    float: right;
-    color: #999;
-    font-size: 0.85em;
-}
-.sidebar-version-control-commit-head {
-}
-.sidebar-version-control-change-header {
-    color: #666;
-    background: #f6f6f6;
-    padding: 4px 10px;
-    height: 30px;
-    box-sizing: border-box;
-    border-top: 1px solid $secondary-border-color;
-    border-bottom: 1px solid $secondary-border-color;
-    i {
-        transition: all 0.2s ease-in-out;
-    }
-}
-.sidebar-version-control-repo-toolbar {
-    color: #666;
-    background: #f6f6f6;
-    padding: 10px;
-    box-sizing: border-box;
-}
-
-.sidebar-version-control-repo-count {
-    margin-right: 8px;
-    display: none;
-}
-.sidebar-version-control-repo-action  {
-    text-align: left;
-    width: 100%;
-}
-.sidebar-version-control-repo-sub-action  {
-    width: calc(50% - 5px);
-    margin-right: 5px;
-    &:not(:first-child) {
-        margin-right: 0;
-        margin-left: 5px;
-    }
-}
-
-.project-file-listing-container > .red-ui-editableList > .red-ui-editableList-border {
-    border-radius: 0;
-    border: none;
-    border-top: 1px solid $secondary-border-color;
-
-}
-.red-ui-editableList-container .projects-dialog-file-list {
-    .red-ui-editableList-border {
-        border: none;
-    }
-    li {
-        padding: 0 !important;
-        border: none;
-    }
-    .red-ui-editableList-container {
-        padding: 0;
-    }
-}
-.projects-dialog-file-list-entry {
-    padding: 3px 0;
-    border-left: 2px solid #fff;
-    border-right: 2px solid #fff;
-    &.projects-list-entry-current {
-        &:not(.selectable) {
-            background: #f9f9f9;
-        }
-        i {
-            color: #999;
-        }
-    }
-    &.selectable {
-        cursor: pointer;
-        &:hover {
-            background: #f3f3f3;
-            border-left-color:#999;
-            border-right-color:#999;
-        }
-    }
-    &.unselectable {
-        color: #ccc;
-    }
-
-    i {
-        color: #999;
-        width: 16px;
-        text-align: center;
-    }
-    &.selected {
-        background: #efefef;
-        border-left-color:#999;
-        border-right-color:#999;
-    }
-    span {
-        display: inline-block;
-        vertical-align:middle;
-    }
-    .projects-dialog-file-list-entry-folder {
-         margin: 0 10px 0 0px;
-
-         .fa-angle-right {
-             color: #333;
-             transition: all 0.2s ease-in-out;
-
-         }
-    }
-    .projects-dialog-file-list-entry-file {
-         margin: 0 10px 0 20px;
-    }
-    .projects-dialog-file-list-entry-name {
-        font-size: 1em;
-    }
-    &.expanded .fa-angle-right {
-        transform: rotate(90deg);
-    }
-}
-.projects-dialog-file-list-entry-file-type-git { color: #999 }
-
-.projects-dialog-remote-list {
-    .red-ui-editableList-container {
-        padding: 0;
-        li {
-            padding: 0;
-            border: none;
-            border-radius: 4px;
-            overflow: hidden;
-        }
-    }
-}
-
-.projects-dialog-sshkey-list {
-    li {
-        padding: 0 !important;
-    }
-    &.projects-dialog-sshkey-list-small {
-        .projects-dialog-sshkey-list-entry {
-            padding: 6px 0;
-            i {
-                font-size: 1em;
-            }
-        }
-        .projects-dialog-sshkey-list-entry-name {
-            font-size: 1em;
-        }
-        .projects-dialog-sshkey-list-entry-current {
-            margin-right: 10px;
-            padding-top: 2px;
-        }
-    }
-}
-.red-ui-editableList-container {
-    .projects-dialog-sshkey-list {
-        li:last-child {
-            border-bottom: 0px none;
-        }
-    }
-}
-.projects-dialog-sshkey-list-entry {
-    padding: 12px 0;
-    border-left: 3px solid #fff;
-    border-right: 3px solid #fff;
-    &.sshkey-list-entry-current {
-        &:not(.selectable) {
-            background: #f9f9f9;
-        }
-        i {
-            color: #999;
-        }
-    }
-    &.selectable {
-        cursor: pointer;
-        &:hover {
-            background: #f3f3f3;
-            border-left-color: #aaa;
-            border-right-color: #aaa;
-        }
-    }
-    i {
-        color: #ccc;
-        font-size: 2em;
-
-    }
-    &.selected {
-        background: #efefef;
-        border-left-color:#999;
-        border-right-color:#999;
-    }
-    span {
-        display: inline-block;
-        vertical-align:middle;
-    }
-    .projects-dialog-sshkey-list-entry-icon {
-         margin: 0 10px 0 5px;
-    }
-    .projects-dialog-sshkey-list-entry-name {
-        font-size: 1.2em;
-    }
-    .projects-dialog-sshkey-list-entry-current {
-        float: right;
-        margin-right: 20px;
-        font-size: 0.9em;
-        color: #999;
-        padding-top: 4px;
-    }
-    .projects-dialog-sshkey-list-button-remove {
-        position: absolute;
-        right: 4px;
-    }
-}
-
-div.projects-dialog-ssh-public-key {
-    position: relative;
-    padding: 15px 20px 0;
-    pre {
-        position: relative;
-        word-break: break-all;
-    }
-    &:after {
-        content: "";
-        display: table;
-        clear: both;
-    }
-}
-
-.projects-dialog-ssh-key-list {
-    li {
-        padding: 0 !important;
-    }
-    .projects-dialog-ssh-key-header {
-        padding: 10px 5px;
-        cursor: pointer;
-        &:hover {
-            background: #f3f3f3;
-        }
-    }
-}
-
-.projects-dialog-list {
-    position: relative;
-    .red-ui-editableList-container {
-        padding: 1px;
-        background: #f6f6f6;
-        li:last-child {
-            border-bottom: none;
-        }
-    }
-}
-
-.projects-dialog-list-entry {
-    &.red-ui-search-empty {
-        padding: 0;
-    }
-
-    span {
-        display: inline-block;
-    }
-    .entry-icon {
-        text-align: center;
-        min-width: 30px;
-        vertical-align: top;
-        color: #999;
-    }
-    .entry-name {
-        min-width: 250px;
-    }
-    &.current .entry-name {
-        font-weight: bold;
-    }
-    .entry-detail {
-        color: #aaa;
-        font-size: 0.9em;
-    }
-
-    .entry-remote-name {
-        min-width: 250px;
-    }
-
-
-    .entry-tools {
-        float: right;
-        margin-right: 10px;
-    }
-}
-.projects-dialog-list-dialog {
-    position: relative;
-    margin-top: 10px;
-    margin-bottom: 20px;
-    background: white;
-    border-radius: 4px;
-    border: 1px solid $secondary-border-color;
-    .projects-edit-form-sublabel {
-        margin-top: -8px !important;
-        display: block !important;
-        width: auto !important;
-    }
-    &:after {
-        content: "";
-        display: table;
-        clear: both;
-    }
-
-    .projects-dialog-list-dialog-header {
-        font-weight: bold;
-        background: #f3f3f3;
-        margin-top: 0 !important;
-        padding: 5px 10px;
-        margin-bottom: 10px;
-    }
-}

editor/sass/style.scss

@@ -40,7 +40,6 @@
 @import "panels";
 @import "tabs";
 @import "tab-config";
-@import "tab-context";
 @import "tab-info";
 @import "popover";
 @import "flow";
@@ -49,15 +48,12 @@
 
 @import "userSettings";
 
-@import "projects";
-
 
 @import "ui/common/editableList";
 @import "ui/common/searchBox";
 @import "ui/common/typedInput";
 @import "ui/common/nodeList";
 @import "ui/common/checkboxSet";
-@import "ui/common/stack";
 
 @import "dragdrop";
 

editor/sass/tab-context.scss

@@ -1,54 +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.
- **/
-
-.sidebar-context-stack {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    overflow-y: scroll;
-
-    .palette-category {
-        &:not(.palette-category-expanded) button {
-            display: none;
-        }
-    }
-}
-
-.sidebar-context-property {
-    position: relative;
-    .debug-message-tools {
-        right: 0px;
-        margin-right: 5px;
-        display: none;
-    }
-    &:hover .debug-message-tools {
-        display: inline-block;
-    }
-}
-.sidebar-context-updated {
-    text-align: right;
-    font-size: 11px;
-    color: #bbb;
-    padding: 1px 3px;
-}
-.sidebar-context-property-storename {
-    display: block;
-    font-size: 0.8em;
-    font-style: italic;
-    color: #aaa;
-}

editor/sass/tab-info.scss

@@ -87,22 +87,17 @@ table.node-info tr.blank {
         padding-left: 5px;
     }
 }
-.node-info-none {
-    font-style: italic;
-    color: #aaa;
-}
+
 table.node-info tr:not(.blank) td:first-child{
-    color: #444;
+    color: #666;
     vertical-align: top;
     width: 90px;
     padding: 3px 3px 3px 6px;
-    background:#f9f9f9;
     border-right: 1px solid #ddd;
 }
 table.node-info tr:not(.blank) td:last-child{
     padding: 3px 3px 3px 6px;
     color: #666;
-    overflow-y: hidden;
 }
 div.node-info {
     margin: 5px;

editor/sass/tabs.scss

@@ -93,7 +93,7 @@
                         color: $workspace-button-color-hover;
                     }
                 }
-                img.red-ui-tab-icon {
+                .red-ui-tab-icon {
                     opacity: 0.2;
                 }
             }
@@ -113,21 +113,6 @@
     &.red-ui-tabs-add.red-ui-tabs-scrollable {
         padding-right: 59px;
     }
-    &.red-ui-tabs-collapsible {
-        li:not(.active) {
-            display: none;
-             &.red-ui-tab-pinned {
-                 a {
-                     padding-left: 0;
-                     text-align: center;
-                 }
-                 span {
-                     display: none;
-                 }
-                 width: 32px;
-             }
-        }
-    }
 
     &.red-ui-tabs-vertical {
         box-sizing: border-box;
@@ -172,15 +157,6 @@
             }
         }
     }
-    .red-ui-tabs-select {
-        position: absolute;
-        top:0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        opacity: 0.4;
-        background: red;
-    }
 }
 .red-ui-tab-button {
     position: absolute;
@@ -204,32 +180,7 @@
         z-index: 2;
     }
 }
-.red-ui-tab-link-buttons {
-    position: absolute;
-    box-sizing: border-box;
-    top: 0;
-    right: 0;
-    height: 35px;
-    background: #fff;
-    border-bottom: 1px solid $primary-border-color;
-    z-index: 2;
-    a {
-        @include workspace-button-toggle;
-        line-height: 26px;
-        height: 28px;
-        width: 28px;
-        margin: 4px 3px 3px;
-        z-index: 2;
-        &.red-ui-tab-link-button {
-            &:not(.active) {
-                background: #eee;
-            }
-        }
-        &.red-ui-tab-link-button-menu {
-            border-color: white;
-        }
-    }
-}
+
 .red-ui-tab-scroll {
     width: 21px;
     top: 0;
@@ -265,7 +216,7 @@
     right: 38px;
 }
 
-img.red-ui-tab-icon {
+.red-ui-tab-icon {
     margin-left: -8px;
     margin-right: 3px;
     margin-top: -2px;
@@ -274,11 +225,6 @@ img.red-ui-tab-icon {
     height: 20px;
     vertical-align: middle;
 }
-i.red-ui-tab-icon {
-    opacity: 0.7;
-    width: 18px;
-    height: 20px;
-}
 
 .red-ui-tabs-badges {
     position: absolute;

editor/sass/ui/common/stack.scss

@@ -1,26 +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-ui-stack {
-    background: white;
-    .palette-category {
-        background: white;
-
-        &:last-child {
-            border-bottom: none;
-        }
-    }
-}

editor/sass/ui/common/typedInput.scss

@@ -23,7 +23,7 @@
     margin: 0;
     vertical-align: middle;
     box-sizing: border-box;
-    overflow:visible;
+    overflow:hidden;
     position: relative;
     .red-ui-typedInput-input {
         position: absolute;
@@ -43,7 +43,6 @@
         border-bottom-left-radius: 0;
         box-shadow: none;
         vertical-align: middle;
-        // backgroun/d: #f0fff0;
     }
 
     &.red-ui-typedInput-focus:not(.input-error) {
@@ -64,11 +63,10 @@
         line-height: 32px;
         vertical-align: middle;
         color: #555;
-        i.red-ui-typedInput-icon {
-            position: relative;
-            top: -3px;
-            margin-left: 1px;
-            margin-right: 2px;
+        i {
+            position:relative;
+            top:-3px;
+            margin-right:4px;
             margin-top: 1px;
             vertical-align: middle;
             &.fa-ellipsis-h {
@@ -77,11 +75,11 @@
         }
         &.disabled {
             cursor: default;
-            i.red-ui-typedInput-icon {
+            i {
                 color: #bbb;
             }
         }
-        .red-ui-typedInput-type-label,.red-ui-typedInput-option-label {
+        span {
             display: inline-block;
             height: 100%;
             padding: 0 1px 0 5px;
@@ -122,25 +120,26 @@
         border-bottom-right-radius: 4px;
         padding: 0 0 0 0;
         position:absolute;
-        right: 0;
+        width: calc( 100% );
+
+        i {
+            position:absolute;
+            right: 4px;
+            top: 7px;
+        }
         .red-ui-typedInput-option-label {
-            background:$typedInput-button-background;
+            background:#fff;
             position:absolute;
             left:0;
             right:23px;
             top: 0;
-            padding: 0 5px 0 8px;
-            i.red-ui-typedInput-icon {
-                margin-right: 4px;
-                margin-top: 4px;
-            }
+            padding: 0 5px 0 5px;
         }
         .red-ui-typedInput-option-caret {
             top: 0;
             position: absolute;
             right: 0;
             width: 17px;
-            padding-left: 6px;
         }
         &:focus {
             box-shadow: none;
@@ -175,7 +174,4 @@
             background: $typedInput-button-background-active;
         }
     }
-    .red-ui-typedInput-icon {
-        margin-right: 4px;
-    }
 }

editor/sass/userSettings.scss

@@ -38,52 +38,22 @@
     label {
         display: inline-block;
         min-width: 100px;
-        vertical-align: top;
-        margin-top: 5px;
         input {
             vertical-align: top;
             padding-bottom: 0;
         }
     }
-    input, div.uneditable-input {
-        //margin-bottom: 0;
-    }
-    div.uneditable-input {
-        position: relative;
+    input {
+        margin-bottom: 0;
     }
     input[type='number'] {
         width: 60px;
     }
-    h4 {
-        margin-top: 20px;
-        margin-bottom: 10px;
-    }
 }
 
 #user-settings-tab-view {
-    position: absolute;
-    top:0;
-    right: 0;
-    left: 0;
-    bottom: 0;
     padding: 8px 20px 20px;
-    overflow-y: scroll;
 }
 .user-settings-row {
     padding: 5px 10px 2px;
 }
-.user-settings-section {
-    position: relative;
-    &:after {
-        content: "";
-        display: table;
-        clear: both;
-    }
-    .uneditable-input, input, textarea {
-        width: calc(100% - 150px);
-    }
-    textarea {
-        resize: none;
-        height: 10em;
-    }
-}

editor/sass/workspace.scss

@@ -47,9 +47,7 @@
 .workspace-footer-button {
     @include component-footer-button;
 }
-.workspace-footer-button-toggle {
-    @include component-footer-button-toggle;
-}
+
 #workspace-footer {
     @include component-footer;
 }

editor/templates/index.mst

@@ -51,7 +51,6 @@
             <a class="workspace-footer-button" id="btn-zoom-out" href="#"><i class="fa fa-minus"></i></a>
             <a class="workspace-footer-button" id="btn-zoom-zero" href="#"><i class="fa fa-circle-o"></i></a>
             <a class="workspace-footer-button" id="btn-zoom-in" href="#"><i class="fa fa-plus"></i></a>
-            <a class="workspace-footer-button-toggle single" id="btn-navigate" href="#"><i class="fa fa-map-o"></i></a>
         </div>
         <div id="editor-shade" class="hide"></div>
     </div>
@@ -78,11 +77,35 @@
     <div id="sidebar-separator"></div>
 
 </div>
-<div id="full-shade" class="hide"></div>
 
 <div id="notifications"></div>
 <div id="dropTarget"><div data-i18n="[append]workspace.dropFlowHere"><br/><i class="fa fa-download"></i></div></div>
 
+<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>
+        <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>
+        <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>
+    </form>
+</div>
+
 <div id="node-dialog-library-save-confirm" class="hide">
     <form class="form-horizontal">
         <div style="text-align: center; padding-top: 30px;" id="node-dialog-library-save-content">
@@ -132,10 +155,6 @@
         <i class="fa fa-tag"></i>
         <label for="subflow-input-name" data-i18n="common.label.name"></label><input type="text" id="subflow-input-name">
     </div>
-    <div class="form-row">
-        <i class="fa fa-folder-o"></i>
-        <label for="subflow-input-category" data-i18n="editor:subflow.category"></label><select style="width: 250px;" id="subflow-input-category"></select><input style="display:none; margin-left: 10px; width:calc(100% - 250px)" type="text" id="subflow-input-custom-category">
-    </div>
     <div class="form-row" style="margin-bottom: 0px;">
         <label for="subflow-input-info" data-i18n="editor:subflow.info"></label>
         <a href="https://help.github.com/articles/markdown-basics/" style="font-size: 0.8em; float: right;" data-i18n="[html]subflow.format"></a>
@@ -145,6 +164,69 @@
     </div>
     <div class="form-row form-tips" id="subflow-dialog-user-count"></div>
 </script>
+
+<script type="text/x-red" data-template-name="_expression">
+    <div id="node-input-expression-panels">
+        <div id="node-input-expression-panel-expr" class="red-ui-panel">
+            <div class="form-row" style="margin-bottom: 3px; text-align: right;">
+                <span class="node-input-expression-legacy"><i class="fa fa-exclamation-circle"></i> <span data-i18n="expressionEditor.compatMode"></span></span>
+                <button id="node-input-expression-reformat" class="editor-button editor-button-small"><span data-i18n="expressionEditor.format"></span></button>
+            </div>
+            <div class="form-row node-text-editor-row">
+                <div class="node-text-editor" id="node-input-expression"></div>
+            </div>
+        </div>
+        <div id="node-input-expression-panel-info" class="red-ui-panel">
+            <div class="form-row">
+                <ul id="node-input-expression-tabs"></ul>
+                <div id="node-input-expression-tab-help" class="node-input-expression-tab-content hide">
+                    <div>
+                        <select id="node-input-expression-func"></select>
+                        <button id="node-input-expression-func-insert" class="editor-button" data-i18n="expressionEditor.insert"></button>
+                    </div>
+                    <div id="node-input-expression-help"></div>
+                </div>
+                <div id="node-input-expression-tab-test" class="node-input-expression-tab-content hide">
+                    <div>
+                        <span style="display: inline-block; width: calc(50% - 5px);">
+                            <span data-i18n="expressionEditor.data"></span>
+                            <button style="float: right; margin-right: 5px;" id="node-input-example-reformat" class="editor-button editor-button-small"><span data-i18n="jsonEditor.format"></span></button>
+                        </span>
+                        <span style="display: inline-block; width: calc(50% - 5px);" data-i18n="expressionEditor.result"></span>
+                    </div>
+                    <div style="display: inline-block; width: calc(50% - 5px);" class="node-text-editor" id="node-input-expression-test-data"></div>
+                    <div style="display: inline-block; width: calc(50% - 5px);" class="node-text-editor" id="node-input-expression-test-result"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
+<script type="text/x-red" data-template-name="_json">
+    <div class="form-row" style="margin-bottom: 3px; text-align: right;">
+        <button id="node-input-json-reformat" class="editor-button editor-button-small"><span data-i18n="jsonEditor.format"></span></button>
+    </div>
+    <div class="form-row node-text-editor-row">
+        <div style="height: 200px;min-height: 150px;" class="node-text-editor" id="node-input-json"></div>
+    </div>
+</script>
+<script type="text/x-red" data-template-name="_buffer">
+    <div id="node-input-buffer-panels">
+        <div id="node-input-buffer-panel-str" class="red-ui-panel">
+            <div class="form-row" style="margin-bottom: 3px; text-align: right;">
+                <span class="node-input-buffer-type"><i class="fa fa-exclamation-circle"></i> <span id="node-input-buffer-type-string" data-i18n="bufferEditor.modeString"></span><span id="node-input-buffer-type-array" data-i18n="bufferEditor.modeArray"></span></span>
+            </div>
+            <div class="form-row node-text-editor-row">
+                <div class="node-text-editor" id="node-input-buffer-str"></div>
+            </div>
+        </div>
+        <div id="node-input-buffer-panel-bin" class="red-ui-panel">
+            <div class="form-row node-text-editor-row" style="margin-top: 10px">
+                <div class="node-text-editor" id="node-input-buffer-bin"></div>
+            </div>
+        </div>
+    </div>
+</script>
+
 <script src="vendor/vendor.js"></script>
 <script src="vendor/jsonata/jsonata.min.js"></script>
 <script src="vendor/ace/ace.js"></script>

editor/vendor/ace/mode-python.js

@@ -1 +0,0 @@
-ace.define("ace/mode/python_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){var e="and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield|async|await",t="True|False|None|NotImplemented|Ellipsis|__debug__",n="abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern",r=this.createKeywordMapper({"invalid.deprecated":"debugger","support.function":n,"constant.language":t,keyword:e},"identifier"),i="(?:r|u|ur|R|U|UR|Ur|uR)?",s="(?:(?:[1-9]\\d*)|(?:0))",o="(?:0[oO]?[0-7]+)",u="(?:0[xX][\\dA-Fa-f]+)",a="(?:0[bB][01]+)",f="(?:"+s+"|"+o+"|"+u+"|"+a+")",l="(?:[eE][+-]?\\d+)",c="(?:\\.\\d+)",h="(?:\\d+)",p="(?:(?:"+h+"?"+c+")|(?:"+h+"\\.))",d="(?:(?:"+p+"|"+h+")"+l+")",v="(?:"+d+"|"+p+")",m="\\\\(x[0-9A-Fa-f]{2}|[0-7]{3}|[\\\\abfnrtv'\"]|U[0-9A-Fa-f]{8}|u[0-9A-Fa-f]{4})";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:i+'"{3}',next:"qqstring3"},{token:"string",regex:i+'"(?=.)',next:"qqstring"},{token:"string",regex:i+"'{3}",next:"qstring3"},{token:"string",regex:i+"'(?=.)",next:"qstring"},{token:"constant.numeric",regex:"(?:"+v+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:v},{token:"constant.numeric",regex:f+"[lL]\\b"},{token:"constant.numeric",regex:f+"\\b"},{token:r,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"paren.lparen",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring3:[{token:"constant.language.escape",regex:m},{token:"string",regex:'"{3}',next:"start"},{defaultToken:"string"}],qstring3:[{token:"constant.language.escape",regex:m},{token:"string",regex:"'{3}",next:"start"},{defaultToken:"string"}],qqstring:[{token:"constant.language.escape",regex:m},{token:"string",regex:"\\\\$",next:"qqstring"},{token:"string",regex:'"|$',next:"start"},{defaultToken:"string"}],qstring:[{token:"constant.language.escape",regex:m},{token:"string",regex:"\\\\$",next:"qstring"},{token:"string",regex:"'|$",next:"start"},{defaultToken:"string"}]}};r.inherits(s,i),t.PythonHighlightRules=s}),ace.define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=t.FoldMode=function(e){this.foldingStartMarker=new RegExp("([\\[{])(?:\\s*)$|("+e+")(?:\\s*)(?:#.*)?$")};r.inherits(s,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=e.getLine(n),i=r.match(this.foldingStartMarker);if(i)return i[1]?this.openingBracketBlock(e,i[1],n,i.index):i[2]?this.indentationBlock(e,n,i.index+i[2].length):this.indentationBlock(e,n)}}.call(s.prototype)}),ace.define("ace/mode/python",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/python_highlight_rules","ace/mode/folding/pythonic","ace/range"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./python_highlight_rules").PythonHighlightRules,o=e("./folding/pythonic").FoldMode,u=e("../range").Range,a=function(){this.HighlightRules=s,this.foldingRules=new o("\\:"),this.$behaviour=this.$defaultBehaviour};r.inherits(a,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[:]\s*$/);o&&(r+=n)}return r};var e={pass:1,"return":1,raise:1,"break":1,"continue":1};this.checkOutdent=function(t,n,r){if(r!=="\r\n"&&r!=="\r"&&r!=="\n")return!1;var i=this.getTokenizer().getLineTokens(n.trim(),t).tokens;if(!i)return!1;do var s=i.pop();while(s&&(s.type=="comment"||s.type=="text"&&s.value.match(/^\s+$/)));return s?s.type=="keyword"&&e[s.value]:!1},this.autoOutdent=function(e,t,n){n+=1;var r=this.$getIndent(t.getLine(n)),i=t.getTabString();r.slice(-i.length)==i&&t.remove(new u(n,r.length-i.length,n,r.length))},this.$id="ace/mode/python"}.call(a.prototype),t.Mode=a})

editor/vendor/ace/mode-yaml.js

@@ -1 +1 @@
-ace.define("ace/mode/yaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"list.markup",regex:/^(?:-{3}|\.{3})\s*(?=#|$)/},{token:"list.markup",regex:/^\s*[\-?](?:$|\s)/},{token:"constant",regex:"!![\\w//]+"},{token:"constant.language",regex:"[&\\*][a-zA-Z0-9-_]+"},{token:["meta.tag","keyword"],regex:/^(\s*\w.*?)(:(?=\s|$))/},{token:["meta.tag","keyword"],regex:/(\w+?)(\s*:(?=\s|$))/},{token:"keyword.operator",regex:"<<\\w*:\\w*"},{token:"keyword.operator",regex:"-\\s*(?=[{])"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:/[|>][-+\d\s]*$/,onMatch:function(e,t,n,r){var i=/^\s*/.exec(r)[0];return n.length<1?n.push(this.next):n[0]="mlString",n.length<2?n.push(i.length):n[1]=i.length,this.token},next:"mlString"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:/(\b|[+\-\.])[\d_]+(?:(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)(?=[^\d-\w]|$)/},{token:"constant.numeric",regex:/[+\-]?\.inf\b|NaN\b|0x[\dA-Fa-f_]+|0b[10_]+/},{token:"constant.language.boolean",regex:"\\b(?:true|false|TRUE|FALSE|True|False|yes|no)\\b"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:/[^\s,:\[\]\{\}]+/}],mlString:[{token:"indent",regex:/^\s*$/},{token:"indent",regex:/^\s*/,onMatch:function(e,t,n){var r=n[1];return r>=e.length?(this.next="start",n.splice(0)):this.next="mlString",this.token},next:"mlString"},{token:"string",regex:".+"}]},this.normalizeRules()};r.inherits(s,i),t.YamlHighlightRules=s}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/yaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/yaml_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./yaml_highlight_rules").YamlHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./folding/coffee").FoldMode,a=function(){this.HighlightRules=s,this.$outdent=new o,this.foldingRules=new u,this.$behaviour=this.$defaultBehaviour};r.inherits(a,i),function(){this.lineCommentStart=["#","//"],this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);if(e=="start"){var i=t.match(/^.*[\{\(\[]\s*$/);i&&(r+=n)}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.$id="ace/mode/yaml"}.call(a.prototype),t.Mode=a})
+ace.define("ace/mode/yaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"list.markup",regex:/^(?:-{3}|\.{3})\s*(?=#|$)/},{token:"list.markup",regex:/^\s*[\-?](?:$|\s)/},{token:"constant",regex:"!![\\w//]+"},{token:"constant.language",regex:"[&\\*][a-zA-Z0-9-_]+"},{token:["meta.tag","keyword"],regex:/^(\s*\w.*?)(:(?:\s+|$))/},{token:["meta.tag","keyword"],regex:/(\w+?)(\s*:(?:\s+|$))/},{token:"keyword.operator",regex:"<<\\w*:\\w*"},{token:"keyword.operator",regex:"-\\s*(?=[{])"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:/[|>][-+\d\s]*$/,onMatch:function(e,t,n,r){var i=/^\s*/.exec(r)[0];return n.length<1?n.push(this.next):n[0]="mlString",n.length<2?n.push(i.length):n[1]=i.length,this.token},next:"mlString"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:/(\b|[+\-\.])[\d_]+(?:(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)/},{token:"constant.numeric",regex:/[+\-]?\.inf\b|NaN\b|0x[\dA-Fa-f_]+|0b[10_]+/},{token:"constant.language.boolean",regex:"\\b(?:true|false|TRUE|FALSE|True|False|yes|no)\\b"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"}],mlString:[{token:"indent",regex:/^\s*$/},{token:"indent",regex:/^\s*/,onMatch:function(e,t,n){var r=n[1];return r>=e.length?(this.next="start",n.splice(0)):this.next="mlString",this.token},next:"mlString"},{token:"string",regex:".+"}]},this.normalizeRules()};r.inherits(s,i),t.YamlHighlightRules=s}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/yaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/yaml_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./yaml_highlight_rules").YamlHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./folding/coffee").FoldMode,a=function(){this.HighlightRules=s,this.$outdent=new o,this.foldingRules=new u,this.$behaviour=this.$defaultBehaviour};r.inherits(a,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);if(e=="start"){var i=t.match(/^.*[\{\(\[]\s*$/);i&&(r+=n)}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.$id="ace/mode/yaml"}.call(a.prototype),t.Mode=a})

editor/vendor/ace/snippets/json.js

@@ -1 +0,0 @@
-ace.define("ace/snippets/json",["require","exports","module"],function(e,t,n){"use strict";t.snippetText=undefined,t.scope="json"})