remove down carat from typed input with only 1 type

(should we add max width also ?)

.gitattributes

@@ -1 +0,0 @@
-/packages/node_modules/** linguist-generated=false

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,3 @@
-<!--
 ## Before you hit that Submit button....
 
 This issue tracker is for problems with the Node-RED runtime, the editor or the core nodes.
@@ -8,16 +7,13 @@ If your issue is:
   - 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`.
+please use the [mailing list](https://groups.google.com/forum/#!forum/node-red), [slack team](https://nodered.org/slack) or ask 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?
 
@@ -28,7 +24,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:
 
 - [ ] Node-RED version:
-- [ ] Node.js version:
+- [ ] node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:

.github/ISSUE_TEMPLATE/--bug_report.md

@@ -1,39 +0,0 @@
----
-name: Bug report
-about: Reproducable software issues in the core of Node-RED
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-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.
-
-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/ISSUE_TEMPLATE/-anything-else.md

@@ -1,17 +0,0 @@
----
-name: Anything Else
-about: Something that is not a bug report
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Please DO NOT raise an issue.
-
-We DO NOT use the issue tracker for general support or feature requests. Only bug reports should be raised here using the 'Bug report' template.
-
-For general support, 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.
-
-For feature requests, please use the Node-RED Forum](https://discourse.nodered.org). Many ideas have already been discussed there and you should search that for your request before starting a new discussion.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,3 @@
-<!--
 ## Before you hit that Submit button....
 
 Please read our [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
@@ -7,26 +6,23 @@ before submitting a pull-request.
 ## Types of changes
 
 What types of changes does your code introduce?
-Put an `x` in the boxes that apply
--->
+_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
+the [mailing list](https://groups.google.com/forum/#!forum/node-red) or
 [slack team](https://nodered.org/slack) first.
 
--->
 
 ## Proposed changes
 
-<!-- Describe the nature of this change. What problem does it address? -->
+Describe the nature of this change. What problem does it address?
 
 ## Checklist
-<!-- Put an `x` in the boxes that apply -->
+_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.

.gitignore

@@ -17,8 +17,3 @@ node_modules
 public
 locales/zz-ZZ
 nodes/core/locales/zz-ZZ
-!packages/node_modules
-packages/node_modules/@node-red/editor-client/public
-!test/**/node_modules
-docs
-!packages/node_modules/**/docs

.nodemonignore

@@ -1,4 +1,5 @@
 /Gruntfile.js
 /.git/*
+/lib/*
 *.backup
 /public/*

.npmignore

@@ -0,0 +1,7 @@
+.settings
+.jshintignore
+.jshintrc
+.project
+.tern-project
+.travis.yml
+.git

.travis.yml

@@ -1,11 +1,20 @@
 sudo: false
 language: node_js
-matrix:
-  include:
-    - node_js: "12"
-    - 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"
+env:
+  - CXX="g++-4.8"
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
+    - gcc-4.8
+node_js:
+  - "8"
+  - "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

API.md

@@ -1,15 +0,0 @@
-Node-RED Modules
----
-
-Node-RED provides a set of node modules that implement different parts of the
-application.
-
-Module | Description
--------|-------
-[node-red](node-red.html) | the main module that pulls together all of the internal modules and provides the executable version of Node-RED
-[@node-red/editor-api](@node-red_editor-api.html) | an Express application that serves the Node-RED editor and provides the Admin HTTP API
-[@node-red/runtime](@node-red_runtime.html) | the core runtime of Node-RED
-[@node-red/util](@node-red_util.html) | common utilities for the Node-RED runtime and editor modules
-@node-red/registry | the internal node registry
-@node-red/nodes | the default set of core nodes
-@node-red/editor-client | the client-side resources of the Node-RED editor application

CHANGELOG.md

@@ -1,880 +1,3 @@
-#### 1.0.3: Maintenance Release
-
-Runtime
- - Increase timeouts in Subflow tests to minimise false positives
- - Update grunt-sass and add node-sass for node12 support
- - Fix timings of Delay node tests
- - #2340 Update JSONata to 1.7.0
- - Bump https-proxy-agent version
- - #2332 Fix error handling of nodes with multiple input handlers
- - Add script to generate npm publish script
- - #2371 Ensure folder is present before write (e.g. flows file not in user folder)
- - #2371 Handle windows UNC '\\' paths
- - #2366 Handle logging of non-JSON encodable objects
-
-Editor
- - #2328 Fix language handling in subflow node
- - Use default language if lng param not set in i18n req
- - #2326 Fix palette editor search visualization
- - #2375 Subflow status not showing i18n version of contained core nodes status
- - Fix inverse of 'replace' editor event
- - #2376 Fallback to base language files if present
- - #2373 Support UI testing on the latest Google Chrome
- - #2364 Add tooltip to expand button in markdown editor
- - #2363 Support ctrl key to select tabs for Windows
- - #2356 Make JSONata help initially shown in expression editor
- - #2355 Prohibit line break in type menu of typedInput
-
-Nodes
- - Delay: Fix delay to not pass through .reset and .flush props consistently
- - #2352 File: Using the ‘a msg per line’ the last line does not get msg.topic passed
- - #2339 HTTP Request: Check auth type on opening
- - HTTP Request: add units info
- - #2372 MQTT/WS: Improved proxy support for MQTT and WebSocket nodes
- - #2370 MQTT: Add clarification that MQTT Out requires payload to send msg
-
-
-#### 1.0.2: Maintenance Release
-
-Runtime
- - Allow node.status() to be passed number/bool types
- - Allow node emitted events to have multiple arguments
- - #2323 Fixed docstrings to have them match the function signature (name of parameters).
- - #2318 NLS: Unify translations of "boolean"
-
-Editor
- - Ensure node status is refreshed whenever node is edited
- - #2315 #2316 Ensure z property included in full message debug payload
- - #2321 Fixed editor.json (JA nls)
- - #2313 Fix element to collapse items in visual JSON editor
- - #2314 Insert divider in menu by calling RED.menu.addItem('id', null);
-
-Nodes
- - Change: Fixup use of node.done
- - #2322 Template: Fix invalid JSON data in template node docs
- - #2320 File: Fixed a typo in 10-file.html (JA nls)
- - #2312 Template: Remove unnecessary comma in help text
- - #2319 Inject: Interval of inject node should be 596 hours or less.
-
-#### 1.0.1: Maintenance Release
-
-Runtime
- - #2301 Add env vars to enable safe mode and projects
-   - `NODE_RED_ENABLE_SAFE_MODE`
-   - `NODE_RED_ENABLE_PROJECTS`
-
-Editor
- - #2308 Fix grid setting
- - #2306 i18n support in tooltips
- - Fix error when setting typedInput to boolean true/false
- - #2299 Fix SVG icons in IE11
- - #2303 Fix issue where subflow color did not update when not on a flow
-
-Nodes
- - #2297 TLS: Allow TLS config node to provide just CA cert
- - #2307 Inject: Fix width on inject node property
- - #2305 Switch: Let switch node between rule work both ways round
- - Range: Add example to range node info and make use of target consistent
- - Join: node must clone group message before sending
-
-
-#### 1.0.0: Milestone Release
-
-Editor
- - Add click-on-tooltip to close
- - Fix node draggable handling
- - Ensure complete node scope property is remapped on import
- - Update i18n for project feature
- - Fix menu hiding function for flow editor
- - Normalise default subflow color references
- - Hide header text of very small screens to deploy is visible
- - Fix tab access on touch screens
- - Update radialMenu to use standard theme colours
- - Fix undefined reference loading on mobile
- - Allow word breaking of node name with long word
- - Enable wrap mode in Markdown editor
- - Maximize the size of markdown editor
-
-Nodes
- - remove legacy error option from file in mode
- - Change MQTT node default 3.1 compatibility mode to false
- - Show clear debug shortcut in tooltip
- - Fix file-in port labels for all 4 options
- - Add extra comment re Mustache escapes to Template info
- - Fix typo in complete node
- - Allow Function node output input to go to 0
-
-#### 1.0.0-beta.4: Beta Release
-
-Runtime
- - Clone the first message passed to node.send in Function node
-
-Editor
- - Move flow-status button to footer for consistency
- - Fix node hover effect to prevent jumping position
- - Filter quick-add properly when splicing a wire
- - Mark workspace dirty when deleting link node link Fixes #2274
- - Add red-ui-button class to strategy login button
- - Fix padding of subflow locale select Closes #2276
- - Update info text of complete node & add JP text
- - Add class red-ui-button to cancel button
- - Add css class to login submit button (#2275)
- - Realign subflow output port labels
- - Move context sidebar auto-refresh option to individual sections
- - Update Japanese message catalogue
- - Fix subflow UI for select
- - remove padding before label text for SUBFLOW UI row
- - Allow SUBFLOW UI label row without variable name
-
-Nodes
- - Remove old rc option from exec node for 1.0
- - Add python and SQL to template language options
- - Fix Switch node display of jsonata_exp type
- - Remove sentiment from core nodes
-
-#### 1.0.0-beta.3: Beta Release
-
-Runtime
- - [FEATURE] Add Node Done API - make message passing async
- - Ensure the subflow stop promise is waiting for before restarting
- - Limit the regex for the /nodes/ api end points
- - Add error event handler to ssh-keygen child_process Fixes #2255
- - Fix default value handling on context array access Fixes #2252
- - Remove all ui test dependencies from package.json
- - Add req back to audit log events and extend to Projects api
- - Ensure 2nd arg to node.error is an object Fixes #2228
- - Use a more atomic process for writing context files Fixes #2271
-
-
-Editor
- - [FEATURE] Change core node categories
- - [FEATURE] Subflow Instance property UI (#2236)
- - [FEATURE] Add visual JSON editor
- - [FEATURE] Add Action List dialog
- - [FEATURE] Add new shortcut to clear debug message list - ctrl-alt-l
- - [FEATURE] Add show-library dialog actions
- - [FEATURE] Add shift-cursor handling for moving quick-add dialog
- - [FEATURE] Add enable/disable-flow actions
- - [FEATURE] Add actions to change deploy type
- - [FEATURE] Allow config nodes to be disabled, tidy css and add actions
- - [FEATURE] Add default shortcut (ctrl-d) for deploy
- - [FEATURE] Initial implementation of redo (un-undo) - ctrl-y
- - [FEATURE] add support for specifying subflow template color
- - [FEATURE] Use ctrl-click on wire to splice node in place
- - [FEATURE] Allow search results to show more than 25 results
- - [FEATURE] Allow a node to change if it has an input port Closes #2268
- - Revealing node position needs to account for zoom level Fixes #2172
- - Fix typedInput option selection Fixes #2174
- - Fix palette node id handling so search works Fixes #2173
- - Add popover tooltips to debug sidebar,function and template
- - Add popovers to context sidebar mini buttons
- - Ensure node status icon is shown when value set
- - Revert treeList children function signature change
- - Restore tray component css for compatibility. Mark as deprecated
- - fix function name & string compare function
- - Handle empty list of example flows Fixes #2171
- - Ensure library list has an item selected when opened
- - Ensure tooltip popover doesn't replace normal popover
- - Fix clipboard export download button
- - Ensure input box has focus on repeated quick add
- - Fix width calculation of typedInput
- - Remove some hardcoded css colors
- - Fix display of node help when clicking in palette Fixes #2194
- - Ensure node help is loaded in the right language Fixes #2195
- - Do not allow tab focus on clipboard hidden element
- - Fix undefined error on typedInput due to valueLabel used before being added
- - Fix undo of flow disable state change
- - Fix select-all action in main view
- - Fix delete-all action on config node sidebar
- - Update UI tests for new editor css
- - Add insertItemAt doc to editableList
- - Ensure focus returns to the right element after dialogs shown
- - Set autocomplete to disabled in form input elements
- - Update all node icons to SVG
- - Handle png/svg fallback for def.icon values. Remove old pngs
- - Ignore empty examples directories (don't add to import menu)
- - better handle example file at any depth - #2222
- - Properly escape node types in palette
- - Ensure session expiry timeout doesn't exceed limit
- - Use node/tab map to make filterNodes more efficient
- - Rearrange contents of subflow template settings tab
- - Handle undefined node.\_def in edit stack title.
- - fix converting selection to subflow
- - Fix inserting new subflow node to existing wire between nodes
- - Support displaying falsey node status values Fixes #2246
- - Remove tab menu from node property UI for subflow and config nodes
- - Mark workspace dirty when shift-click-drag detaches wires Fixes #2260
- - Fix subflow category change on palette
-
-
-Nodes
- - Remove pi gpi, twitter, email and feedparser nodes from core
- - Fix error handling in Websocket broadcast function Fixes #2182
- - Handle websocket item being parseable but not an object better
- - stop join tripping up if last message of buffer is blank.
- - Add support for env var propety in switch node
- - Improve handling of file upload in request node
- - Add "has key" rule to  switch node + tests
- - Optimise generation of switch node edit dialog
- - Add keep-alive option to HTTP Request - #2261
-
-#### 1.0.0-beta.2: Beta Release
-
-Runtime
- - Fix length calculation when loading library file
-
-#### 1.0.0-beta.1: Beta Release
-
-Runtime
- - Update runtime apis to support multiple libraries
- - Add Node 12 to travis (allow_failures)
- - Bump all dependencies Fixes #2152
-
-Editor
- - [BREAKING] complete overhaul of editor DOM/CSS structure
- - [BREAKING] Get rid of Bootstrap
- - Simplify index.mst to a single div to insert the editor
- - Append node configs to div rather than body
- - Only redraw node status when it has changed
- - Minimise work done to calculate node label widths
- - Allow script tags with src to reference esm modules
- - Upgrade to jq 3.4.1 / jq-ui 1.12.1
- - Allow editor language to be chosen in editor settings
- - Only NLS status text that starts with a letter Fixes #2128
- - Fix display of link node list within subflow Fixes #2140
- - Blur the active element when closing edit dialog via action Fixes #2097
- - Trigger change evnt on typedInput when type changes and options present Fixes #2160
- - Move library import/export to single dialog
- - Move type-library dialogs to new style dialog
- - Fix node drag and drop animation
- - let status be simple text if wanted
- - Add workspace statusBar
- - Complete refresh of German translations
- - Fix memory leak in Debug sidebar #2163
- - Introduce toggleButton and move flow-disabled to use it
- - Allow RED.settings.get/set to use full property desc
- - Add auto-refresh toggle to context sidebar
- - Add build-custom-theme script
- - Add RED.view.selectNodes api for node selection whilst editing
- - Add node-select to typedInput
-
-Nodes
- - http request node: warn user if msg.requestTimeout == 0
- - hide delay node reset label on deploy
- - Fix CSV regex to treat strings starting e as text
- - Add "don't parse numbers" option to csv node
- - Add expand editor button to Template node
- - Update catch/status nodes to use selectNodes api and treeList
-
-#### 0.20.8: Maintenance Release
-
- - Sanitize tab name in edit dialog
- - Pass httpServer to runtime even when httpAdmin disabled Fixes #2272
-
-#### 0.20.7: Maintenance Release
-
- - Update jsonata to 1.6.5 which should fix #2183
- - Ensure the subflow stop promise is waiting for before restarting
- - Properly escape node types in palette
-
-#### 0.20.6: Maintenance Release
-
- - Revealing node position needs to account for zoom level Fixes #2172
- - stop join tripping up if last message of buffer is blank.
- - Improve handling of file upload in request node
- - Handle subflow internal node wired to a non-existant node Fixes #2202
- - Do not save subflow env vars with blank names
- - Don't allow a link node virtual wire to connect to normal port
- - Clear HTTP Request node authType when auth disabled Fixes #2215
- - Fix parsing of content-type header Fixes #2216
- - Fix join node reset issue with merging objects
- - Copy data-i18n attribute on TypedInput Fixes #2211
-
-#### 0.20.5: Maintenance Release
-
- - Revert error handling in palette manager
-
-#### 0.20.4: Maintenance Release
-
-- Switch media-typer to content-type module Fixes #2122 #2123
-- Use userObj.username and not .name for ssh key lookup Closes #2109
-- Ensure mqtt message handlers are tidied up properly on partial deploy
-- Update package dependencies
-- Fix encoding menu in file node #2125
-- Update ACE to 1.4.3-src-min-noconflict Fixes #2106
-- Fix creating missing package.json when existing project imported Fixes #2115
-- Allow subflow instance to override env var with falsey values Fixes #2113
-- Prevent wire from normal node to link virtual port Fixes #2114
-- Add explanation to the help text on the new feature to build query string from msg.payload #2116
-- Bump bcrypt to latest
-- Add Korean locales files for nodes #2100
-- Add error message if catalog is invalid json
-- Reduce udp out timeout to be less than default inject at start #2127
-
-#### 0.20.3: Maintenance Release
-
-- Do not dynamically add/remove upgrade listener in ws nodes
-- Avoid env var reference loops and support $parent. prefix Fixes #2099
-- Ensure config.\_flow is non-enumerable so is ignored by JSON.stringify
-- Block loading ACE from cdn
-
-#### 0.20.2: Maintenance Release
-
- - Filter out duplicate nodes when importing a flow
- - Handle node configs with multiple external scripts properly
-
-#### 0.20.1: Maintenance Release
-
- - Ensure all subflow instances are stopped when flow stopping Fixes #2095
- - modify name of korean locale forders #2091
- - Ensure node names are sanitized before being presented
- - Subflow status node must pass status to parent flow Fixes #2087
- - fix problem on displaying option label on Firefox #2090
-
-#### 0.20.0: Milestone Release
-
-Runtime
- - Pass complete status to Status node and filter to editor
- - Ensure flows wait for all nodes to close before restarting Fixes #2067
- - Fix git clone with password protected key
- - Allow a project to be located below the root of repo
- - Detect the cloning of an empty git repo properly
- - Fix use of custom auth strategy plugins
- - Remove remnants of when library in git/index Fixes #2057
- - Clear subflow status on close
- - Add exportGlobalContextKeys to prevent exposing functionGlobalContext keys
- - Add --no-audit and --no-update-notifier flags to npm commands to reduce workload
- - Add envVarExcludes setting to block named env vars
- - Update settings.js docs on userDir to match reality Fixes #2082
- - Add Korean Language
-
-
-Editor
- - Automatic placing of node icon according to input/output counts
- - Transfer placeholder and type to generated TypedInput field
- - Hitting enter in Comment node name field clicks markdown button
- - Shift status text left if no shape specified
- - Better align node status text to status dot
- - Handle treeList labels as text not html
- - Change subflow edit dialog titles
- - Resize subflow edit dialog properly
- - Add flow list button to tab bar
- - Handle node name as unsanitized text in debug sidebar
-
-Nodes
-
- - HTTP Request: Add Digest and Bearer Auth modes to http request node (#2061)
- - HTTP Request: Add multipart/form-data support to http request node (#2076)
- - TCP: include session/event info in status events
- - WebSocket: include session/event info in status events
- - Add i18n support for port label of inject/exec/httprequest/file nodes
- - Join node: handle merged objects with repeated properties and honour parts
- - JSON node: handle single booleans and numbers
- - File node: add encoding support to file in/out node (#2066)
-
-#### 0.20.0-beta.5: Beta Release
-
-Runtime
-
- - Bump dependencies
- - Allow `$parent` access of flow context
- - Make Node.\_flow a writeable property
- - Do not propagate Flow.getNode to parent when called from outside flow
- - Add support of subflow env var
-
-Editor
-
- - Properly sanitize node names in deploy warning dialogs
- - Fix XSS issues in library ui code
- - Add env type to subflow env var types
- - Display parent subflow properties in edit dialog
- - Fix direction value of subflow output
- - Add Status Node to Subflow to allow subflow-specific status Closes #597
- - Better handling of multiple flow merges Fixes #2039
-
-Nodes
-
- - Various translation updates
- - Catch: Add 'catch uncaught only' mode. Closes #1747
- - Link: scroll to current flow in node list
- - HTTPRequest: add option to urlencode cookies
- - HTTPRequest: option to use msg.payload as query params on GET. #1981
- - Debug: Add local time display option to numerics in debug window
- - MQTT: Add parsed JSON output option
-
-#### 0.20.0-beta.4: Beta Release
-
-Runtime
-
- - Bump JSONata to 1.6.4
- - Add Flow.getSetting for resolving env-var properties
- - Refactor Subflow logic into own class
- - Restore RED.auth to node-red module api
- - Tidy up when usage in Flow and Node
-
-Editor
-
- - German translation
- - Change default dropdown appearance and sidebar tab menu handling
- - Handle multiple-select box when nothing selected Fixes #2021
- - Handle i18n properly when key is a valid sub-identifier Fixes #2028
- - Avoid duplicate links when missing node type installed Fixes #2032
- - Add View Tools
- - Don't collapse version control header when clicking refresh
- - Add fast entry via keyboard for string of nodes
- - Check for undeployed change before showing open project dialog
- - Add placeholder node when in quick-add mode
- - Move nodes to top-left corner when converting to subflow
-
-Nodes
-
- - Debug: Allow debug edit expression to be sent to status
- - WebSocket: Fix missing translated help
-
-
-#### 0.20.0-beta.3: Beta Release
-
-Editor
-
- - Update palette manager view properly when module updated
- - Add TreeList common widget
- - Fix visual jump when opening Comment editor on Safari Part of #2008
- - Fix vertical align of markdown editor in Safari Fixes #2008
- - Avoid marking node as changed if label state is default Fixes #2009
- - Highlight port on node hover while joining
- - Support drag-wiring of link nodes
- - Allow TypeSearch to include a filter option
- - Improve diff colouring
- - Allow sections to toggle in 2-element stack
- - Add support for ${} env var syntax when skipping validation Closes #1980
- - i18 support for markdown editor tooltip
- - Add RED.editor.registerTypeEditor for custom type editors
- - Tidy up markdown toolbar handling across all editors
- - Added validation while export into library
- - Reuse notification boxes rather than stack multiple of the same type
- - Make ssh key dialog accessible when opened from new proj dialog
-
-Runtime
-
- - Bump JSONata to 1.6.4 Fixes #2023
- - Add audit logging to admin api
- - Fix failure of RED.require #2010
- - Allow oauth strategy callback method to be customised Closes #1998
- - Ensure fs context cache is flushed on close Fixes #2001
- - Fix library Buffer( to Buffer.alloc( for node 10
- - Catch file-not-found on startup when non-existant flow file specified
- - Actively expire login sesssions and notify user
- - Add quotation marks for basic auth challenge #1976
-
-Nodes
-
- - Change: remove promises to improve performance
- - Debug: add ability to apply JSONata expression to message
- - Join: remove promises to improve performance
- - JSON: delete msg.schema before sending msg to avoid conflicts
- - Link: update UI to use common TreeList widget
- - Switch: remove promises to improve performance
-
-#### 0.20.0-beta.2: Beta Release
-
- - Split Node-RED internals into multiple sub-modules
-
-Editor
-
- - Allow the editor to use a custom admin api url root
- - Improve performance of Flow Diff dialog - @TothiViseo #1989
- - Add 'open project' option to Projects Welcome dialog
- - Add 'type already registered' check in palette editor
- - Handle missing tab.disabled property
- - Handle missing wires prop and string x/y props on import
- - Add RED.notifications.hide flag - for UI testing
- - Improve alignment of node label edit inputs
- - Show arrow-in node when invalid font-awesome icon name was specified for default icon
- - Add ability to delete context values from sidebar
- - Allow copy-to-clipboard copy whole tabs
- - Make disabled flows more obvious in editor
- - Allow import/export from file in editor
- - Allow config nodes to be selected in sidebar and deleted
- - Show port label of subflow with input port
- - Support ctrl-click selection of flow tabs
- - Allow left-hand node button to act as toggle
- - Support dbl-click in tab bar to add new flow in position
- - Fix duplicate subflow detection on import
- - Add import notification with info on what has been imported Closes #1862
- - Show error details when trying to import invalid json
- - Show default icon when non-existent font-awesome icon was specified
- - Add configurable option for showing node label
- - Avoid http redirects as Safari doesn't reuse Auth header Fixes #1903
- - Tidy up ace tooltip styling
- - Add event log to editor
- - Add tooltips to multiple editor elements
- - Allow palette to be hidden
- - Add node module into to sidebar and palette popover
- - Mark all newly imported nodes as changed
- - Allow a node label to be hidden
- - Add markdown formatting toolbar
- - Add markdown toolbar to various editors
- - Fix i18n handling for ja-JP locale on Safari/MacOS
- - Add node body tooltip
- - Decrease opacity of flow-navigator
- - Update tooltip style
- - Update ACE to 1.4.1-src-min-noconflict
- - Cache node locales by language
- - Show icon element with either icon image or fa-icon
- - Added font-awesome icons to user defined icon
- - Update info side bar with node description section
- - One-click search of config node users
- - Redesign node edit dialog to tabbed style
- - Add 'restart flows' option to deploy menu
- - Add node description property UI
-
-
-Runtime
-
- - Allow a project to be loaded from cmdline
- - Handle lookup of undefined property in Global context Fixes #1978
- - Refuse to enable Manage Palette if npm too old
- - Remove restriction on upgrading non-local modules
- - Remove deprecated Buffer constructor usage Fixes #1709
- - Update httpServerOptions doc in settings.js
- - Exclude non-testable .js files from the unit tests
- - Add --safe mode flag to allow starting without flows running
- - Add setting-defined accessToken for automated access to the adminAPI - #1789
-
-Nodes
-
- - Move all core node EN help to their own locale files - #1990
- - CSV: better regex for number detection
- - Debug: hide button if not configured to send to sidebar
- - Delay: report queue activity when in by-topic mode
- - Delay: add msg.flush mode
- - Exec: Preserve existing properties on msg object
- - File: remove CR/LF from incoming filename
- - Function: create custom ace javascript mode to handle ES6 Fixes #1911
- - Function: add env.get
- - HTTP Request: Add http-proxy config #1913
- - HTTP Request: add msg.redirectList to output
- - HTTP Request: add msg.requestTimeout option for per-message setting - @natcl #1959
- - MQTT: add auto-detect and base64 output to mqtt node Fixes #1912 - @DurandA
- - MQTT: only unsubscribe node that is being removed
- - Sentiment: move to node-red-node-sentiment
- - Switch: add missing edit dialog icon
- - Tail: move to node-red-node-tail
- - TCPGet: clear status if user changes target per message
- - Template: tidy up edit dialog
- - UDP: more resilient binding to correct port for udp, give input side priority
- - Split/Join: add msg.reset to info panel
- - Split/Join: reset join without sending part array
- - Watch: add msg.filename so can feed direct to file in node
- - WebSocket: preserve \_session on msg but don't send as part of wholemsg
-
-#### 0.19.6: Maintenance Release
-
- - Fix encoding of file node from binary to utf8 - #2051
-
-#### 0.19.5: Maintenance Release
-
- - Recognize pip installs of RPi.GPIO (#1934)
- - Merge pull request #1941 from node-red-hitachi/master-batch
- - Merge pull request #1931 from node-red-hitachi/master-typedinput
- - Set min value of properties and spinners for batch
- - Fix that unnecessary optionMenu remains
- - Merge pull request #1894 from node-red-hitachi/fix-overlapping-file-node-execution
- - Merge pull request #1924 from imZack/patch-1
- - Add missing comma
- - Do not disable context sidebar during node edit Fixes #1921
- - Don't allow virtual links to be spliced Fixes #1920
- - Merge project package changes to avoid overwritten changes
- - Handle manually added project deps that are unused Fixes #1908
- - update close & input handling of File node
- - make close handler argument only one
- - Merge pull request #1907 from amilajack/patch-2
- - Change repo badge to point to master branch
- - invoke callbacks if async handler is specified
- - Merge pull request #1891 from camlow325/resolve-example-path-for-windows-support
- - Merge pull request #1900 from kazuhitoyokoi/master-addtestcases4settings.js
- - wait closing while pending messages exist
- - Add test cases for red/api/editor/settings.js
- - Ensure all palette categories are opened properly Closes #1893
- - Resolve path when sending example file for Windows support
- - fix multiple input message processing of file node
-
-#### 0.19.4: Maintenance Release
-
- - Fix race condition in non-cache lfs context Fixes #1888
- - LocalFileSystem Context: Remove extra flush code
- - Prevent race condition in caching mode of lfs context (#1889)
- - Allow context store name to be provided in the key
- - Switch node: only use promises when absolutely necessary
- - Fix dbl-click handling on webkit-based browsers
- - Ensure context.flow/global cannot be deleted or enumerated
- - Handle context.get with multiple levels of unknown key Fixes #1883
- - Fix global.get("foo.bar") for functionGlobalContext set values
- - Fix node color bug (#1877)
- - Merge pull request #1857 from cclauss/patch-1
- - Define raw_input() in Python 3 & fix time.sleep()
-
-#### 0.19.3: Maintenance Release
-
- - Split node - fix complete to send msg for k/v object
- - Remove unused Join node merged object key typed input
- - Set the JavaScript editor to full-screen
- - Filter global modules installed locally
- - Add svg to permitted icon extension list
- - Debug node - indicate status all the time if selected to do so
- - pi nodes - increase test coverage slightly
- - TCP-request node - only write payload
- - JSON schema: perform validation when obj -> obj or str -> str
- - JSON schema: add draft-06 support (via $schema keyword)
- - Mqtt proxy configuration for websocket connection, #1651.
- - Allows MQTT Shared Subscriptions for MQTT-In core node
- - Fix use of HTML tag or CSS class specification as icon of typedInput
-
-#### 0.19.2: Maintenance Release
-
- - Ensure node default colour is used if palette.theme has no match
- - fix lost messages / properties in TCPRequest Node; closes #1863 (#1864)
- - Fix typo in template.html
- - Improve error reporting from context plugin loading
- - Prevent no-op edit of node marking as changed due to icon
- - Change node must handle empty rule set
-
-#### 0.19.1: Maintenance Release
-
- - Pull in latest twitter node
- - Handle windows paths for context storage
- - Handle persisting objects with circular refs in context
- - Ensure js editor can expand to fill available space
- - Add example localfilesystem contextStorage to settings
- - Fix template node handling of nested context tags
-
-#### 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
@@ -950,7 +73,7 @@ Nodes
  - Initial support of sequence rules for SWITCH node (#1545)
  - initial support of SORT node (#1500)
  - Inject node - let once delay be editable (#1541)
- - Introduce `nodeMessageBufferMaxLength` setting for msg sequence nodes
+ - 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)

CONTRIBUTING.md

@@ -26,17 +26,17 @@ relevant nodes, press Ctrl-E and copy the flow data from the Export dialog.
 At a minimum, please include:
 
  - Version of Node-RED - either release number if you downloaded a zip, or the first few lines of `git log` if you are cloning the repository directly.
- - Version of Node.js - what does `node -v` say?
+ - Version of node.js - what does `node -v` say?
 
 ## 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

@@ -15,8 +15,6 @@
  **/
 
 var path = require("path");
-var fs = require("fs-extra");
-var sass = require("node-sass");
 
 module.exports = function(grunt) {
 
@@ -26,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: {
@@ -44,7 +38,7 @@ module.exports = function(grunt) {
                 reporter: 'spec'
             },
             all: { src: ['test/**/*_spec.js'] },
-            core: { src: ["test/_spec.js","test/unit/**/*_spec.js"]},
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         webdriver: {
@@ -59,11 +53,10 @@ module.exports = function(grunt) {
                 ignoreLeaks: false,
                 ui: 'bdd',
                 reportFormats: ['lcov','html'],
-                print: 'both',
-                istanbulOptions: ['--no-default-excludes', '-i','**/packages/node_modules/**']
+                print: 'both'
             },
-            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
+            all: { src: ['test/**/*_spec.js'] },
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         jshint: {
@@ -83,14 +76,16 @@ module.exports = function(grunt) {
             all: [
                 'Gruntfile.js',
                 'red.js',
-                'packages/**/*.js'
+                'red/**/*.js',
+                'nodes/core/*/*.js',
+                'editor/js/**/*.js'
             ],
             core: {
                 files: {
                     src: [
                         'Gruntfile.js',
                         'red.js',
-                        'packages/**/*.js',
+                        'red/**/*.js'
                     ]
                 }
             },
@@ -121,89 +116,78 @@ module.exports = function(grunt) {
                 src: [
                     // Ensure editor source files are concatenated in
                     // the right order
-                    "packages/node_modules/@node-red/editor-client/src/js/jquery-addons.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/red.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/events.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/i18n.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/settings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/user.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/comms.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/nodes.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/history.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/validators.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/actions.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/statusBar.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/editor.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/*.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tray.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/search.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js"
+                    "editor/js/red.js",
+                    "editor/js/events.js",
+                    "editor/js/i18n.js",
+                    "editor/js/settings.js",
+                    "editor/js/user.js",
+                    "editor/js/comms.js",
+                    "editor/js/text/bidi.js",
+                    "editor/js/text/format.js",
+                    "editor/js/ui/state.js",
+                    "editor/js/nodes.js",
+                    "editor/js/history.js",
+                    "editor/js/validators.js",
+                    "editor/js/ui/utils.js",
+                    "editor/js/ui/common/editableList.js",
+                    "editor/js/ui/common/checkboxSet.js",
+                    "editor/js/ui/common/menu.js",
+                    "editor/js/ui/common/panels.js",
+                    "editor/js/ui/common/popover.js",
+                    "editor/js/ui/common/searchBox.js",
+                    "editor/js/ui/common/tabs.js",
+                    "editor/js/ui/common/stack.js",
+                    "editor/js/ui/common/typedInput.js",
+                    "editor/js/ui/actions.js",
+                    "editor/js/ui/deploy.js",
+                    "editor/js/ui/diff.js",
+                    "editor/js/ui/keyboard.js",
+                    "editor/js/ui/workspaces.js",
+                    "editor/js/ui/view.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/palette-editor.js",
+                    "editor/js/ui/editor.js",
+                    "editor/js/ui/tray.js",
+                    "editor/js/ui/clipboard.js",
+                    "editor/js/ui/library.js",
+                    "editor/js/ui/notifications.js",
+                    "editor/js/ui/search.js",
+                    "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: "packages/node_modules/@node-red/editor-client/public/red/red.js"
+                dest: "public/red/red.js"
             },
             vendor: {
                 files: {
-                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.4.1.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.0.1.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js",
-                        "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js",
+                    "public/vendor/vendor.js": [
+                        "editor/vendor/jquery/js/jquery-1.11.3.min.js",
+                        "editor/vendor/bootstrap/js/bootstrap.min.js",
+                        "editor/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js",
+                        "editor/vendor/jquery/js/jquery.ui.touch-punch.min.js",
+                        "editor/vendor/marked/marked.min.js",
+                        "editor/vendor/d3/d3.v3.min.js",
+                        "editor/vendor/i18next/i18next.min.js"
                     ],
-                    // "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
-                    //     // TODO: resolve relative resource paths in
-                    //     //       bootstrap/FA/jquery
-                    // ],
-                    "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
+                    "public/vendor/vendor.css": [
+                        // TODO: resolve relative resource paths in
+                        //       bootstrap/FA/jquery
+                    ],
+                    "public/vendor/jsonata/jsonata.min.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
+                        "editor/vendor/jsonata/formatter.js"
+                    ],
+                    "public/vendor/ace/worker-jsonata.js": [
+                        "node_modules/jsonata/jsonata-es5.min.js",
+                        "editor/vendor/jsonata/worker-jsonata.js"
                     ]
                 }
             }
@@ -211,60 +195,63 @@ module.exports = function(grunt) {
         uglify: {
             build: {
                 files: {
-                    'packages/node_modules/@node-red/editor-client/public/red/red.min.js': 'packages/node_modules/@node-red/editor-client/public/red/red.js',
-                    'packages/node_modules/@node-red/editor-client/public/red/main.min.js': 'packages/node_modules/@node-red/editor-client/public/red/main.js',
-                    'packages/node_modules/@node-red/editor-client/public/vendor/ace/mode-jsonata.js': 'packages/node_modules/@node-red/editor-client/src/vendor/jsonata/mode-jsonata.js',
-                    'packages/node_modules/@node-red/editor-client/public/vendor/ace/snippets/jsonata.js': 'packages/node_modules/@node-red/editor-client/src/vendor/jsonata/snippets-jsonata.js'
+                    'public/red/red.min.js': 'public/red/red.js',
+                    'public/red/main.min.js': 'public/red/main.js',
+                    'public/vendor/ace/mode-jsonata.js': 'editor/vendor/jsonata/mode-jsonata.js',
+                    'public/vendor/ace/snippets/jsonata.js': 'editor/vendor/jsonata/snippets-jsonata.js'
                 }
             }
         },
         sass: {
             build: {
                 options: {
-                    implementation: sass,
                     outputStyle: 'compressed'
                 },
                 files: [{
-                    dest: 'packages/node_modules/@node-red/editor-client/public/red/style.min.css',
-                    src: 'packages/node_modules/@node-red/editor-client/src/sass/style.scss'
+                    dest: 'public/red/style.min.css',
+                    src: 'editor/sass/style.scss'
+                },
+                {
+                    dest: 'public/vendor/bootstrap/css/bootstrap.min.css',
+                    src: 'editor/vendor/bootstrap/css/bootstrap.css'
                 }]
             }
         },
         jsonlint: {
             messages: {
                 src: [
-                    'packages/node_modules/@node-red/nodes/locales/**/*.json',
-                    'packages/node_modules/@node-red/editor-client/locales/**/*.json',
-                    'packages/node_modules/@node-red/runtime/locales/**/*.json'
+                    'nodes/core/locales/en-US/messages.json',
+                    'red/api/locales/en-US/editor.json',
+                    'red/runtime/locales/en-US/runtime.json'
                 ]
             },
             keymaps: {
                 src: [
-                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
+                    'editor/js/keymap.json'
                 ]
             }
         },
         attachCopyright: {
             js: {
                 src: [
-                    'packages/node_modules/@node-red/editor-client/public/red/red.min.js',
-                    'packages/node_modules/@node-red/editor-client/public/red/main.min.js'
+                    'public/red/red.min.js',
+                    'public/red/main.min.js'
                 ]
             },
             css: {
                 src: [
-                    'packages/node_modules/@node-red/editor-client/public/red/style.min.css'
+                    'public/red/style.min.css'
                 ]
             }
         },
         clean: {
             build: {
                 src: [
-                    "packages/node_modules/@node-red/editor-client/public/red",
-                    "packages/node_modules/@node-red/editor-client/public/index.html",
-                    "packages/node_modules/@node-red/editor-client/public/favicon.ico",
-                    "packages/node_modules/@node-red/editor-client/public/icons",
-                    "packages/node_modules/@node-red/editor-client/public/vendor"
+                    "public/red",
+                    "public/index.html",
+                    "public/favicon.ico",
+                    "public/icons",
+                    "public/vendor"
                 ]
             },
             release: {
@@ -276,27 +263,27 @@ module.exports = function(grunt) {
         watch: {
             js: {
                 files: [
-                    'packages/node_modules/@node-red/editor-client/src/js/**/*.js'
+                    'editor/js/**/*.js'
                 ],
-                tasks: ['copy:build','concat',/*'uglify',*/ 'attachCopyright:js']
+                tasks: ['copy:build','concat','uglify','attachCopyright:js']
             },
             sass: {
                 files: [
-                    'packages/node_modules/@node-red/editor-client/src/sass/**/*.scss'
+                    'editor/sass/**/*.scss'
                 ],
                 tasks: ['sass','attachCopyright:css']
             },
             json: {
                 files: [
-                    'packages/node_modules/@node-red/nodes/locales/**/*.json',
-                    'packages/node_modules/@node-red/editor-client/locales/**/*.json',
-                    'packages/node_modules/@node-red/runtime/locales/**/*.json'
+                    'nodes/core/locales/en-US/messages.json',
+                    'red/api/locales/en-US/editor.json',
+                    'red/runtime/locales/en-US/runtime.json'
                 ],
                 tasks: ['jsonlint:messages']
             },
             keymaps: {
                 files: [
-                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
+                    'editor/js/keymap.json'
                 ],
                 tasks: ['jsonlint:keymaps','copy:build']
             },
@@ -311,13 +298,12 @@ module.exports = function(grunt) {
         nodemon: {
             /* uses .nodemonignore */
             dev: {
-                script: 'packages/node_modules/node-red/red.js',
+                script: 'red.js',
                 options: {
                     args: nodemonArgs,
                     ext: 'js,html,json',
                     watch: [
-                        'packages/node_modules',
-                        '!packages/node_modules/@node-red/editor-client'
+                        'red','nodes'
                     ]
                 }
             }
@@ -336,56 +322,69 @@ module.exports = function(grunt) {
             build: {
                 files:[
                     {
-                        src: 'packages/node_modules/@node-red/editor-client/src/js/main.js',
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/main.js'
+                        src: 'editor/js/main.js',
+                        dest: 'public/red/main.js'
                     },
                     {
-                        src: 'packages/node_modules/@node-red/editor-client/src/js/keymap.json',
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/keymap.json'
+                        src: 'editor/js/keymap.json',
+                        dest: 'public/red/keymap.json'
                     },
                     {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/images',
+                        cwd: 'editor/images',
                         src: '**',
                         expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/images/'
+                        dest: 'public/red/images/'
                     },
                     {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/vendor',
+                        cwd: 'editor/vendor',
                         src: [
                             'ace/**',
-                            'jquery/css/base/**',
+                            //'bootstrap/css/**',
+                            'bootstrap/img/**',
+                            'jquery/css/**',
                             'font-awesome/**'
                         ],
                         expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
+                        dest: 'public/vendor/'
                     },
                     {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/icons',
+                        cwd: 'editor/icons',
                         src: '**',
                         expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/icons/'
+                        dest: 'public/icons/'
                     },
                     {
                         expand: true,
-                        src: ['packages/node_modules/@node-red/editor-client/src/index.html','packages/node_modules/@node-red/editor-client/src/favicon.ico'],
-                        dest: 'packages/node_modules/@node-red/editor-client/public/',
+                        src: ['editor/index.html','editor/favicon.ico'],
+                        dest: 'public/',
                         flatten: true
                     },
                     {
                         src: 'CHANGELOG.md',
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/about'
-                    },
-                    {
-                        src: 'CHANGELOG.md',
-                        dest: 'packages/node_modules/node-red/'
-                    },
-                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/ace/bin/',
-                        src: '**',
-                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/ace/'
+                        dest: 'public/red/about'
                     }
                 ]
+            },
+            release: {
+                files: [{
+                    mode: true,
+                    expand: true,
+                    src: [
+                        '*.md',
+                        'LICENSE',
+                        'package.json',
+                        'settings.js',
+                        'red.js',
+                        'lib/.gitignore',
+                        'nodes/*.demo',
+                        'nodes/core/**',
+                        'red/**',
+                        'public/**',
+                        'editor/templates/**',
+                        'bin/**'
+                    ],
+                    dest: path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>')
+                }]
             }
         },
         chmod: {
@@ -393,93 +392,20 @@ module.exports = function(grunt) {
                 mode: '755'
             },
             release: {
+                // Target-specific file/dir lists and/or options go here.
                 src: [
-                    "packages/node_modules/@node-red/nodes/core/hardware/nrgpio",
-                    "packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-*sh"
+                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/nodes/core/hardware/nrgpio*')
                 ]
             }
         },
-        'npm-command': {
-            options: {
-                cmd: "pack",
-                cwd: "<%= paths.dist %>/modules"
-            },
-            'node-red': { options: { args: [__dirname+'/packages/node_modules/node-red'] } },
-            '@node-red/editor-api': { options: { args: [__dirname+'/packages/node_modules/@node-red/editor-api'] } },
-            '@node-red/editor-client': { options: { args: [__dirname+'/packages/node_modules/@node-red/editor-client'] } },
-            '@node-red/nodes': { options: { args: [__dirname+'/packages/node_modules/@node-red/nodes'] } },
-            '@node-red/registry': { options: { args: [__dirname+'/packages/node_modules/@node-red/registry'] } },
-            '@node-red/runtime': { options: { args: [__dirname+'/packages/node_modules/@node-red/runtime'] } },
-            '@node-red/util': { options: { args: [__dirname+'/packages/node_modules/@node-red/util'] } }
-
-
-        },
-        mkdir: {
-            release: {
-                options: {
-                    create: ['<%= paths.dist %>/modules']
-                },
-            },
-        },
         compress: {
             release: {
                 options: {
                     archive: '<%= paths.dist %>/node-red-<%= pkg.version %>.zip'
                 },
                 expand: true,
-                cwd: 'packages/node_modules/',
-                src: [
-                    '**',
-                    '!@node-red/editor-client/src/**'
-                ]
-            }
-        },
-        jsdoc : {
-            modules: {
-                src: [
-                    'API.md',
-                    'packages/node_modules/node-red/lib/red.js',
-                    'packages/node_modules/@node-red/runtime/lib/index.js',
-                    'packages/node_modules/@node-red/runtime/lib/api/*.js',
-                    'packages/node_modules/@node-red/runtime/lib/events.js',
-                    'packages/node_modules/@node-red/util/**/*.js',
-                    'packages/node_modules/@node-red/editor-api/lib/index.js',
-                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js'
-                ],
-                options: {
-                    destination: 'docs',
-                    configure: './jsdoc.json'
-                }
-            },
-            _editor: {
-                src: [
-                    'packages/node_modules/@node-red/editor-client/src/js'
-                    ],
-                options: {
-                    destination: 'packages/node_modules/@node-red/editor-client/docs',
-                    configure: './jsdoc.json'
-                }
-            }
-
-        },
-        jsdoc2md: {
-            runtimeAPI: {
-                options: {
-                    separators: true
-                },
-                src: [
-                    'packages/node_modules/@node-red/runtime/lib/index.js',
-                    'packages/node_modules/@node-red/runtime/lib/api/*.js',
-                    'packages/node_modules/@node-red/runtime/lib/events.js'
-                ],
-                dest: 'packages/node_modules/@node-red/runtime/docs/api.md'
-            },
-            nodeREDUtil: {
-                options: {
-                    separators: true
-                },
-                src: 'packages/node_modules/@node-red/util/**/*.js',
-                dest: 'packages/node_modules/@node-red/util/docs/api.md'
+                cwd: '<%= paths.dist %>/',
+                src: ['node-red-<%= pkg.version %>/**']
             }
         }
     });
@@ -498,13 +424,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-chmod');
     grunt.loadNpmTasks('grunt-jsonlint');
     grunt.loadNpmTasks('grunt-mocha-istanbul');
-    if (fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-        grunt.loadNpmTasks('grunt-webdriver');
-    }
-    grunt.loadNpmTasks('grunt-jsdoc');
-    grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
-    grunt.loadNpmTasks('grunt-npm-command');
-    grunt.loadNpmTasks('grunt-mkdir');
+    grunt.loadNpmTasks('grunt-webdriver');
 
     grunt.registerMultiTask('attachCopyright', function() {
         var files = this.data.src;
@@ -546,38 +466,6 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.registerTask('verifyPackageDependencies', function() {
-        var done = this.async();
-        var verifyDependencies = require("./scripts/verify-package-dependencies.js");
-        verifyDependencies().then(function(failures) {
-            if (failures.length > 0) {
-                failures.forEach(f => grunt.log.error(f));
-                grunt.fail.fatal("Failed to verify package dependencies");
-            }
-            done();
-        });
-    });
-
-    grunt.registerTask('verifyUiTestDependencies', function() {
-        if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-            grunt.fail.fatal('You need to install the UI test dependencies first.\nUse the script in "scripts/install-ui-test-dependencies.sh"');
-            return false;
-        }
-    });
-    grunt.registerTask('generatePublishScript',
-        'Generates a script to publish build output to npm',
-            function () {
-                const done = this.async();
-                const generatePublishScript = require("./scripts/generate-publish-script.js");
-                generatePublishScript().then(function(output) {
-                    grunt.log.writeln(output);
-
-                    const filePath = path.join(grunt.config.get('paths.dist'),"modules","publish.sh");
-                    grunt.file.write(filePath,output);
-
-                    done();
-                });
-            });
     grunt.registerTask('setDevEnv',
         'Sets NODE_ENV=development so non-minified assets are used',
             function () {
@@ -586,7 +474,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('default',
         'Builds editor content then runs code style checks and unit tests on all components',
-        ['build','verifyPackageDependencies','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',
@@ -596,15 +484,9 @@ module.exports = function(grunt) {
         'Runs code style check on editor code',
         ['jshint:editor']);
 
-    if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-        grunt.registerTask('test-ui',
-            'Builds editor content then runs unit tests on editor ui',
-            ['verifyUiTestDependencies']);
-    } else {
-        grunt.registerTask('test-ui',
-            'Builds editor content then runs unit tests on editor ui',
-            ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
-    }
+    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',
@@ -620,18 +502,9 @@ module.exports = function(grunt) {
 
     grunt.registerTask('release',
         'Create distribution zip file',
-        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules','generatePublishScript']);
-
-    grunt.registerTask('pack-modules',
-        'Create module pack files for release',
-        ['mkdir:release','npm-command']);
-
+        ['build','clean:release','copy:release','chmod:release','compress:release']);
 
     grunt.registerTask('coverage',
         'Run Istanbul code test coverage task',
         ['build','mocha_istanbul:all']);
-
-    grunt.registerTask('docs',
-        'Generates API documentation',
-        ['jsdoc']);
 };

README.md

@@ -2,12 +2,12 @@
 
 http://nodered.org
 
-[![Build Status](https://travis-ci.org/node-red/node-red.svg?branch=master)](https://travis-ci.org/node-red/node-red)
+[![Build Status](https://travis-ci.org/node-red/node-red.svg)](https://travis-ci.org/node-red/node-red)
 [![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)
 
-Low-code programming for event-driven applications.
+A visual tool for wiring the Internet of Things.
 
-![Node-RED: Low-code programming for event-driven applications](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: A visual tool for wiring the Internet of Things](http://nodered.org/images/node-red-screenshot.png)
 
 ## Quick Start
 
@@ -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
 
@@ -44,6 +45,9 @@ If you want to run the latest code from git, here's how to get started:
 4. Run
 
         npm start
+   or
+
+        node red.js
 
 ## Contributing
 
@@ -56,7 +60,7 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena
 
 ## Authors
 
-Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
+Node-RED is a project of the [JS Foundation](http://js.foundation).
 
 It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
 
@@ -67,4 +71,4 @@ It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-t
 
 ## Copyright and license
 
-Copyright JS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).
+Copyright JS Foundation and other contributors, http://js.foundation under [the Apache 2.0 license](LICENSE).

SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.0.0   | :white_check_mark: |
-| 0.20.x  | :white_check_mark: |
-
-
-## Reporting a Vulnerability
-
-Please report any potential security issues to `team@nodered.org`. This will notify the core project team who will respond accordingly.

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

@@ -28,24 +28,14 @@ RED.comms = (function() {
 
     function connectWS() {
         active = true;
-        var wspath;
-
-        if (RED.settings.apiRootUrl) {
-            var m = /^(https?):\/\/(.*)$/.exec(RED.settings.apiRootUrl);
-            if (m) {
-                console.log(m);
-                wspath = "ws"+(m[1]==="https"?"s":"")+"://"+m[2]+"comms";
-            }
-        } else {
-            var path = location.hostname;
-            var port = location.port;
-            if (port.length !== 0) {
-                path = path+":"+port;
-            }
-            path = path+document.location.pathname;
-            path = path+(path.slice(-1) == "/"?"":"/")+"comms";
-            wspath = "ws"+(document.location.protocol=="https:"?"s":"")+"://"+path;
+        var path = location.hostname;
+        var port = location.port;
+        if (port.length !== 0) {
+            path = path+":"+port;
         }
+        path = path+document.location.pathname;
+        path = path+(path.slice(-1) == "/"?"":"/")+"comms";
+        path = "ws"+(document.location.protocol=="https:"?"s":"")+"://"+path;
 
         var auth_tokens = RED.settings.get("auth-tokens");
         pendingAuth = (auth_tokens!=null);
@@ -58,7 +48,7 @@ RED.comms = (function() {
             }
         }
 
-        ws = new WebSocket(wspath);
+        ws = new WebSocket(path);
         ws.onopen = function() {
             reconnectAttempts = 0;
             if (errornotification) {
@@ -75,39 +65,29 @@ RED.comms = (function() {
         }
         ws.onmessage = function(event) {
             var message = JSON.parse(event.data);
-            if (message.auth) {
-                if (pendingAuth) {
-                    if (message.auth === "ok") {
+            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 (message.auth === "fail") {
+                    } else if (msg.auth === "fail") {
                         // anything else is an error...
                         active = false;
                         RED.user.login({updateMenu:true},function() {
                             connectWS();
                         })
                     }
-                } else if (message.auth === "fail") {
-                    // Our current session has expired
-                    active = false;
-                    RED.user.login({updateMenu:true},function() {
-                        connectWS();
-                    })
                 }
-            } else {
-                // Otherwise, 'message' is an array of actual comms messages
-                for (var m = 0; m < message.length; m++) {
-                    var msg = message[m];
-                    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);
                                     }
                                 }
                             }
@@ -142,10 +122,10 @@ RED.comms = (function() {
                         connectWS();
                     } else {
                         var msg = RED._("notification.errors.lostConnectionReconnect",{time: connectCountdown})+' <a href="#">'+ RED._("notification.errors.lostConnectionTry")+'</a>';
-                        errornotification.update(msg,{silent:true});
-                        $(errornotification).find("a").on("click", function(e) {
+                        errornotification.update(msg);
+                        $(errornotification).find("a").click(function(e) {
                             e.preventDefault();
-                            errornotification.update(RED._("notification.errors.lostConnection"),{silent:true});
+                            errornotification.update(RED._("notification.errors.lostConnection"));
                             clearInterval(connectCountdownTimer);
                             connectWS();
                         })

editor/js/history.js

@@ -14,8 +14,7 @@
  * limitations under the License.
  **/
 RED.history = (function() {
-    var undoHistory = [];
-    var redoHistory = [];
+    var undo_history = [];
 
     function undoEvent(ev) {
         var i;
@@ -23,81 +22,52 @@ RED.history = (function() {
         var node;
         var subflow;
         var modifiedTabs = {};
-        var inverseEv;
         if (ev) {
             if (ev.t == 'multi') {
-                inverseEv = {
-                    t: 'multi',
-                    events: []
-                };
                 len = ev.events.length;
                 for (i=len-1;i>=0;i--) {
-                    var r = undoEvent(ev.events[i]);
-                    inverseEv.events.push(r);
+                    undoEvent(ev.events[i]);
                 }
             } else if (ev.t == 'replace') {
-                inverseEv = {
-                    t: 'replace',
-                    config: RED.nodes.createCompleteNodeSet(),
-                    changed: {},
-                    rev: RED.nodes.version()
-                };
                 RED.nodes.clear();
                 var imported = RED.nodes.import(ev.config);
                 imported[0].forEach(function(n) {
                     if (ev.changed[n.id]) {
                         n.changed = true;
-                        inverseEv.changed[n.id] = true;
                     }
                 })
 
                 RED.nodes.version(ev.rev);
             } else if (ev.t == 'add') {
-                inverseEv = {
-                    t: "delete",
-                };
                 if (ev.nodes) {
-                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         node = RED.nodes.node(ev.nodes[i]);
                         if (node.z) {
                             modifiedTabs[node.z] = true;
                         }
-                        inverseEv.nodes.push(node);
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
-                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
-                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.workspaces) {
-                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
-                        var workspaceOrder = RED.nodes.getWorkspaceOrder();
-                        ev.workspaces[i]._index = workspaceOrder.indexOf(ev.workspaces[i].id);
-                        inverseEv.workspaces.push(ev.workspaces[i]);
                         RED.nodes.removeWorkspace(ev.workspaces[i].id);
                         RED.workspaces.remove(ev.workspaces[i]);
                     }
                 }
                 if (ev.subflows) {
-                    inverseEv.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
-                        inverseEv.subflows.push(ev.subflows[i]);
                         RED.nodes.removeSubflow(ev.subflows[i]);
                         RED.workspaces.remove(ev.subflows[i]);
                     }
                 }
                 if (ev.subflow) {
-                    inverseEv.subflow = {};
                     if (ev.subflow.instances) {
-                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
-                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -113,32 +83,20 @@ RED.history = (function() {
                     }
                 }
                 if (ev.removedLinks) {
-                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
-                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
 
             } else if (ev.t == "delete") {
-                inverseEv = {
-                    t: "add"
-                };
                 if (ev.workspaces) {
-                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
-                        inverseEv.workspaces.push(ev.workspaces[i]);
-                        RED.nodes.addWorkspace(ev.workspaces[i],ev.workspaces[i]._index);
-                        RED.workspaces.add(ev.workspaces[i],undefined,ev.workspaces[i]._index);
-                        delete ev.workspaces[i]._index;
+                        RED.nodes.addWorkspace(ev.workspaces[i]);
+                        RED.workspaces.add(ev.workspaces[i]);
                     }
                 }
-                if (ev.subflows) {
-                    inverseEv.subflows = [];
-                    for (i=0;i<ev.subflows.length;i++) {
-                        inverseEv.subflows.push(ev.subflows[i]);
-                        RED.nodes.addSubflow(ev.subflows[i]);
-                    }
+                if (ev.subflow && ev.subflow.subflow) {
+                    RED.nodes.addSubflow(ev.subflow.subflow);
                 }
                 if (ev.subflowInputs && ev.subflowInputs.length > 0) {
                     subflow = RED.nodes.subflow(ev.subflowInputs[0].z);
@@ -164,23 +122,14 @@ RED.history = (function() {
                         });
                     }
                 }
-                if (ev.subflow) {
-                    inverseEv.subflow = {};
-                    if (ev.subflow.hasOwnProperty('instances')) {
-                        inverseEv.subflow.instances = [];
-                        ev.subflow.instances.forEach(function(n) {
-                            inverseEv.subflow.instances.push(n);
-                            var node = RED.nodes.node(n.id);
-                            if (node) {
-                                node.changed = n.changed;
-                                node.dirty = true;
-                            }
-                        });
-                    }
-                    if (ev.subflow.hasOwnProperty('status')) {
-                        subflow = RED.nodes.subflow(ev.subflow.id);
-                        subflow.status = ev.subflow.status;
-                    }
+                if (ev.subflow && ev.subflow.hasOwnProperty('instances')) {
+                    ev.subflow.instances.forEach(function(n) {
+                        var node = RED.nodes.node(n.id);
+                        if (node) {
+                            node.changed = n.changed;
+                            node.dirty = true;
+                        }
+                    });
                 }
                 if (subflow) {
                     RED.nodes.filterNodes({type:"subflow:"+subflow.id}).forEach(function(n) {
@@ -194,25 +143,14 @@ RED.history = (function() {
                     });
                 }
                 if (ev.nodes) {
-                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.add(ev.nodes[i]);
                         modifiedTabs[ev.nodes[i].z] = true;
-                        inverseEv.nodes.push(ev.nodes[i].id);
                     }
                 }
                 if (ev.links) {
-                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
-                        inverseEv.links.push(ev.links[i]);
-                    }
-                }
-                if (ev.createdLinks) {
-                    inverseEv.removedLinks = [];
-                    for (i=0;i<ev.createdLinks.length;i++) {
-                        inverseEv.removedLinks.push(ev.createdLinks[i]);
-                        RED.nodes.removeLink(ev.createdLinks[i]);
                     }
                 }
                 if (ev.changes) {
@@ -232,14 +170,8 @@ RED.history = (function() {
 
                 }
             } else if (ev.t == "move") {
-                inverseEv = {
-                    t: 'move',
-                    nodes: []
-                };
                 for (i=0;i<ev.nodes.length;i++) {
                     var n = ev.nodes[i];
-                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
-                    inverseEv.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
                     n.n.dirty = true;
@@ -247,29 +179,19 @@ RED.history = (function() {
                 }
                 // A move could have caused a link splice
                 if (ev.links) {
-                    inverseEv.removedLinks = [];
                     for (i=0;i<ev.links.length;i++) {
-                        inverseEv.removedLinks.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.removedLinks) {
-                    inverseEv.links = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
-                        inverseEv.links.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
             } else if (ev.t == "edit") {
-                inverseEv = {
-                    t: "edit",
-                    changes: {}
-                };
-                inverseEv.node = ev.node;
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
-                        inverseEv.changes[i] = ev.node[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) {
@@ -283,34 +205,23 @@ RED.history = (function() {
                         ev.node[i] = ev.changes[i];
                     }
                 }
-                if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('disabled')) {
-                    $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!ev.node.disabled);
-                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
-                }
                 if (ev.subflow) {
-                    inverseEv.subflow = {};
                     if (ev.subflow.hasOwnProperty('inputCount')) {
-                        inverseEv.subflow.inputCount = ev.node.in.length;
                         if (ev.node.in.length > ev.subflow.inputCount) {
-                            inverseEv.subflow.inputs = ev.node.in.slice(ev.subflow.inputCount);
                             ev.node.in.splice(ev.subflow.inputCount);
                         } else if (ev.subflow.inputs.length > 0) {
                             ev.node.in = ev.node.in.concat(ev.subflow.inputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('outputCount')) {
-                        inverseEv.subflow.outputCount = ev.node.out.length;
                         if (ev.node.out.length > ev.subflow.outputCount) {
-                            inverseEv.subflow.outputs = ev.node.out.slice(ev.subflow.outputCount);
                             ev.node.out.splice(ev.subflow.outputCount);
                         } else if (ev.subflow.outputs.length > 0) {
                             ev.node.out = ev.node.out.concat(ev.subflow.outputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('instances')) {
-                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
-                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -318,27 +229,18 @@ RED.history = (function() {
                             }
                         });
                     }
-                    if (ev.subflow.hasOwnProperty('status')) {
-                        if (ev.subflow.status) {
-                            delete ev.node.status;
-                        }
-                    }
-                    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;
                     if (ev.outputMap) {
                         outputMap = {};
-                        inverseEv.outputMap = {};
                         for (var port in ev.outputMap) {
                             if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== "-1") {
                                 outputMap[ev.outputMap[port]] = port;
-                                inverseEv.outputMap[ev.outputMap[port]] = port;
                             }
                         }
                     }
@@ -346,112 +248,41 @@ RED.history = (function() {
                     RED.editor.validateNode(ev.node);
                 }
                 if (ev.links) {
-                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
-                        inverseEv.createdLinks.push(ev.links[i]);
-                    }
-                }
-                if (ev.createdLinks) {
-                    inverseEv.links = [];
-                    for (i=0;i<ev.createdLinks.length;i++) {
-                        RED.nodes.removeLink(ev.createdLinks[i]);
-                        inverseEv.links.push(ev.createdLinks[i]);
                     }
                 }
                 ev.node.dirty = true;
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
-                inverseEv = {
-                    t: "deleteSubflow",
-                    activeWorkspace: ev.activeWorkspace,
-                    dirty: RED.nodes.dirty()
-                };
                 if (ev.nodes) {
-                    inverseEv.movedNodes = [];
-                    var z = ev.activeWorkspace;
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
-                        n.x += ev.subflow.offsetX;
-                        n.y += ev.subflow.offsetY;
+                        n.z = ev.activeWorkspace;
                         n.dirty = true;
-                        inverseEv.movedNodes.push(n.id);
-                        RED.nodes.moveNodeToTab(n, z);
                     });
-                    inverseEv.subflows = [];
                     for (i=0;i<ev.nodes.length;i++) {
-                        inverseEv.subflows.push(RED.nodes.node(ev.nodes[i]));
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
-                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
-                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
 
-                inverseEv.subflow = ev.subflow;
                 RED.nodes.removeSubflow(ev.subflow.subflow);
                 RED.workspaces.remove(ev.subflow.subflow);
 
                 if (ev.removedLinks) {
-                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
-                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
-            } else if (ev.t == "deleteSubflow") {
-                inverseEv = {
-                    t: "createSubflow",
-                    activeWorkspace: ev.activeWorkspace,
-                    dirty: RED.nodes.dirty(),
-                };
-                if (ev.subflow) {
-                    RED.nodes.addSubflow(ev.subflow.subflow);
-                    inverseEv.subflow = ev.subflow;
-                }
-                if (ev.subflows) {
-                    inverseEv.nodes = [];
-                    for (i=0;i<ev.subflows.length;i++) {
-                        RED.nodes.add(ev.subflows[i]);
-                        inverseEv.nodes.push(ev.subflows[i].id);
-                    }
-                }
-                if (ev.movedNodes) {
-                    ev.movedNodes.forEach(function(nid) {
-                        nn = RED.nodes.node(nid);
-                        nn.x -= ev.subflow.offsetX;
-                        nn.y -= ev.subflow.offsetY;
-                        nn.dirty = true;
-                        RED.nodes.moveNodeToTab(nn, ev.subflow.subflow.id);
-                    });
-                }
-                if (ev.links) {
-                    inverseEv.links = [];
-                    for (i=0;i<ev.links.length;i++) {
-                        inverseEv.links.push(ev.links[i]);
-                        RED.nodes.addLink(ev.links[i]);
-                    }
-                }
-                if  (ev.createdLinks) {
-                    inverseEv.removedLinks = [];
-                    for (i=0;i<ev.createdLinks.length;i++) {
-                        inverseEv.removedLinks.push(ev.createdLinks[i]);
-                        RED.nodes.removeLink(ev.createdLinks[i]);
-                    }
-                }
             } else if (ev.t == "reorder") {
-                inverseEv = {
-                    t: 'reorder',
-                    order: RED.nodes.getWorkspaceOrder()
-                };
                 if (ev.order) {
                     RED.workspaces.order(ev.order);
                 }
             }
-
             Object.keys(modifiedTabs).forEach(function(id) {
                 var subflow = RED.nodes.subflow(id);
                 if (subflow) {
@@ -460,14 +291,10 @@ RED.history = (function() {
             });
 
             RED.nodes.dirty(ev.dirty);
-            RED.view.select(null);
             RED.view.redraw(true);
             RED.palette.refresh();
             RED.workspaces.refresh();
             RED.sidebar.config.refresh();
-            RED.subflow.refresh();
-
-            return inverseEv;
         }
 
     }
@@ -475,42 +302,28 @@ RED.history = (function() {
     return {
         //TODO: this function is a placeholder until there is a 'save' event that can be listened to
         markAllDirty: function() {
-            for (var i=0;i<undoHistory.length;i++) {
-                undoHistory[i].dirty = true;
+            for (var i=0;i<undo_history.length;i++) {
+                undo_history[i].dirty = true;
             }
         },
         list: function() {
-            return undoHistory;
+            return undo_history
         },
         depth: function() {
-            return undoHistory.length;
+            return undo_history.length;
         },
         push: function(ev) {
-            undoHistory.push(ev);
-            redoHistory = [];
+            undo_history.push(ev);
         },
         pop: function() {
-            var ev = undoHistory.pop();
-            var rev = undoEvent(ev);
-            if (rev) {
-                redoHistory.push(rev);
-            }
+            var ev = undo_history.pop();
+            undoEvent(ev);
         },
         peek: function() {
-            return undoHistory[undoHistory.length-1];
+            return undo_history[undo_history.length-1];
         },
         clear: function() {
-            undoHistory = [];
-            redoHistory = [];
-        },
-        redo: function() {
-            var ev = redoHistory.pop();
-            if (ev) {
-                var uev = undoEvent(ev);
-                if (uev) {
-                    undoHistory.push(uev);
-                }
-            }
+            undo_history = [];
         }
     }
 

editor/js/i18n.js

@@ -16,14 +16,10 @@
 
 RED.i18n = (function() {
 
-    var apiRootUrl;
-
     return {
-        init: function(options, done) {
-            apiRootUrl = options.apiRootUrl||"";
-            var preferredLanguage = localStorage.getItem("editor-language");
-            var opts = {
-                resGetPath: apiRootUrl+'locales/__ns__?lng=__lng__',
+        init: function(done) {
+            i18n.init({
+                resGetPath: 'locales/__ns__?lng=__lng__',
                 dynamicLoad: false,
                 load:'current',
                 ns: {
@@ -31,40 +27,17 @@ RED.i18n = (function() {
                     defaultNs: "editor"
                 },
                 fallbackLng: ['en-US'],
-                useCookie: false,
-                returnObjectTrees: true
-            };
-            if (preferredLanguage) {
-                opts.lng = preferredLanguage;
-            }
-            i18n.init(opts,function() {
+                useCookie: false
+            },function() {
                 done();
             });
             RED["_"] = function() {
-                var v = i18n.t.apply(null,arguments);
-                if (typeof v === 'string') {
-                    return v;
-                } else {
-                    return arguments[0];
-                }
+                return i18n.t.apply(null,arguments);
             }
 
         },
-        lang: function() {
-            // Gets the active message catalog language. This is based on what
-            // locale the editor is using and what languages are available.
-            //
-            var preferredLangs = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
-            var knownLangs = RED.settings.theme("languages")||["en-US"];
-            for (var i=0;i<preferredLangs.length;i++) {
-                if (knownLangs.indexOf(preferredLangs[i]) > -1) {
-                    return preferredLangs[i]
-                }
-            }
-            return 'end-US'
-        },
-        loadNodeCatalog: function(namespace,done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+        loadCatalog: function(namespace,done) {
+            var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
             var toLoad = languageList.length;
             languageList.forEach(function(lang) {
                 $.ajax({
@@ -72,7 +45,7 @@ RED.i18n = (function() {
                         "Accept":"application/json"
                     },
                     cache: false,
-                    url: apiRootUrl+'nodes/'+namespace+'/messages?lng='+lang,
+                    url: 'locales/'+namespace+'?lng='+lang,
                     success: function(data) {
                         i18n.addResourceBundle(lang,namespace,data);
                         toLoad--;
@@ -86,7 +59,7 @@ RED.i18n = (function() {
         },
 
         loadNodeCatalogs: function(done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
             var toLoad = languageList.length;
 
             languageList.forEach(function(lang) {
@@ -95,7 +68,7 @@ RED.i18n = (function() {
                         "Accept":"application/json"
                     },
                     cache: false,
-                    url: apiRootUrl+'nodes/messages?lng='+lang,
+                    url: 'locales/nodes?lng='+lang,
                     success: function(data) {
                         var namespaces = Object.keys(data);
                         namespaces.forEach(function(ns) {

editor/js/keymap.json

@@ -1,39 +1,25 @@
 {
     "*": {
-        "alt-shift-p":"core:manage-palette",
+        "ctrl-shift-p":"core:manage-palette",
         "ctrl-f": "core:search",
-        "ctrl-shift-f": "core:list-flows",
         "ctrl-=": "core:zoom-in",
         "ctrl--": "core:zoom-out",
         "ctrl-0": "core:zoom-reset",
         "ctrl-enter": "core:confirm-edit-tray",
         "ctrl-escape": "core:cancel-edit-tray",
-        "ctrl-d": "core:deploy-flows",
         "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-p": "core:toggle-palette",
         "ctrl-,": "core:show-user-settings",
-        "ctrl-alt-l": "core:clear-debug-messages",
-        "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-shift-l": "core:show-event-log",
-        "ctrl-shift-p":"core:show-action-list"
+        "ctrl-g v": "core:show-version-control-tab"
     },
-    "red-ui-sidebar-node-config": {
-        "backspace": "core:delete-config-selection",
-        "delete": "core:delete-config-selection",
-        "ctrl-a": "core:select-all-config-nodes",
-        "ctrl-z": "core:undo",
-        "ctrl-y": "core:redo"
-    },
-    "red-ui-workspace": {
+    "workspace": {
         "backspace": "core:delete-selection",
         "delete": "core:delete-selection",
         "enter": "core:edit-selected-node",
@@ -41,7 +27,6 @@
         "ctrl-x": "core:cut-selection-to-internal-clipboard",
         "ctrl-v": "core:paste-from-internal-clipboard",
         "ctrl-z": "core:undo",
-        "ctrl-y": "core:redo",
         "ctrl-a": "core:select-all-nodes",
         "shift-?": "core:show-help",
         "up": "core:move-selection-up",

editor/js/main.js

@@ -13,66 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var RED = (function() {
-
-    function appendNodeConfig(nodeConfig,done) {
-        done = done || function(){};
-        var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
-        var moduleId;
-        if (m) {
-            moduleId = m[1];
-        } else {
-            moduleId = "unknown";
-        }
-        try {
-            var hasDeferred = false;
-
-            var nodeConfigEls = $("<div>"+nodeConfig+"</div>");
-            var scripts = nodeConfigEls.find("script");
-            var scriptCount = scripts.length;
-            scripts.each(function(i,el) {
-                var srcUrl = $(el).attr('src');
-                if (srcUrl && !/^\s*(https?:|\/|\.)/.test(srcUrl)) {
-                    $(el).remove();
-                    var newScript = document.createElement("script");
-                    newScript.onload = function() {
-                        scriptCount--;
-                        if (scriptCount === 0) {
-                            $("#red-ui-editor-node-configs").append(nodeConfigEls);
-                            done()
-                        }
-                    }
-                    if ($(el).attr('type') === "module") {
-                        newScript.type = "module";
-                    }
-                    $("#red-ui-editor-node-configs").append(newScript);
-                    newScript.src = RED.settings.apiRootUrl+srcUrl;
-                    hasDeferred = true;
-                } else {
-                    if (/\/ace.js$/.test(srcUrl) || /\/ext-language_tools.js$/.test(srcUrl)) {
-                        // Block any attempts to load ace.js from a CDN - this will
-                        // break the version of ace included in the editor.
-                        // At the time of commit, the contrib-python nodes did this.
-                        // This is a crude fix until the python nodes are fixed.
-                        console.warn("Blocked attempt to load",srcUrl,"by",moduleId)
-                        $(el).remove();
-                    }
-                    scriptCount--;
-                }
-            })
-            if (!hasDeferred) {
-                $("#red-ui-editor-node-configs").append(nodeConfigEls);
-                done();
-            }
-        } catch(err) {
-            RED.notify(RED._("notification.errors.failedToAppendNode",{module:moduleId, error:err.toString()}),{
-                type: "error",
-                timeout: 10000
-            });
-            console.log("["+moduleId+"] "+err.toString());
-            done();
-        }
-    }
+(function() {
 
     function loadNodeList() {
         $.ajax({
@@ -107,51 +48,39 @@ var RED = (function() {
     }
 
     function loadNodes() {
-        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
-
         $.ajax({
             headers: {
-                "Accept":"text/html",
-                "Accept-Language": lang
+                "Accept":"text/html"
             },
             cache: false,
             url: 'nodes',
             success: function(data) {
-                var configs = data.trim().split(/(?=<!-- --- \[red-module:\S+\] --- -->)/);
-                var stepConfig = function() {
-                    if (configs.length === 0) {
-                        $("#red-ui-editor").i18n();
-                        $("#red-ui-palette > .red-ui-palette-spinner").hide();
-                        $(".red-ui-palette-scroll").removeClass("hide");
-                        $("#red-ui-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();
+                $("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);
+                                if (activeProject === false) {
+                                    // User previously decline the migration to projects.
+                                } else { // null/undefined
+                                    RED.projects.showStartup();
+                                }
                             }
+                            completeLoad();
                         });
                     } else {
-                        var config = configs.shift();
-                        appendNodeConfig(config,stepConfig);
+                        // Projects disabled by the user
+                        RED.sidebar.info.refresh()
+                        completeLoad();
                     }
-                }
-                stepConfig();
+                });
             }
         });
     }
@@ -200,13 +129,12 @@ var RED = (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")
+                            "change-branch":"Change to local branch '"+project.git.branches.local+"'",
+                            "abort-merge":"Git merge aborted",
+                            "loaded":"Project '"+msg.project+"' loaded",
+                            "updated":"Project '"+msg.project+"' updated",
+                            "pull":"Project '"+msg.project+"' reloaded",
+                            "revert": "Project '"+msg.project+"' reloaded"
                         }[msg.action];
                         RED.notify("<p>"+message+"</p>");
                         RED.sidebar.info.refresh()
@@ -225,32 +153,23 @@ var RED = (function() {
                     id: notificationId
                 }
                 if (notificationId === "runtime-state") {
-                    if (msg.error === "safe-mode") {
-                        options.buttons = [
-                            {
-                                text: RED._("common.label.close"),
-                                click: function() {
-                                    persistentNotifications[notificationId].hideNotification();
-                                }
-                            }
-                        ]
-                    } else if (msg.error === "missing-types") {
-                        text+="<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                    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"),
+                                    text: "Manage project dependencies",
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.settings.show('deps');
                                     }
                                 }
                             ]
-                            // } else if (RED.settings.theme('palette.editable') !== false) {
+                        // } else if (RED.settings.theme('palette.editable') !== false) {
                         } else {
                             options.buttons = [
                                 {
-                                    text: RED._("common.label.close"),
+                                    text: "Close",
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
@@ -258,25 +177,13 @@ var RED = (function() {
                             ]
                         }
                     } 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.project.setupCredentials"),
-                                        click: function() {
-                                            persistentNotifications[notificationId].hideNotification();
-                                            RED.projects.showCredentialsPrompt();
-                                        }
-                                    }
-                                ]
-                            }
-                        } else {
+                        if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: RED._("common.label.close"),
+                                    text: "Setup credentials",
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
+                                        RED.projects.showCredentialsPrompt();
                                     }
                                 }
                             ]
@@ -285,19 +192,7 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: RED._("notification.project.setupProjectFiles"),
-                                    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.project.setupProjectFiles"),
+                                    text: "Setup project files",
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.showFilesPrompt();
@@ -309,13 +204,13 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: RED._("notification.project.no"),
+                                    text: "No thanks",
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
                                 },
                                 {
-                                    text: RED._("notification.project.createDefault"),
+                                    text: "Create default project files",
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.createDefaultFileSet();
@@ -323,20 +218,6 @@ var RED = (function() {
                                 }
                             ]
                         }
-                    } 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.project.mergeConflict"),
-                                    click: function() {
-                                        persistentNotifications[notificationId].hideNotification();
-                                        RED.sidebar.versionControl.showLocalChanges();
-                                    }
-                                }
-                            ]
-                        }
                     }
                 }
                 if (!persistentNotifications.hasOwnProperty(notificationId)) {
@@ -353,11 +234,12 @@ var RED = (function() {
             var parts = topic.split("/");
             var node = RED.nodes.node(parts[1]);
             if (node) {
-                if (msg.hasOwnProperty("text") && /^[a-zA-Z]/.test(msg.text)) {
-                    msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
+                if (msg.hasOwnProperty("text")) {
+                    if (msg.text[0] !== ".") {
+                        msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
+                    }
                 }
                 node.status = msg;
-                node.dirtyStatus = true;
                 node.dirty = true;
                 RED.view.redraw();
             }
@@ -372,9 +254,9 @@ var RED = (function() {
                     var id = m.id;
                     RED.nodes.addNodeSet(m);
                     addedTypes = addedTypes.concat(m.types);
-                    RED.i18n.loadNodeCatalog(id, function() {
+                    RED.i18n.loadCatalog(id, function() {
                         $.get('nodes/'+id, function(data) {
-                            appendNodeConfig(data);
+                            $("body").append(data);
                         });
                     });
                 });
@@ -402,7 +284,7 @@ var RED = (function() {
                         RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
                     } else {
                         $.get('nodes/'+msg.id, function(data) {
-                            appendNodeConfig(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");
                         });
@@ -414,53 +296,60 @@ var RED = (function() {
                     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 == "notification/node/upgraded") {
+            } 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();
         });
-        RED.comms.subscribe("event-log/#", function(topic,payload) {
-            var id = topic.substring(9);
-            RED.eventLog.log(id,payload);
-        });
     }
 
     function showAbout() {
         $.get('red/about', function(data) {
             var aboutHeader = '<div style="text-align:center;">'+
-            '<img width="50px" src="red/images/node-red-icon.svg" />'+
-            '</div>';
+                                '<img width="50px" src="red/images/node-red-icon.svg" />'+
+                              '</div>';
 
             RED.sidebar.info.set(aboutHeader+marked(data));
             RED.sidebar.info.show();
         });
     }
 
-    function buildMainMenu() {
+    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-projects-menu",label:"Projects",options:[
+                {id:"menu-item-projects-new",label:"New...",disabled:false,onselect:"core:new-project"},
+                {id:"menu-item-projects-open",label:"Open...",disabled:false,onselect:"core:open-project"}
             ]});
         }
+
+
         menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
-            {id:"menu-item-palette",label:RED._("menu.label.palette.show"),toggle:true,onselect:"core:toggle-palette", selected: true},
+            // {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"},
+            // {id:"menu-item-status",setting:"node-show-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:"core:toggle-status", selected: true},
+            //null,
+            // {id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
+            //     {id:"menu-item-bidi-default",toggle:"text-direction",label:RED._("menu.label.view.defaultDir"),selected: true, onselect:function(s) { if(s){RED.text.bidi.setTextDirection("")}}},
+            //     {id:"menu-item-bidi-ltr",toggle:"text-direction",label:RED._("menu.label.view.ltr"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("ltr")}}},
+            //     {id:"menu-item-bidi-rtl",toggle:"text-direction",label:RED._("menu.label.view.rtl"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("rtl")}}},
+            //     {id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
+            // ]},
+            // null,
             {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:"core:toggle-sidebar", selected: true},
-            {id:"menu-item-event-log",label:RED._("eventLog.title"),onselect:"core:show-event-log"},
-            {id:"menu-item-action-list",label:RED._("keyboard.actionList"),onselect:"core:show-action-list"},
             null
         ]});
         menuOptions.push(null);
-        if (RED.settings.theme("menu.menu-item-import-library", true)) {
-            menuOptions.push({id: "menu-item-import", label: RED._("menu.label.import"), onselect: "core:show-import-dialog"});
-        }
-        if (RED.settings.theme("menu.menu-item-export-library", true)) {
-            menuOptions.push({id: "menu-item-export", label: RED._("menu.label.export"), onselect: "core:show-export-dialog"});
-        }
+        menuOptions.push({id:"menu-item-import",label:RED._("menu.label.import"),options:[
+            {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-import-dialog"},
+            {id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
+        ]});
+        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),disabled:true,options:[
+            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:"core:show-export-dialog"},
+            {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:"core:library-export"}
+        ]});
         menuOptions.push(null);
         menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:"core:search"});
         menuOptions.push(null);
@@ -483,9 +372,7 @@ var RED = (function() {
         menuOptions.push({id:"menu-item-user-settings",label:RED._("menu.label.settings"),onselect:"core:show-user-settings"});
         menuOptions.push(null);
 
-        if (RED.settings.theme("menu.menu-item-keyboard-shortcuts", true)) {
-            menuOptions.push({id: "menu-item-keyboard-shortcuts", label: RED._("menu.label.keyboardShortcuts"), onselect: "core:show-help"});
-        }
+        menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:"core:show-help"});
         menuOptions.push({id:"menu-item-help",
             label: RED.settings.theme("menu.menu-item-help.label",RED._("menu.label.help")),
             href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
@@ -493,24 +380,12 @@ var RED = (function() {
         menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: "core:show-about" });
 
 
-        $('<li><a id="red-ui-header-button-sidemenu" class="button" href="#"><i class="fa fa-bars"></i></a></li>').appendTo(".red-ui-header-toolbar")
-        RED.menu.init({id:"red-ui-header-button-sidemenu",options: menuOptions});
-
-    }
-
-    function loadEditor() {
-
-        RED.workspaces.init();
-        RED.statusBar.init();
         RED.view.init();
         RED.userSettings.init();
         RED.user.init();
-        RED.notifications.init();
         RED.library.init();
         RED.keyboard.init();
         RED.palette.init();
-        RED.eventLog.init();
-
         if (RED.settings.theme('palette.editable') !== false) {
             RED.palette.editor.init();
         } else {
@@ -526,80 +401,37 @@ var RED = (function() {
         }
 
         RED.subflow.init();
+        RED.workspaces.init();
         RED.clipboard.init();
         RED.search.init();
-        RED.actionList.init();
         RED.editor.init();
         RED.diff.init();
 
+        RED.menu.init({id:"btn-sidemenu",options: menuOptions});
 
         RED.deploy.init(RED.settings.theme("deployButton",null));
+        RED.notifications.init();
 
-        buildMainMenu();
-
+        RED.actions.add("core:show-about", showAbout);
         RED.nodes.init();
         RED.comms.connect();
 
-        $("#red-ui-main-container").show();
-        $(".red-ui-header-toolbar").show();
-
-        RED.actions.add("core:show-about", showAbout);
+        $("#main-container").show();
+        $(".header-toolbar").show();
 
         loadNodeList();
     }
 
-    function buildEditor(options) {
-        var header = $('<div id="red-ui-header"></div>').appendTo(options.target);
-        var logo = $('<span class="red-ui-header-logo"></span>').appendTo(header);
-        $('<ul class="red-ui-header-toolbar hide"></ul>').appendTo(header);
-        $('<div id="red-ui-header-shade" class="hide"></div>').appendTo(header);
-        $('<div id="red-ui-main-container" class="red-ui-sidebar-closed hide">'+
-            '<div id="red-ui-workspace"></div>'+
-            '<div id="red-ui-editor-stack"></div>'+
-            '<div id="red-ui-palette"></div>'+
-            '<div id="red-ui-sidebar"></div>'+
-            '<div id="red-ui-sidebar-separator"></div>'+
-        '</div>').appendTo(options.target);
-        $('<div id="red-ui-editor-node-configs"></div>').appendTo(options.target);
-        $('<div id="red-ui-full-shade" class="hide"></div>').appendTo(options.target);
-        $.getJSON(options.apiRootUrl+"theme", function(theme) {
-            if (theme.header) {
-                if (theme.header.url) {
-                    logo = $("<a>",{href:theme.header.url}).appendTo(logo);
-                }
-                if (theme.header.image) {
-                    $('<img>',{src:theme.header.image}).appendTo(logo);
-                }
-                if (theme.header.title) {
-                    $('<span>').html(theme.header.title).appendTo(logo);
-                }
-            }
-        });
-    }
+    $(function() {
 
-    var initialised = false;
-
-    function init(options) {
-        if (initialised) {
-            throw new Error("RED already initialised");
+        if ((window.location.hostname !== "localhost") && (window.location.hostname !== "127.0.0.1")) {
+            document.title = document.title+" : "+window.location.hostname;
         }
-        initialised = true;
+
         ace.require("ace/ext/language_tools");
-        options = options || {};
-        options.apiRootUrl = options.apiRootUrl || "";
-        if (options.apiRootUrl && !/\/$/.test(options.apiRootUrl)) {
-            options.apiRootUrl = options.apiRootUrl+"/";
-        }
-        options.target = $("#red-ui-editor");
-        options.target.addClass("red-ui-editor");
 
-        buildEditor(options);
-        RED.i18n.init(options, function() {
-            RED.settings.init(options, loadEditor);
+        RED.i18n.init(function() {
+            RED.settings.init(loadEditor);
         })
-    }
-
-    return {
-        init: init
-    }
+    });
 })();

editor/js/nodes.js

@@ -17,8 +17,6 @@ RED.nodes = (function() {
 
     var node_defs = {};
     var nodes = [];
-    var nodeTabMap = {};
-
     var configNodes = {};
     var links = [];
     var defaultWorkspace;
@@ -135,7 +133,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;
@@ -176,7 +174,6 @@ RED.nodes = (function() {
             },
             setIconSets: function(sets) {
                 iconSets = sets;
-                iconSets["font-awesome"] = RED.nodes.fontAwesome.getIconList();
             },
             getIconSets: function() {
                 return iconSets;
@@ -215,11 +212,6 @@ RED.nodes = (function() {
                 n.i = nextId+1;
             }
             nodes.push(n);
-            if (nodeTabMap[n.z]) {
-                nodeTabMap[n.z][n.id] = n;
-            } else {
-                console.warn("Node added to unknown tab/subflow:",n);
-            }
         }
         RED.events.emit('nodes:add',n);
     }
@@ -253,9 +245,6 @@ RED.nodes = (function() {
             node = getNode(id);
             if (node) {
                 nodes.splice(nodes.indexOf(node),1);
-                if (nodeTabMap[node.z]) {
-                    delete nodeTabMap[node.z][node.id];
-                }
                 removedLinks = links.filter(function(l) { return (l.source === node) || (l.target === node); });
                 removedLinks.forEach(function(l) {links.splice(links.indexOf(l), 1); });
                 var updatedConfigNode = false;
@@ -301,17 +290,6 @@ RED.nodes = (function() {
         return {links:removedLinks,nodes:removedNodes};
     }
 
-    function moveNodeToTab(node, z) {
-        if (nodeTabMap[node.z]) {
-            delete nodeTabMap[node.z][node.id];
-        }
-        if (!nodeTabMap[z]) {
-            nodeTabMap[z] = {};
-        }
-        nodeTabMap[z][node.id] = node;
-        node.z = z;
-    }
-
     function removeLink(l) {
         var index = links.indexOf(l);
         if (index != -1) {
@@ -319,23 +297,16 @@ RED.nodes = (function() {
         }
     }
 
-    function addWorkspace(ws,targetIndex) {
+    function addWorkspace(ws) {
         workspaces[ws.id] = ws;
-        nodeTabMap[ws.id] = {};
-
         ws._def = RED.nodes.getType('tab');
-        if (targetIndex === undefined) {
-            workspacesOrder.push(ws.id);
-        } else {
-            workspacesOrder.splice(targetIndex,0,ws.id);
-        }
+        workspacesOrder.push(ws.id);
     }
     function getWorkspace(id) {
         return workspaces[id];
     }
     function removeWorkspace(id) {
         delete workspaces[id];
-        delete nodeTabMap[id];
         workspacesOrder.splice(workspacesOrder.indexOf(id),1);
 
         var removedNodes = [];
@@ -381,33 +352,19 @@ RED.nodes = (function() {
             sf.name = subflowName;
         }
         subflows[sf.id] = sf;
-        nodeTabMap[sf.id] = {};
-
         RED.nodes.registerType("subflow:"+sf.id, {
-            defaults:{
-                name:{value:""},
-                env:{value:[]}
-            },
-            icon: function() { return sf.icon||"subflow.svg" },
-            category: sf.category || "subflows",
+            defaults:{name:{value:""}},
+            info: sf.info,
+            icon:"subflow.png",
+            category: "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
-            color: sf.color || "#DDAA99",
+            color: "#da9",
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
-            labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; },
+            labelStyle: function() { return this.name?"node_label_italic":""; },
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
             inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
             outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
-            oneditresize: function(size) {
-                // var rows = $(".dialog-form>div:not(.node-input-env-container-row)");
-                var height = size.height;
-                // for (var i=0; i<rows.size(); i++) {
-                //     height -= $(rows[i]).outerHeight(true);
-                // }
-                // var editorRow = $("#dialog-form>div.node-input-env-container-row");
-                // height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                $("ol.red-ui-editor-subflow-env-list").editableList('height',height);
-            },
             set:{
                 module: "node-red"
             }
@@ -419,7 +376,6 @@ RED.nodes = (function() {
     }
     function removeSubflow(sf) {
         delete subflows[sf.id];
-        delete nodeTabMap[sf.id];
         registry.removeNodeType("subflow:"+sf.id);
     }
 
@@ -490,9 +446,7 @@ RED.nodes = (function() {
         node.id = n.id;
         node.type = n.type;
         node.z = n.z;
-        if (n.d === true) {
-            node.d = true;
-        }
+
         if (node.type == "unknown") {
             for (var p in n._orig) {
                 if (n._orig.hasOwnProperty(p)) {
@@ -537,9 +491,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);
                 }
             }
 
@@ -555,15 +507,6 @@ RED.nodes = (function() {
                     node.icon = n.icon;
                 }
             }
-            if ((!n._def.defaults || !n._def.defaults.hasOwnProperty("l")) && n.hasOwnProperty('l')) {
-                var isLink = /^link (in|out)$/.test(node.type);
-                if (isLink == n.l) {
-                    node.l = n.l;
-                }
-            }
-        }
-        if (n.info) {
-            node.info = n.info;
         }
         return node;
     }
@@ -574,11 +517,8 @@ RED.nodes = (function() {
         node.type = n.type;
         node.name = n.name;
         node.info = n.info;
-        node.category = n.category;
         node.in = [];
         node.out = [];
-        node.env = n.env;
-        node.color = n.color;
 
         n.in.forEach(function(p) {
             var nIn = {x:p.x,y:p.y,wires:[]};
@@ -610,23 +550,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.svg") {
-                node.icon = n.icon;
-            }
-        }
-        if (n.status) {
-            node.status = {x: n.status.x, y: n.status.y, wires:[]};
-            links.forEach(function(d) {
-                if (d.target === n.status) {
-                    if (d.source.type != "subflow") {
-                        node.status.wires.push({id:d.source.id, port:d.sourcePort})
-                    } else {
-                        node.status.wires.push({id:n.id, port:0})
-                    }
-                }
-            });
-        }
+
 
         return node;
     }
@@ -709,39 +633,42 @@ RED.nodes = (function() {
     }
 
     function checkForMatchingSubflow(subflow,subflowNodes) {
-        subflowNodes = subflowNodes || [];
         var i;
         var match = null;
-        RED.nodes.eachSubflow(function(sf) {
-            if (sf.name != subflow.name ||
-                sf.info != subflow.info ||
-                sf.in.length != subflow.in.length ||
-                sf.out.length != subflow.out.length) {
+        try {
+            RED.nodes.eachSubflow(function(sf) {
+                if (sf.name != subflow.name ||
+                    sf.info != subflow.info ||
+                    sf.in.length != subflow.in.length ||
+                    sf.out.length != subflow.out.length) {
+                        return;
+                }
+                var sfNodes = RED.nodes.filterNodes({z:sf.id});
+                if (sfNodes.length != subflowNodes.length) {
                     return;
-            }
-            var sfNodes = RED.nodes.filterNodes({z:sf.id});
-            if (sfNodes.length != subflowNodes.length) {
-                return;
-            }
+                }
 
-            var subflowNodeSet = [subflow].concat(subflowNodes);
-            var sfNodeSet = [sf].concat(sfNodes);
+                var subflowNodeSet = [subflow].concat(subflowNodes);
+                var sfNodeSet = [sf].concat(sfNodes);
 
-            var exportableSubflowNodes = JSON.stringify(subflowNodeSet);
-            var exportableSFNodes = JSON.stringify(createExportableNodeSet(sfNodeSet));
-            var nodeMap = {};
-            for (i=0;i<sfNodes.length;i++) {
-                exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflowNodes[i].id+"\"","g"),'"'+sfNodes[i].id+'"');
-            }
-            exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflow.id+"\"","g"),'"'+sf.id+'"');
+                var exportableSubflowNodes = JSON.stringify(subflowNodeSet);
+                var exportableSFNodes = JSON.stringify(createExportableNodeSet(sfNodeSet));
+                var nodeMap = {};
+                for (i=0;i<sfNodes.length;i++) {
+                    exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflowNodes[i].id+"\"","g"),'"'+sfNodes[i].id+'"');
+                }
+                exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflow.id+"\"","g"),'"'+sf.id+'"');
 
-            if (exportableSubflowNodes !== exportableSFNodes) {
-                return;
-            }
+                if (exportableSubflowNodes !== exportableSFNodes) {
+                    return;
+                }
 
-            match = sf;
-            return false;
-        });
+                match = sf;
+                throw new Error();
+            });
+        } catch(err) {
+            console.log(err.stack);
+        }
         return match;
     }
     function compareNodes(nodeA,nodeB,idMustMatch) {
@@ -796,20 +723,6 @@ RED.nodes = (function() {
         if (!$.isArray(newNodes)) {
             newNodes = [newNodes];
         }
-
-        // Scan for any duplicate nodes and remove them. This is a temporary
-        // fix to help resolve corrupted flows caused by 0.20.0 where multiple
-        // copies of the flow would get loaded at the same time.
-        // If the user hit deploy they would have saved those duplicates.
-        var seenIds = {};
-        newNodes = newNodes.filter(function(n) {
-            if (seenIds[n.id]) {
-                return false;
-            }
-            seenIds[n.id] = true;
-            return true;
-        })
-
         var isInitialLoad = false;
         if (!initialLoad) {
             isInitialLoad = true;
@@ -835,7 +748,8 @@ RED.nodes = (function() {
         }
         if (!isInitialLoad && unknownTypes.length > 0) {
             var typeList = "<ul><li>"+unknownTypes.join("</li><li>")+"</li></ul>";
-            RED.notify("<p>"+RED._("clipboard.importUnrecognised",{count:unknownTypes.length})+"</p>"+typeList,"error",false,10000);
+            var type = "type"+(unknownTypes.length > 1?"s":"");
+            RED.notify("<strong>"+RED._("clipboard.importUnrecognised",{count:unknownTypes.length})+"</strong>"+typeList,"error",false,10000);
         }
 
         var activeWorkspace = RED.workspaces.active();
@@ -845,7 +759,7 @@ RED.nodes = (function() {
             var m = /^subflow:(.+)$/.exec(newNodes[i].type);
             if (m) {
                 var subflowId = m[1];
-                var parent = getSubflow(activeWorkspace);
+                var parent = getSubflow(newNodes[i].z || activeWorkspace);
                 if (parent) {
                     var err;
                     if (subflowId === parent.id) {
@@ -921,12 +835,6 @@ RED.nodes = (function() {
                         output.i = i;
                         output.id = getID();
                     });
-                    if (n.status) {
-                        n.status.type = "subflow";
-                        n.status.direction = "status";
-                        n.status.z = n.id;
-                        n.status.id = getID();
-                    }
                     new_subflows.push(n);
                     addSubflow(n,createNewIds);
                 }
@@ -989,17 +897,7 @@ RED.nodes = (function() {
                 }
 
                 if (!existingConfigNode || existingConfigNode._def.exclusive) { //} || !compareNodes(existingConfigNode,n,true) || existingConfigNode.z !== n.z) {
-                    configNode = {
-                        id:n.id,
-                        z:n.z,
-                        type:n.type,
-                        info: n.info,
-                        users:[],
-                        _config:{}
-                    };
-                    if (n.hasOwnProperty('d')) {
-                        configNode.d = n.d;
-                    }
+                    configNode = {id:n.id, z:n.z, type:n.type, users:[], _config:{}};
                     for (d in def.defaults) {
                         if (def.defaults.hasOwnProperty(d)) {
                             configNode[d] = n[d];
@@ -1034,24 +932,17 @@ RED.nodes = (function() {
                 def = registry.getNodeType(n.type);
                 if (!def || def.category != "config") {
                     var node = {
-                        x:parseFloat(n.x || 0),
-                        y:parseFloat(n.y || 0),
+                        x:n.x,
+                        y:n.y,
                         z:n.z,
                         type:0,
-                        wires:n.wires||[],
+                        wires:n.wires,
                         inputLabels: n.inputLabels,
                         outputLabels: n.outputLabels,
                         icon: n.icon,
-                        info: n.info,
                         changed:false,
                         _config:{}
                     };
-                    if (n.hasOwnProperty('l')) {
-                        node.l = n.l;
-                    }
-                    if (n.hasOwnProperty('d')) {
-                        node.d = n.d;
-                    }
                     if (createNewIds) {
                         if (subflow_blacklist[n.z]) {
                             continue;
@@ -1100,7 +991,6 @@ RED.nodes = (function() {
                         node.name = n.name;
                         node.outputs = subflow.out.length;
                         node.inputs = subflow.in.length;
-                        node.env = n.env;
                     } else {
                         if (!node._def) {
                             if (node.x && node.y) {
@@ -1108,7 +998,7 @@ RED.nodes = (function() {
                                     color:"#fee",
                                     defaults: {},
                                     label: "unknown: "+n.type,
-                                    labelStyle: "red-ui-flow-node-label-italic",
+                                    labelStyle: "node_label_italic",
                                     outputs: n.outputs||n.wires.length,
                                     set: registry.getNodeSet("node-red/unknown")
                                 }
@@ -1118,13 +1008,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) {
@@ -1137,31 +1020,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]);
                                 }
@@ -1181,9 +1043,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);
                     }
                 }
@@ -1194,7 +1054,6 @@ RED.nodes = (function() {
         var nodeTypeArrayReferences = {
             "catch":"scope",
             "status":"scope",
-            "complete": "scope",
             "link in":"links",
             "link out":"links"
         }
@@ -1273,19 +1132,6 @@ RED.nodes = (function() {
                 });
                 delete output.wires;
             });
-            if (n.status) {
-                n.status.wires.forEach(function(wire) {
-                    var link;
-                    if (subflow_map[wire.id] && subflow_map[wire.id].id == n.id) {
-                        link = {source:n.in[wire.port], sourcePort:wire.port,target:n.status};
-                    } else {
-                        link = {source:node_map[wire.id]||subflow_map[wire.id], sourcePort:wire.port,target:n.status};
-                    }
-                    addLink(link);
-                    new_links.push(link);
-                });
-                delete n.status.wires;
-            }
         }
 
         RED.workspaces.refresh();
@@ -1295,22 +1141,13 @@ RED.nodes = (function() {
     // TODO: supports filter.z|type
     function filterNodes(filter) {
         var result = [];
-        var searchSet = nodes;
-        var doZFilter = false;
-        if (filter.hasOwnProperty("z")) {
-            if (Object.hasOwnProperty("values") && nodeTabMap.hasOwnProperty(filter.z) ) {
-                searchSet = Object.values(nodeTabMap[filter.z]);
-            } else {
-                doZFilter = true;
-            }
-        }
 
-        for (var n=0;n<searchSet.length;n++) {
-            var node = searchSet[n];
-            if (filter.hasOwnProperty("type") && node.type !== filter.type) {
+        for (var n=0;n<nodes.length;n++) {
+            var node = nodes[n];
+            if (filter.hasOwnProperty("z") && node.z !== filter.z) {
                 continue;
             }
-            if (doZFilter && node.z !== filter.z) {
+            if (filter.hasOwnProperty("type") && node.type !== filter.type) {
                 continue;
             }
             result.push(node);
@@ -1377,7 +1214,6 @@ RED.nodes = (function() {
     function clear() {
         nodes = [];
         links = [];
-        nodeTabMap = {};
         configNodes = {};
         workspacesOrder = [];
         var subflowIds = Object.keys(subflows);
@@ -1413,23 +1249,21 @@ RED.nodes = (function() {
             RED.events.on("registry:node-type-added",function(type) {
                 var def = registry.getNodeType(type);
                 var replaced = false;
-                var replaceNodes = {};
+                var replaceNodes = [];
                 RED.nodes.eachNode(function(n) {
                     if (n.type === "unknown" && n.name === type) {
-                        replaceNodes[n.id] = n;
+                        replaceNodes.push(n);
                     }
                 });
                 RED.nodes.eachConfig(function(n) {
                     if (n.type === "unknown" && n.name === type) {
-                        replaceNodes[n.id] = n;
+                        replaceNodes.push(n);
                     }
                 });
 
-                var replaceNodeIds = Object.keys(replaceNodes);
-                if (replaceNodeIds.length > 0) {
+                if (replaceNodes.length > 0) {
                     var reimportList = [];
-                    replaceNodeIds.forEach(function(id) {
-                        var n = replaceNodes[id];
+                    replaceNodes.forEach(function(n) {
                         if (configNodes.hasOwnProperty(n.id)) {
                             delete configNodes[n.id];
                         } else {
@@ -1437,18 +1271,6 @@ RED.nodes = (function() {
                         }
                         reimportList.push(convertNode(n));
                     });
-
-                    // Remove any links between nodes that are going to be reimported.
-                    // This prevents a duplicate link from being added.
-                    var removeLinks = [];
-                    RED.nodes.eachLink(function(l) {
-                        if (replaceNodes.hasOwnProperty(l.source.id) && replaceNodes.hasOwnProperty(l.target.id)) {
-                            removeLinks.push(l);
-                        }
-                    });
-                    removeLinks.forEach(removeLink);
-
-
                     RED.view.redraw(true);
                     var result = importNodes(reimportList,false);
                     var newNodeMap = {};
@@ -1487,8 +1309,6 @@ RED.nodes = (function() {
         remove: removeNode,
         clear: clear,
 
-        moveNodeToTab: moveNodeToTab,
-
         addLink: addLink,
         removeLink: removeLink,
 
@@ -1505,41 +1325,31 @@ RED.nodes = (function() {
 
         eachNode: function(cb) {
             for (var n=0;n<nodes.length;n++) {
-                if (cb(nodes[n]) === false) {
-                    break;
-                }
+                cb(nodes[n]);
             }
         },
         eachLink: function(cb) {
             for (var l=0;l<links.length;l++) {
-                if (cb(links[l]) === false) {
-                    break;
-                }
+                cb(links[l]);
             }
         },
         eachConfig: function(cb) {
             for (var id in configNodes) {
                 if (configNodes.hasOwnProperty(id)) {
-                    if (cb(configNodes[id]) === false) {
-                        break;
-                    }
+                    cb(configNodes[id]);
                 }
             }
         },
         eachSubflow: function(cb) {
             for (var id in subflows) {
                 if (subflows.hasOwnProperty(id)) {
-                    if (cb(subflows[id]) === false) {
-                        break;
-                    }
+                    cb(subflows[id]);
                 }
             }
         },
         eachWorkspace: function(cb) {
             for (var i=0;i<workspacesOrder.length;i++) {
-                if (cb(workspaces[workspacesOrder[i]]) === false) {
-                    break;
-                }
+                cb(workspaces[workspacesOrder[i]]);
             }
         },
 

editor/js/red.js

@@ -13,5 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-module.exports = false
+var RED = {};

editor/js/settings.js

@@ -37,7 +37,7 @@ RED.settings = (function () {
         if (key === "auth-tokens") {
             localStorage.setItem(key, JSON.stringify(value));
         } else {
-            RED.utils.setMessageProperty(userSettings,key,value);
+            userSettings[key] = value;
             saveUserSettings();
         }
     };
@@ -46,25 +46,16 @@ RED.settings = (function () {
      * If the key is not set in the localStorage it returns <i>undefined</i>
      * Else return the JSON parsed value
      * @param key
-     * @param defaultIfUndefined
      * @returns {*}
      */
-    var get = function (key,defaultIfUndefined) {
+    var get = function (key) {
         if (!hasLocalStorage()) {
             return undefined;
         }
         if (key === "auth-tokens") {
             return JSON.parse(localStorage.getItem(key));
         } else {
-            try {
-                var v = RED.utils.getMessageProperty(userSettings,key);
-                if (v === undefined) {
-                    v = defaultIfUndefined;
-                }
-            } catch(err) {
-                v = defaultIfUndefined;
-            }
-            return v;
+            return userSettings[key];
         }
     };
 
@@ -98,22 +89,18 @@ RED.settings = (function () {
         userSettings = data;
     }
 
-    var init = function (options, done) {
+    var init = function (done) {
         var accessTokenMatch = /[?&]access_token=(.*?)(?:$|&)/.exec(window.location.search);
         if (accessTokenMatch) {
             var accessToken = accessTokenMatch[1];
             RED.settings.set("auth-tokens",{access_token: accessToken});
             window.location.search = "";
         }
-        RED.settings.apiRootUrl = options.apiRootUrl;
 
         $.ajaxSetup({
             beforeSend: function(jqXHR,settings) {
                 // Only attach auth header for requests to relative paths
                 if (!/^\s*(https?:|\/|\.)/.test(settings.url)) {
-                    if (options.apiRootUrl) {
-                        settings.url = options.apiRootUrl+settings.url;
-                    }
                     var auth_tokens = RED.settings.get("auth-tokens");
                     if (auth_tokens) {
                         jqXHR.setRequestHeader("Authorization","Bearer "+auth_tokens.access_token);
@@ -140,12 +127,6 @@ RED.settings = (function () {
                     RED.settings.remove("auth-tokens");
                 }
                 console.log("Node-RED: " + data.version);
-                console.groupCollapsed("Versions");
-                console.log("jQuery",$().jquery)
-                console.log("jQuery UI",$.ui.version);
-                console.log("ACE",ace.version);
-                console.log("D3",d3.version);
-                console.groupEnd();
                 loadUserSettings(done);
             },
             error: function(jqXHR,textStatus,errorThrown) {

editor/js/text/bidi.js

@@ -97,14 +97,14 @@ RED.text.bidi = (function() {
     }
 
     /**
-     * Enforces the text direction for all the spans with style red-ui-text-bidi-aware under
+     * Enforces the text direction for all the spans with style bidiAware under
      * workspace or sidebar div
      */
     function enforceTextDirectionOnPage() {
-        $("#red-ui-workspace").find('span.red-ui-text-bidi-aware').each(function() {
+        $("#workspace").find('span.bidiAware').each(function() {
             $(this).attr("dir", resolveBaseTextDir($(this).html()));
         });
-        $("#red-ui-sidebar").find('span.red-ui-text-bidi-aware').each(function() {
+        $("#sidebar").find('span.bidiAware').each(function() {
             $(this).attr("dir", resolveBaseTextDir($(this).text()));
         });
     }

editor/js/text/format.js

@@ -1242,7 +1242,7 @@ RED.text.format = (function() {
             element.dispatchEvent(event);
             return;
         }
-
+        
         var range = selection.getRangeAt(0);
         var tempRange = range.cloneRange(), startNode, startOffset;
         startNode = range.startContainer;
@@ -1304,7 +1304,7 @@ RED.text.format = (function() {
     }
 
     return {
-        /*!
+        /**
         * Returns the HTML representation of a given structured text
         * @param text - the structured text
         * @param type - could be one of filepath, url, email
@@ -1315,7 +1315,7 @@ RED.text.format = (function() {
         getHtml: function (text, type, args, isRtl, locale) {
             return getHandler(type).format(text, args, isRtl, true, locale);
         },
-        /*!
+        /**
         * Handle Structured text correct display for a given HTML element.
         * @param element - the element  : should be of type div contenteditable=true
         * @param type - could be one of filepath, url, email

editor/js/ui/actions.js

@@ -12,9 +12,9 @@ RED.actions = (function() {
     function getAction(name) {
         return actions[name];
     }
-    function invokeAction(name,args) {
+    function invokeAction(name) {
         if (actions.hasOwnProperty(name)) {
-            actions[name](args);
+            actions[name]();
         }
     }
     function listActions() {

editor/js/ui/clipboard.js

@@ -0,0 +1,380 @@
+/**
+ * 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.clipboard = (function() {
+
+    var dialog;
+    var dialogContainer;
+    var exportNodesDialog;
+    var importNodesDialog;
+    var disabled = false;
+
+    function setupDialogs() {
+        dialog = $('<div id="clipboard-dialog" class="hide node-red-dialog"><form class="dialog-form form-horizontal"></form></div>')
+            .appendTo("body")
+            .dialog({
+                modal: true,
+                autoOpen: false,
+                width: 500,
+                resizable: false,
+                buttons: [
+                    {
+                        id: "clipboard-dialog-cancel",
+                        text: RED._("common.label.cancel"),
+                        click: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-close",
+                        class: "primary",
+                        text: RED._("common.label.close"),
+                        click: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-copy",
+                        class: "primary",
+                        text: RED._("clipboard.export.copy"),
+                        click: function() {
+                            $("#clipboard-export").select();
+                            document.execCommand("copy");
+                            document.getSelection().removeAllRanges();
+                            RED.notify(RED._("clipboard.nodesExported"));
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-ok",
+                        class: "primary",
+                        text: RED._("common.label.import"),
+                        click: function() {
+                            RED.view.importNodes($("#clipboard-import").val(),$("#import-tab > a.selected").attr('id') === 'import-tab-new');
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                ],
+                open: function(e) {
+                    $(this).parent().find(".ui-dialog-titlebar-close").hide();
+                },
+                close: function(e) {
+                }
+            });
+
+        dialogContainer = dialog.children(".dialog-form");
+
+        exportNodesDialog =
+            '<div class="form-row">'+
+                '<label style="width:auto;margin-right: 10px;" data-i18n="clipboard.export.copy"></label>'+
+                '<span id="export-range-group" class="button-group">'+
+                    '<a id="export-range-selected" class="editor-button toggle" href="#" data-i18n="clipboard.export.selected"></a>'+
+                    '<a id="export-range-flow" class="editor-button toggle" href="#" data-i18n="clipboard.export.current"></a>'+
+                    '<a id="export-range-full" class="editor-button toggle" href="#" data-i18n="clipboard.export.all"></a>'+
+                '</span>'+
+                '</div>'+
+            '<div class="form-row">'+
+                '<textarea readonly style="resize: none; width: 100%; border-radius: 4px;font-family: monospace; font-size: 12px; background:#f3f3f3; padding-left: 0.5em; box-sizing:border-box;" id="clipboard-export" rows="5"></textarea>'+
+            '</div>'+
+            '<div class="form-row" style="text-align: right;">'+
+                '<span id="export-format-group" class="button-group">'+
+                    '<a id="export-format-mini" class="editor-button editor-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
+                    '<a id="export-format-full" class="editor-button editor-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
+                '</span>'+
+            '</div>';
+
+        importNodesDialog = '<div class="form-row">'+
+            '<textarea style="resize: none; width: 100%; border-radius: 0px;font-family: monospace; font-size: 12px; background:#eee; padding-left: 0.5em; box-sizing:border-box;" id="clipboard-import" rows="5" placeholder="'+
+            RED._("clipboard.pasteNodes")+
+            '"></textarea>'+
+            '</div>'+
+            '<div class="form-row">'+
+            '<label style="width:auto;margin-right: 10px;" data-i18n="clipboard.import.import"></label>'+
+            '<span id="import-tab" class="button-group">'+
+                '<a id="import-tab-current" class="editor-button toggle selected" href="#" data-i18n="clipboard.export.current"></a>'+
+                '<a id="import-tab-new" class="editor-button toggle" href="#" data-i18n="clipboard.import.newFlow"></a>'+
+            '</span>'+
+            '</div>';
+    }
+
+    function validateImport() {
+        var importInput = $("#clipboard-import");
+        var v = importInput.val();
+        v = v.substring(v.indexOf('['),v.lastIndexOf(']')+1);
+        try {
+            JSON.parse(v);
+            importInput.removeClass("input-error");
+            importInput.val(v);
+            $("#clipboard-dialog-ok").button("enable");
+        } catch(err) {
+            if (v !== "") {
+                importInput.addClass("input-error");
+            }
+            $("#clipboard-dialog-ok").button("disable");
+        }
+    }
+
+    function importNodes() {
+        if (disabled) {
+            return;
+        }
+        dialogContainer.empty();
+        dialogContainer.append($(importNodesDialog));
+        dialogContainer.i18n();
+
+        $("#clipboard-dialog-ok").show();
+        $("#clipboard-dialog-cancel").show();
+        $("#clipboard-dialog-close").hide();
+        $("#clipboard-dialog-copy").hide();
+        $("#clipboard-dialog-ok").button("disable");
+        $("#clipboard-import").keyup(validateImport);
+        $("#clipboard-import").on('paste',function() { setTimeout(validateImport,10)});
+
+        $("#import-tab > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+        });
+
+        dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
+    }
+
+    function exportNodes() {
+        if (disabled) {
+            return;
+        }
+
+        dialogContainer.empty();
+        dialogContainer.append($(exportNodesDialog));
+        dialogContainer.i18n();
+        var format = RED.settings.flowFilePretty ? "export-format-full" : "export-format-mini";
+
+        $("#export-format-group > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                $("#clipboard-export").focus();
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+
+            var flow = $("#clipboard-export").val();
+            if (flow.length > 0) {
+                var nodes = JSON.parse(flow);
+
+                format = $(this).attr('id');
+                if (format === 'export-format-full') {
+                    flow = JSON.stringify(nodes,null,4);
+                } else {
+                    flow = JSON.stringify(nodes);
+                }
+                $("#clipboard-export").val(flow);
+                $("#clipboard-export").focus();
+            }
+        });
+
+        $("#export-range-group > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                $("#clipboard-export").focus();
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+            var type = $(this).attr('id');
+            var flow = "";
+            var nodes = null;
+            if (type === 'export-range-selected') {
+                var selection = RED.view.selection();
+                // Don't include the subflow meta-port nodes in the exported selection
+                nodes = RED.nodes.createExportableNodeSet(selection.nodes.filter(function(n) { return n.type !== 'subflow'}));
+            } else if (type === 'export-range-flow') {
+                var activeWorkspace = RED.workspaces.active();
+                nodes = RED.nodes.filterNodes({z:activeWorkspace});
+                var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
+                nodes.unshift(parentNode);
+                nodes = RED.nodes.createExportableNodeSet(nodes);
+            } else if (type === 'export-range-full') {
+                nodes = RED.nodes.createCompleteNodeSet(false);
+            }
+            if (nodes !== null) {
+                if (format === "export-format-full") {
+                    flow = JSON.stringify(nodes,null,4);
+                } else {
+                    flow = JSON.stringify(nodes);
+                }
+            }
+            if (flow.length > 0) {
+                $("#export-copy").removeClass('disabled');
+            } else {
+                $("#export-copy").addClass('disabled');
+            }
+            $("#clipboard-export").val(flow);
+            $("#clipboard-export").focus();
+        })
+
+        $("#clipboard-dialog-ok").hide();
+        $("#clipboard-dialog-cancel").hide();
+        $("#clipboard-dialog-copy").hide();
+        $("#clipboard-dialog-close").hide();
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            $("#export-range-selected").click();
+        } else {
+            $("#export-range-selected").addClass('disabled').removeClass('selected');
+            $("#export-range-flow").click();
+        }
+        if (format === "export-format-full") {
+            $("#export-format-full").click();
+        } else {
+            $("#export-format-mini").click();
+        }
+        $("#clipboard-export")
+            .focus(function() {
+                var textarea = $(this);
+                textarea.select();
+                textarea.mouseup(function() {
+                    textarea.unbind("mouseup");
+                    return false;
+                })
+            });
+        dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
+
+        $("#clipboard-export").focus();
+        if (!document.queryCommandSupported("copy")) {
+            $("#clipboard-dialog-cancel").hide();
+            $("#clipboard-dialog-close").show();
+        } else {
+            $("#clipboard-dialog-cancel").show();
+            $("#clipboard-dialog-copy").show();
+        }
+    }
+
+    function hideDropTarget() {
+        $("#dropTarget").hide();
+        RED.keyboard.remove("escape");
+    }
+    function copyText(value,element,msg) {
+        var truncated = false;
+        if (typeof value !== "string" ) {
+            value = JSON.stringify(value, function(key,value) {
+                if (value !== null && typeof value === 'object') {
+                    if (value.__encoded__ && value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
+                        truncated = value.data.length !== value.length;
+                        return value.data;
+                    }
+                }
+                return value;
+            });
+        }
+        if (truncated) {
+            msg += "_truncated";
+        }
+        $("#clipboard-hidden").val(value).select();
+        var result =  document.execCommand("copy");
+        if (result && element) {
+            var popover = RED.popover.create({
+                target: element,
+                direction: 'left',
+                size: 'small',
+                content: RED._(msg)
+            });
+            setTimeout(function() {
+                popover.close();
+            },1000);
+            popover.open();
+        }
+        return result;
+    }
+    return {
+        init: function() {
+            setupDialogs();
+
+            $('<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);
+
+
+            RED.events.on("editor:open",function() { disabled = true; });
+            RED.events.on("editor:close",function() { disabled = false; });
+            RED.events.on("search:open",function() { disabled = true; });
+            RED.events.on("search:close",function() { disabled = false; });
+            RED.events.on("type-search:open",function() { disabled = true; });
+            RED.events.on("type-search:close",function() { disabled = false; });
+
+
+            $('#chart').on("dragenter",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                    $("#dropTarget").css({display:'table'});
+                    RED.keyboard.add("*", "escape" ,hideDropTarget);
+                }
+            });
+
+            $('#dropTarget').on("dragover",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                    event.preventDefault();
+                }
+            })
+            .on("dragleave",function(event) {
+                hideDropTarget();
+            })
+            .on("drop",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
+                    var data = event.originalEvent.dataTransfer.getData("text/plain");
+                    data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
+                    RED.view.importNodes(data);
+                } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                    var files = event.originalEvent.dataTransfer.files;
+                    if (files.length === 1) {
+                        var file = files[0];
+                        var reader = new FileReader();
+                        reader.onload = (function(theFile) {
+                            return function(e) {
+                                RED.view.importNodes(e.target.result);
+                            };
+                        })(file);
+                        reader.readAsText(file);
+                    }
+                }
+                hideDropTarget();
+                event.preventDefault();
+            });
+
+        },
+        import: importNodes,
+        export: exportNodes,
+        copyText: copyText
+    }
+})();

editor/js/ui/common/checkboxSet.js

@@ -38,7 +38,7 @@
                 this.options[0].show();
             }
 
-            this.element.on("change", function() {
+            this.element.change(function() {
                 if (this.checked) {
                     that.options[0].hide();
                     that.options[1].show();
@@ -53,7 +53,7 @@
                     child.checkboxSet('state',isChecked,false,true);
                 })
             })
-            this.uiElement.on("click", function(e) {
+            this.uiElement.click(function(e) {
                 e.stopPropagation();
                 // state returns null for a partial state. Clicking on that should
                 // result in false.

editor/js/ui/common/editableList.js

@@ -32,10 +32,7 @@
  *   - scrollOnAdd : boolean - whether to scroll to newly added items
  * methods:
  *   - addItem(itemData)
- *   - insertItemAt : function(data,index) - add an item at the specified index
  *   - removeItem(itemData)
- *   - getItemAt(index)
- *   - indexOf(itemData)
  *   - width(width)
  *   - height(height)
  *   - items()
@@ -78,9 +75,9 @@
                         addLabel = 'add';
                     }
                 }
-                $('<a href="#" class="red-ui-button red-ui-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 red-ui-editableList-addButton" style="margin-top: 4px;"><i class="fa fa-plus"></i> '+addLabel+'</a>')
                     .appendTo(this.topContainer)
-                    .on("click", function(evt) {
+                    .click(function(evt) {
                         evt.preventDefault();
                         that.addItem({});
                     });
@@ -188,11 +185,6 @@
             }
         },
         _destroy: function() {
-            if (this.topContainer) {
-                var tc = this.topContainer;
-                delete this.topContainer;
-                tc.remove();
-            }
         },
         _refreshFilter: function() {
             var that = this;
@@ -238,24 +230,7 @@
             this.uiHeight = desiredHeight;
             this._resize();
         },
-        getItemAt: function(index) {
-            var items = this.items();
-            if (index >= 0 && index < items.length) {
-                return $(items[index]).data('data');
-            } else {
-                return;
-            }
-        },
-        indexOf: function(data) {
-            var items = this.items();
-            for (var i=0;i<items.length;i++) {
-                if ($(items[i]).data('data') === data) {
-                    return i
-                }
-            }
-            return -1
-        },
-        insertItemAt: function(data,index) {
+        addItem: function(data) {
             var that = this;
             data = data || {};
             var li = $('<li>');
@@ -273,13 +248,7 @@
                 });
             }
             if (!added) {
-                if (index <= 0) {
-                    li.prependTo(this.element);
-                } else if (index > that.element.children().length-1) {
-                    li.appendTo(this.element);
-                } else {
-                    li.insertBefore(this.element.children().eq(index));
-                }
+                li.appendTo(this.element);
             }
             var row = $('<div/>').addClass("red-ui-editableList-item-content").appendTo(li);
             row.data('data',data);
@@ -288,10 +257,10 @@
                 li.addClass("red-ui-editableList-item-sortable");
             }
             if (this.options.removable) {
-                var deleteButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(li);
+                var deleteButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove editor-button editor-button-small"}).appendTo(li);
                 $('<i/>',{class:"fa fa-remove"}).appendTo(deleteButton);
                 li.addClass("red-ui-editableList-item-removable");
-                deleteButton.on("click", function(evt) {
+                deleteButton.click(function(evt) {
                     evt.preventDefault();
                     var data = row.data('data');
                     li.addClass("red-ui-editableList-item-deleting")
@@ -324,9 +293,6 @@
                 },0);
             }
         },
-        addItem: function(data) {
-            this.insertItemAt(data,this.element.children().length)
-        },
         addItems: function(items) {
             for (var i=0; i<items.length;i++) {
                 this.addItem(items[i]);
@@ -346,7 +312,6 @@
         },
         empty: function() {
             this.element.empty();
-            this.uiContainer.scrollTop(0);
         },
         filter: function(filter) {
             if (filter !== undefined) {
@@ -362,22 +327,6 @@
         },
         length: function() {
             return this.element.children().length;
-        },
-        show: function(item) {
-            var items = this.element.children().filter(function(f) {
-                return item === $(this).find(".red-ui-editableList-item-content").data('data');
-            });
-            if (items.length > 0) {
-                this.uiContainer.scrollTop(this.uiContainer.scrollTop()+items.position().top)
-            }
-        },
-        getItem: function(li) {
-            var el = li.find(".red-ui-editableList-item-content");
-            if (el.length) {
-                return el.data('data');
-            } else {
-                return null;
-            }
         }
     });
 })(jQuery);

editor/js/ui/common/menu.js

@@ -56,12 +56,12 @@ RED.menu = (function() {
         }
 
         if (opt === null) {
-            item = $('<li class="red-ui-menu-divider"></li>');
+            item = $('<li class="divider"></li>');
         } else {
             item = $('<li></li>');
 
             if (opt.group) {
-                item.addClass("red-ui-menu-group-"+opt.group);
+                item.addClass("menu-group-"+opt.group);
 
             }
             var linkContent = '<a '+(opt.id?'id="'+opt.id+'" ':'')+'tabindex="-1" href="#">';
@@ -71,7 +71,7 @@ RED.menu = (function() {
 
             }
             if (opt.icon !== undefined) {
-                if (/\.(png|svg)/.test(opt.icon)) {
+                if (/\.png/.test(opt.icon)) {
                     linkContent += '<img src="'+opt.icon+'"/> ';
                 } else {
                     linkContent += '<i class="'+(opt.icon?opt.icon:'" style="display: inline-block;"')+'"></i> ';
@@ -79,10 +79,10 @@ RED.menu = (function() {
             }
 
             if (opt.sublabel) {
-                linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+opt.label+'</span>'+
-                               '<span class="red-ui-menu-sublabel">'+opt.sublabel+'</span></span>'
+                linkContent += '<span class="menu-label-container"><span class="menu-label">'+opt.label+'</span>'+
+                               '<span class="menu-sublabel">'+opt.sublabel+'</span></span>'
             } else {
-                linkContent += '<span class="red-ui-menu-label">'+opt.label+'</span>'
+                linkContent += '<span class="menu-label">'+opt.label+'</span>'
             }
 
             linkContent += '</a>';
@@ -92,16 +92,27 @@ RED.menu = (function() {
             menuItems[opt.id] = opt;
 
             if (opt.onselect) {
-                link.on("click", function(e) {
+                link.click(function(e) {
                     e.preventDefault();
                     if ($(this).parent().hasClass("disabled")) {
                         return;
                     }
                     if (opt.toggle) {
-                        if (opt.toggle === true) {
-                            setSelected(opt.id, !isSelected(opt.id));
+                        var selected = isSelected(opt.id);
+                        if (typeof opt.toggle === "string") {
+                            if (!selected) {
+                                for (var m in menuItems) {
+                                    if (menuItems.hasOwnProperty(m)) {
+                                        var mi = menuItems[m];
+                                        if (mi.id != opt.id && opt.toggle == mi.toggle) {
+                                            setSelected(mi.id,false);
+                                        }
+                                    }
+                                }
+                                setSelected(opt.id,true);
+                            }
                         } else {
-                            setSelected(opt.id, true);
+                            setSelected(opt.id, !selected);
                         }
                     } else {
                         triggerAction(opt.id);
@@ -114,13 +125,13 @@ RED.menu = (function() {
                 link.attr("target","_blank").attr("href",opt.href);
             } else if (!opt.options) {
                 item.addClass("disabled");
-                link.on("click", function(event) {
+                link.click(function(event) {
                     event.preventDefault();
                 });
             }
             if (opt.options) {
-                item.addClass("red-ui-menu-dropdown-submenu pull-left");
-                var submenu = $('<ul id="'+opt.id+'-submenu" class="red-ui-menu-dropdown"></ul>').appendTo(item);
+                item.addClass("dropdown-submenu pull-left");
+                var submenu = $('<ul id="'+opt.id+'-submenu" class="dropdown-menu"></ul>').appendTo(item);
 
                 for (var i=0;i<opt.options.length;i++) {
                     var li = createMenuItem(opt.options[i]);
@@ -139,30 +150,13 @@ RED.menu = (function() {
 
     }
     function createMenu(options) {
-        var topMenu = $("<ul/>",{class:"red-ui-menu red-ui-menu-dropdown pull-right"});
 
-        if (options.id) {
-            topMenu.attr({id:options.id+"-submenu"});
-            var menuParent = $("#"+options.id);
-            if (menuParent.length === 1) {
-                topMenu.insertAfter(menuParent);
-                menuParent.on("click", function(evt) {
-                    evt.stopPropagation();
-                    evt.preventDefault();
-                    if (topMenu.is(":visible")) {
-                        $(document).off("click.red-ui-menu");
-                        topMenu.hide();
-                    } else {
-                        $(document).on("click.red-ui-menu", function(evt) {
-                            $(document).off("click.red-ui-menu");
-                            activeMenu = null;
-                            topMenu.hide();
-                        });
-                        $(".red-ui-menu").hide();
-                        topMenu.show();
-                    }
-                })
-            }
+        var menuParent = $("#"+options.id);
+
+        var topMenu = $("<ul/>",{id:options.id+"-submenu", class:"dropdown-menu pull-right"});
+
+        if (menuParent.length === 1) {
+            topMenu.insertAfter(menuParent);
         }
 
         var lastAddedSeparator = false;
@@ -198,9 +192,8 @@ RED.menu = (function() {
     }
 
     function setSelected(id,state) {
-        var alreadySet = false;
         if (isSelected(id) == state) {
-            alreadySet = true;
+            return;
         }
         var opt = menuItems[id];
         if (state) {
@@ -208,26 +201,10 @@ RED.menu = (function() {
         } else {
             $("#"+id).removeClass("active");
         }
-        if (opt) {
-            if (opt.toggle && typeof opt.toggle === "string") {
-                if (state) {
-                    for (var m in menuItems) {
-                        if (menuItems.hasOwnProperty(m)) {
-                            var mi = menuItems[m];
-                            if (mi.id != opt.id && opt.toggle == mi.toggle) {
-                                setSelected(mi.id,false);
-                            }
-                        }
-                    }
-                }
-            }
-            if (!alreadySet && opt.onselect) {
-                triggerAction(opt.id,state);
-            }
-            if (!opt.local && !alreadySet) {
-                RED.settings.set(opt.setting||("menu-"+opt.id), state);
-            }
+        if (opt && opt.onselect) {
+            triggerAction(opt.id,state);
         }
+        RED.settings.set(opt.setting||("menu-"+opt.id), state);
     }
 
     function toggleSelected(id) {
@@ -244,14 +221,14 @@ RED.menu = (function() {
 
     function addItem(id,opt) {
         var item = createMenuItem(opt);
-        if (opt !== null && opt.group) {
-            var groupItems = $("#"+id+"-submenu").children(".red-ui-menu-group-"+opt.group);
+        if (opt.group) {
+            var groupItems = $("#"+id+"-submenu").children(".menu-group-"+opt.group);
             if (groupItems.length === 0) {
                 item.appendTo("#"+id+"-submenu");
             } else {
                 for (var i=0;i<groupItems.length;i++) {
                     var groupItem = groupItems[i];
-                    var label = $(groupItem).find(".red-ui-menu-label").html();
+                    var label = $(groupItem).find(".menu-label").html();
                     if (opt.label < label) {
                         $(groupItem).before(item);
                         break;
@@ -285,5 +262,6 @@ RED.menu = (function() {
         addItem: addItem,
         removeItem: removeItem,
         setAction: setAction
+        //TODO: add an api for replacing a submenu - see library.js:loadFlowLibrary
     }
 })();

editor/js/ui/common/panels.js

@@ -0,0 +1,81 @@
+/**
+ * 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.panels = (function() {
+
+    function createPanel(options) {
+        var container = options.container || $("#"+options.id);
+        var children = container.children();
+        if (children.length !== 2) {
+            throw new Error("Container must have exactly two children");
+        }
+
+        container.addClass("red-ui-panels");
+        var separator = $('<div class="red-ui-panels-separator"></div>').insertAfter(children[0]);
+        var startPosition;
+        var panelHeights = [];
+        var modifiedHeights = false;
+        var panelRatio;
+
+        separator.draggable({
+                axis: "y",
+                containment: container,
+                scroll: false,
+                start:function(event,ui) {
+                    var height = container.height();
+                    startPosition = ui.position.top;
+                    panelHeights = [$(children[0]).height(),$(children[1]).height()];
+                },
+                drag: function(event,ui) {
+                    var height = container.height();
+                    var delta = ui.position.top-startPosition;
+                    var newHeights = [panelHeights[0]+delta,panelHeights[1]-delta];
+                    $(children[0]).height(newHeights[0]);
+                    $(children[1]).height(newHeights[1]);
+                    if (options.resize) {
+                        options.resize(newHeights[0],newHeights[1]);
+                    }
+                    ui.position.top -= delta;
+                    panelRatio = newHeights[0]/height;
+                },
+                stop:function(event,ui) {
+                    modifiedHeights = true;
+                }
+        });
+
+        return {
+            resize: function(height) {
+                var panelHeights = [$(children[0]).height(),$(children[1]).height()];
+                container.height(height);
+                if (modifiedHeights) {
+                    var topPanelHeight = panelRatio*height;
+                    var bottomPanelHeight = height - topPanelHeight - 48;
+                    panelHeights = [topPanelHeight,bottomPanelHeight];
+                    $(children[0]).height(panelHeights[0]);
+                    $(children[1]).height(panelHeights[1]);
+                }
+                if (options.resize) {
+                    options.resize(panelHeights[0],panelHeights[1]);
+                }
+            }
+        }
+    }
+
+    return {
+        create: createPanel
+    }
+})();