fix error messages for readonly

Fail more cleanly when run from a readonly files system without setting readOnly true.

.gitattributes

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

.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,14 +0,0 @@
----
-name: Anything Else
-about: Something that is not a bug report
-title: ''
-labels: ''
-assignees: ''
-
----
-
-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.

.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

@@ -8,3 +8,5 @@ matrix:
       before_script:
         - npm install -g istanbul coveralls
     - node_js: "8"
+    - node_js: "6"
+    - node_js: "4"

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,315 +1,3 @@
-#### 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

Gruntfile.js

@@ -15,7 +15,6 @@
  **/
 
 var path = require("path");
-var fs = require("fs-extra");
 
 module.exports = function(grunt) {
 
@@ -43,7 +42,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: {
@@ -58,11 +57,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","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] },
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         jshint: {
@@ -82,14 +80,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'
                     ]
                 }
             },
@@ -120,86 +120,81 @@ 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/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/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/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/view-navigator.js",
+                    "editor/js/ui/sidebar.js",
+                    "editor/js/ui/palette.js",
+                    "editor/js/ui/tab-info.js",
+                    "editor/js/ui/tab-config.js",
+                    "editor/js/ui/tab-context.js",
+                    "editor/js/ui/palette-editor.js",
+                    "editor/js/ui/editor.js",
+                    "editor/js/ui/editors/*.js",
+                    "editor/js/ui/tray.js",
+                    "editor/js/ui/clipboard.js",
+                    "editor/js/ui/library.js",
+                    "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-1.11.3.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/js/bootstrap.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui-1.10.3.custom.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"
+                    "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": [
+                    "public/vendor/vendor.css": [
                         // TODO: resolve relative resource paths in
                         //       bootstrap/FA/jquery
                     ],
-                    "packages/node_modules/@node-red/editor-client/public/vendor/jsonata/jsonata.min.js": [
+                    "public/vendor/jsonata/jsonata.min.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js"
+                        "editor/vendor/jsonata/formatter.js"
                     ],
-                    "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
+                    "public/vendor/ace/worker-jsonata.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
+                        "editor/vendor/jsonata/worker-jsonata.js"
                     ]
                 }
             }
@@ -207,10 +202,10 @@ 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'
                 }
             }
         },
@@ -220,50 +215,50 @@ module.exports = function(grunt) {
                     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: 'packages/node_modules/@node-red/editor-client/public/vendor/bootstrap/css/bootstrap.min.css',
-                    src: 'packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/css/bootstrap.css'
+                    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: {
@@ -275,27 +270,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']
             },
             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']
             },
@@ -310,13 +305,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'
                     ]
                 }
             }
@@ -335,21 +329,21 @@ 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/**',
                             //'bootstrap/css/**',
@@ -358,35 +352,46 @@ module.exports = function(grunt) {
                             '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: {
@@ -395,92 +400,19 @@ module.exports = function(grunt) {
             },
             release: {
                 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*'),
+                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/red/runtime/storage/localfilesystem/projects/git/node-red-*sh')
                 ]
             }
         },
-        '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 %>/**']
             }
         }
     });
@@ -500,10 +432,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-jsonlint');
     grunt.loadNpmTasks('grunt-mocha-istanbul');
     grunt.loadNpmTasks('grunt-webdriver');
-    grunt.loadNpmTasks('grunt-jsdoc');
-    grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
-    grunt.loadNpmTasks('grunt-npm-command');
-    grunt.loadNpmTasks('grunt-mkdir');
 
     grunt.registerMultiTask('attachCopyright', function() {
         var files = this.data.src;
@@ -545,25 +473,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", "chromedriver"))) {
-            grunt.fail.fatal('You need to run "npm install chromedriver@2" before running UI test.');
-            return false;
-        }
-    });
-
     grunt.registerTask('setDevEnv',
         'Sets NODE_ENV=development so non-minified assets are used',
             function () {
@@ -572,7 +481,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','jshint:editor','mocha_istanbul:all']);
 
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',
@@ -584,7 +493,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('test-ui',
         'Builds editor content then runs unit tests on editor ui',
-        ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
+        ['build','jshint:editor','webdriver:all']);
 
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',
@@ -600,18 +509,9 @@ module.exports = function(grunt) {
 
     grunt.registerTask('release',
         'Create distribution zip file',
-        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules']);
-
-    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,7 +2,7 @@
 
 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)
 
 A visual tool for wiring the Internet of Things.
@@ -44,6 +44,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
 

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.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

@@ -91,15 +91,12 @@ RED.history = (function() {
             } else if (ev.t == "delete") {
                 if (ev.workspaces) {
                     for (i=0;i<ev.workspaces.length;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) {
-                    for (i=0;i<ev.subflows.length;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);
@@ -125,20 +122,14 @@ RED.history = (function() {
                         });
                     }
                 }
-                if (ev.subflow) {
-                    if (ev.subflow.hasOwnProperty('instances')) {
-                        ev.subflow.instances.forEach(function(n) {
-                            var node = RED.nodes.node(n.id);
-                            if (node) {
-                                node.changed = n.changed;
-                                node.dirty = true;
-                            }
-                        });
-                    }
-                    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) {
@@ -238,11 +229,6 @@ 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;
@@ -273,8 +259,6 @@ RED.history = (function() {
             } else if (ev.t == "createSubflow") {
                 if (ev.nodes) {
                     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;
                     });
@@ -301,7 +285,6 @@ RED.history = (function() {
                     RED.workspaces.order(ev.order);
                 }
             }
-
             Object.keys(modifiedTabs).forEach(function(id) {
                 var subflow = RED.nodes.subflow(id);
                 if (subflow) {
@@ -310,12 +293,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();
         }
 
     }

editor/js/i18n.js

@@ -16,13 +16,10 @@
 
 RED.i18n = (function() {
 
-    var apiRootUrl;
-
     return {
-        init: function(options, done) {
-            apiRootUrl = options.apiRootUrl||"";
+        init: function(done) {
             i18n.init({
-                resGetPath: apiRootUrl+'locales/__ns__?lng=__lng__',
+                resGetPath: 'locales/__ns__?lng=__lng__',
                 dynamicLoad: false,
                 load:'current',
                 ns: {
@@ -30,22 +27,16 @@ RED.i18n = (function() {
                     defaultNs: "editor"
                 },
                 fallbackLng: ['en-US'],
-                useCookie: false,
-                returnObjectTrees: true
+                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);
             }
 
         },
-        loadNodeCatalog: function(namespace,done) {
+        loadCatalog: function(namespace,done) {
             var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
             var toLoad = languageList.length;
             languageList.forEach(function(lang) {
@@ -54,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--;
@@ -77,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

@@ -2,7 +2,6 @@
     "*": {
         "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",
@@ -15,19 +14,11 @@
         "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-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"
-    },
-    "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-g v": "core:show-version-control-tab"
     },
     "workspace": {
         "backspace": "core:delete-selection",

editor/js/main.js

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var RED = (function() {
+(function() {
 
-    function appendNodeConfig(nodeConfig,done) {
-        done = done || function(){};
+    function appendNodeConfig(nodeConfig) {
         var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
         var moduleId;
         if (m) {
@@ -25,41 +24,13 @@ var RED = (function() {
             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) {
-                            $("body").append(nodeConfigEls);
-                            done()
-                        }
-                    }
-                    $('body').append(newScript);
-                    newScript.src = RED.settings.apiRootUrl+srcUrl;
-                    hasDeferred = true;
-                } else {
-                    scriptCount--;
-                }
-            })
-            if (!hasDeferred) {
-                $("body").append(nodeConfigEls);
-                done();
-            }
+            $("body").append(nodeConfig);
         } catch(err) {
             RED.notify(RED._("notification.errors.failedToAppendNode",{module:moduleId, error:err.toString()}),{
                 type: "error",
                 timeout: 10000
             });
             console.log("["+moduleId+"] "+err.toString());
-            done();
         }
     }
 
@@ -104,40 +75,36 @@ var RED = (function() {
             url: 'nodes',
             success: function(data) {
                 var configs = data.trim().split(/(?=<!-- --- \[red-module:\S+\] --- -->)/);
-                var stepConfig = function() {
-                    if (configs.length === 0) {
-                        $("body").i18n();
-                        $("#palette > .palette-spinner").hide();
-                        $(".palette-scroll").removeClass("hide");
-                        $("#palette-search").removeClass("hide");
-                        loadFlows(function() {
-                            if (RED.settings.theme("projects.enabled",false)) {
-                                RED.projects.refresh(function(activeProject) {
-                                    RED.sidebar.info.refresh()
-                                    if (!activeProject) {
-                                        // Projects enabled but no active project
-                                        RED.menu.setDisabled('menu-item-projects-open',true);
-                                        RED.menu.setDisabled('menu-item-projects-settings',true);
-                                        if (activeProject === false) {
-                                            // User previously decline the migration to projects.
-                                        } else { // null/undefined
-                                            RED.projects.showStartup();
-                                        }
-                                    }
-                                    completeLoad();
-                                });
-                            } else {
-                                // Projects disabled by the user
-                                RED.sidebar.info.refresh()
-                                completeLoad();
+                configs.forEach(function(data) {
+                    appendNodeConfig(data);
+                });
+
+                $("body").i18n();
+                $("#palette > .palette-spinner").hide();
+                $(".palette-scroll").removeClass("hide");
+                $("#palette-search").removeClass("hide");
+                loadFlows(function() {
+                    if (RED.settings.theme("projects.enabled",false)) {
+                        RED.projects.refresh(function(activeProject) {
+                            RED.sidebar.info.refresh()
+                            if (!activeProject) {
+                                // Projects enabled but no active project
+                                RED.menu.setDisabled('menu-item-projects-open',true);
+                                RED.menu.setDisabled('menu-item-projects-settings',true);
+                                if (activeProject === false) {
+                                    // User previously decline the migration to projects.
+                                } else { // null/undefined
+                                    RED.projects.showStartup();
+                                }
                             }
+                            completeLoad();
                         });
                     } else {
-                        var config = configs.shift();
-                        appendNodeConfig(config,stepConfig);
+                        // Projects disabled by the user
+                        RED.sidebar.info.refresh()
+                        completeLoad();
                     }
-                }
-                stepConfig();
+                });
             }
         });
     }
@@ -211,17 +178,8 @@ 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 = [
                                 {
@@ -232,7 +190,7 @@ var RED = (function() {
                                     }
                                 }
                             ]
-                            // } else if (RED.settings.theme('palette.editable') !== false) {
+                        // } else if (RED.settings.theme('palette.editable') !== false) {
                         } else {
                             options.buttons = [
                                 {
@@ -249,7 +207,7 @@ var RED = (function() {
                             if (RED.user.hasPermission("projects.write")) {
                                 options.buttons = [
                                     {
-                                        text: RED._("notification.project.setupCredentials"),
+                                        text: RED._("notification.label.setup-cred"),
                                         click: function() {
                                             persistentNotifications[notificationId].hideNotification();
                                             RED.projects.showCredentialsPrompt();
@@ -271,7 +229,7 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: RED._("notification.project.setupProjectFiles"),
+                                    text: RED._("notification.label.setup-project"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.showFilesPrompt();
@@ -283,10 +241,10 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: RED._("notification.project.setupProjectFiles"),
+                                    text: RED._("notification.label.create-default-package"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
-                                        RED.projects.showFilesPrompt();
+                                        RED.projects.createDefaultPackageFile();
                                     }
                                 }
                             ]
@@ -295,13 +253,13 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: RED._("notification.project.no"),
+                                    text: RED._("notification.label.no-thanks"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
                                 },
                                 {
-                                    text: RED._("notification.project.createDefault"),
+                                    text: RED._("notification.label.create-default-project"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.createDefaultFileSet();
@@ -315,7 +273,7 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: RED._("notification.project.mergeConflict"),
+                                    text: RED._("notification.label.show-merge-conflicts"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.sidebar.versionControl.showLocalChanges();
@@ -359,7 +317,7 @@ 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);
                         });
@@ -401,24 +359,20 @@ 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();
@@ -448,9 +402,7 @@ var RED = (function() {
             //     {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-palette",label:RED._("menu.label.palette.show"),toggle:true,onselect:"core:toggle-palette", selected: true},
             {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"},
             null
         ]});
         menuOptions.push(null);
@@ -498,7 +450,6 @@ var RED = (function() {
         RED.library.init();
         RED.keyboard.init();
         RED.palette.init();
-        RED.eventLog.init();
         if (RED.settings.theme('palette.editable') !== false) {
             RED.palette.editor.init();
         } else {
@@ -535,25 +486,16 @@ var RED = (function() {
         loadNodeList();
     }
 
-    var initialised = false;
+    $(function() {
 
-    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+"/";
-        }
-        RED.i18n.init(options, function() {
-            RED.settings.init(options, loadEditor);
-        })
-    }
 
-    return {
-        init: init
-    }
+        RED.i18n.init(function() {
+            RED.settings.init(loadEditor);
+        })
+    });
 })();

editor/js/nodes.js

@@ -174,7 +174,6 @@ RED.nodes = (function() {
             },
             setIconSets: function(sets) {
                 iconSets = sets;
-                iconSets["font-awesome"] = RED.nodes.fontAwesome.getIconList();
             },
             getIconSets: function() {
                 return iconSets;
@@ -298,14 +297,10 @@ RED.nodes = (function() {
         }
     }
 
-    function addWorkspace(ws,targetIndex) {
+    function addWorkspace(ws) {
         workspaces[ws.id] = ws;
         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];
@@ -358,10 +353,8 @@ RED.nodes = (function() {
         }
         subflows[sf.id] = sf;
         RED.nodes.registerType("subflow:"+sf.id, {
-            defaults:{
-                name:{value:""},
-                env:{value:[]}
-            },
+            defaults:{name:{value:""}},
+            info: sf.info,
             icon: function() { return sf.icon||"subflow.png" },
             category: sf.category || "subflows",
             inputs: sf.in.length,
@@ -372,16 +365,6 @@ RED.nodes = (function() {
             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")));
-                $("#node-input-env-container").editableList('height',height-80);
-            },
             set:{
                 module: "node-red"
             }
@@ -526,15 +509,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;
     }
@@ -548,7 +522,6 @@ RED.nodes = (function() {
         node.category = n.category;
         node.in = [];
         node.out = [];
-        node.env = n.env;
 
         n.in.forEach(function(p) {
             var nIn = {x:p.x,y:p.y,wires:[]};
@@ -585,18 +558,6 @@ RED.nodes = (function() {
                 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;
     }
@@ -679,39 +640,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) {
@@ -766,20 +730,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;
@@ -805,6 +755,7 @@ RED.nodes = (function() {
         }
         if (!isInitialLoad && unknownTypes.length > 0) {
             var typeList = "<ul><li>"+unknownTypes.join("</li><li>")+"</li></ul>";
+            var type = "type"+(unknownTypes.length > 1?"s":"");
             RED.notify("<p>"+RED._("clipboard.importUnrecognised",{count:unknownTypes.length})+"</p>"+typeList,"error",false,10000);
         }
 
@@ -891,12 +842,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);
                 }
@@ -959,14 +904,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:{}
-                    };
+                    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];
@@ -1001,21 +939,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 (createNewIds) {
                         if (subflow_blacklist[n.z]) {
                             continue;
@@ -1064,7 +998,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) {
@@ -1236,19 +1169,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();
@@ -1366,23 +1286,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 {
@@ -1390,18 +1308,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 = {};
@@ -1456,41 +1362,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

@@ -89,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);

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

@@ -22,8 +22,6 @@ RED.clipboard = (function() {
     var exportNodesDialog;
     var importNodesDialog;
     var disabled = false;
-    var popover;
-    var currentPopoverError;
 
     function setupDialogs() {
         dialog = $('<div id="clipboard-dialog" class="hide node-red-dialog"><form class="dialog-form form-horizontal"></form></div>')
@@ -49,21 +47,6 @@ RED.clipboard = (function() {
                             $( this ).dialog( "close" );
                         }
                     },
-                    {
-                        id: "clipboard-dialog-download",
-                        class: "primary",
-                        text: RED._("clipboard.download"),
-                        click: function() {
-                            var element = document.createElement('a');
-                            element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent($("#clipboard-export").val()));
-                            element.setAttribute('download', "flows.json");
-                            element.style.display = 'none';
-                            document.body.appendChild(element);
-                            element.click();
-                            document.body.removeChild(element);
-                            $( this ).dialog( "close" );
-                        }
-                    },
                     {
                         id: "clipboard-dialog-copy",
                         class: "primary",
@@ -72,7 +55,7 @@ RED.clipboard = (function() {
                             $("#clipboard-export").select();
                             document.execCommand("copy");
                             document.getSelection().removeAllRanges();
-                            RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
+                            RED.notify(RED._("clipboard.nodesExported"));
                             $( this ).dialog( "close" );
                         }
                     },
@@ -90,10 +73,6 @@ RED.clipboard = (function() {
                     $(this).parent().find(".ui-dialog-titlebar-close").hide();
                 },
                 close: function(e) {
-                    if (popover) {
-                        popover.close(true);
-                        currentPopoverError = null;
-                    }
                 }
             });
 
@@ -107,7 +86,7 @@ RED.clipboard = (function() {
                     '<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>'+
             '<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>'+
@@ -118,13 +97,10 @@ RED.clipboard = (function() {
                 '</span>'+
             '</div>';
 
-        importNodesDialog =
-            '<div class="form-row"><span data-i18n="clipboard.pasteNodes"></span>'+
-                ' <a class="editor-button" id="import-file-upload-btn"><i class="fa fa-upload"></i> <span data-i18n="clipboard.selectFile"></span></a>'+
-                '<input type="file" id="import-file-upload" accept=".json" style="display:none">'+
-            '</div>'+
-            '<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"></textarea>'+
+        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>'+
@@ -135,98 +111,21 @@ RED.clipboard = (function() {
             '</div>';
     }
 
-    var validateImportTimeout;
-
     function validateImport() {
-        if (validateImportTimeout) {
-            clearTimeout(validateImportTimeout);
+        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");
         }
-        validateImportTimeout = setTimeout(function() {
-            var importInput = $("#clipboard-import");
-            var v = importInput.val().trim();
-            if (v === "") {
-                popover.close(true);
-                currentPopoverError = null;
-                importInput.removeClass("input-error");
-                $("#clipboard-dialog-ok").button("disable");
-                return;
-            }
-            try {
-                if (!/^\[[\s\S]*\]$/m.test(v)) {
-                    throw new Error(RED._("clipboard.import.errors.notArray"));
-                }
-                var res = JSON.parse(v);
-                for (var i=0;i<res.length;i++) {
-                    if (typeof res[i] !== "object") {
-                        throw new Error(RED._("clipboard.import.errors.itemNotObject",{index:i}));
-                    }
-                    if (!res[i].hasOwnProperty('id')) {
-                        throw new Error(RED._("clipboard.import.errors.missingId",{index:i}));
-                    }
-                    if (!res[i].hasOwnProperty('type')) {
-                        throw new Error(RED._("clipboard.import.errors.missingType",{index:i}));
-                    }
-                }
-                currentPopoverError = null;
-                popover.close(true);
-                importInput.removeClass("input-error");
-                importInput.val(v);
-                $("#clipboard-dialog-ok").button("enable");
-            } catch(err) {
-                if (v !== "") {
-                    importInput.addClass("input-error");
-                    var errString = err.toString();
-                    if (errString !== currentPopoverError) {
-                        // Display the error as-is.
-                        // Error messages are only in English. Each browser has its
-                        // own set of messages with very little consistency.
-                        // To provide translated messages this code will either need to:
-                        // - reduce everything down to 'unexpected token at position x'
-                        //   which is the least useful, but most consistent message
-                        // - use a custom/library parser that gives consistent messages
-                        //   which can be translated.
-                        var message = $('<div class="clipboard-import-error"></div>').text(errString);
-                        var errorPos;
-                        // Chrome error messages
-                        var m = /at position (\d+)/i.exec(errString);
-                        if (m) {
-                            errorPos = parseInt(m[1]);
-                        } else {
-                            // Firefox error messages
-                            m = /at line (\d+) column (\d+)/i.exec(errString);
-                            if (m) {
-                                var line = parseInt(m[1])-1;
-                                var col = parseInt(m[2])-1;
-                                var lines = v.split("\n");
-                                errorPos = 0;
-                                for (var i=0;i<line;i++) {
-                                    errorPos += lines[i].length+1;
-                                }
-                                errorPos += col;
-                            } else {
-                                // Safari doesn't provide any position information
-                                // IE: tbd
-                            }
-                        }
-
-                        if (errorPos !== undefined) {
-                            v = v.replace(/\n/g,"↵");
-                            var index = parseInt(m[1]);
-                            var parseError = $('<div>').appendTo(message);
-                            var code = $('<pre>').appendTo(parseError);
-                            $('<span>').text(v.substring(errorPos-12,errorPos)).appendTo(code)
-                            $('<span class="error">').text(v.charAt(errorPos)).appendTo(code);
-                            $('<span>').text(v.substring(errorPos+1,errorPos+12)).appendTo(code);
-                        }
-                        popover.close(true).setContent(message).open();
-                        currentPopoverError = errString;
-                    }
-                } else {
-                    currentPopoverError = null;
-                }
-                $("#clipboard-dialog-ok").button("disable");
-            }
-        },100);
     }
 
     function importNodes() {
@@ -241,7 +140,6 @@ RED.clipboard = (function() {
         $("#clipboard-dialog-cancel").show();
         $("#clipboard-dialog-close").hide();
         $("#clipboard-dialog-copy").hide();
-        $("#clipboard-dialog-download").hide();
         $("#clipboard-dialog-ok").button("disable");
         $("#clipboard-import").keyup(validateImport);
         $("#clipboard-import").on('paste',function() { setTimeout(validateImport,10)});
@@ -255,26 +153,7 @@ RED.clipboard = (function() {
             $(this).addClass('selected');
         });
 
-        $("#import-file-upload").change(function() {
-            var fileReader = new FileReader();
-            fileReader.onload = function () {
-                $("#clipboard-import").val(fileReader.result);
-                validateImport();
-            };
-            fileReader.readAsText($(this).prop('files')[0]);
-        })
-        $("#import-file-upload-btn").click(function(evt) {
-            evt.preventDefault();
-            $("#import-file-upload").click();
-        })
-
         dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
-        popover = RED.popover.create({
-            target: $("#clipboard-import"),
-            trigger: "manual",
-            direction: "bottom",
-            content: ""
-        });
     }
 
     function exportNodes() {
@@ -323,18 +202,9 @@ RED.clipboard = (function() {
             var flow = "";
             var nodes = null;
             if (type === 'export-range-selected') {
-                var selection = RED.workspaces.selection();
-                if (selection.length > 0) {
-                    nodes = [];
-                    selection.forEach(function(n) {
-                        nodes.push(n);
-                        nodes = nodes.concat(RED.nodes.filterNodes({z:n.id}));
-                    });
-                } else {
-                    nodes = RED.view.selection().nodes||[];
-                }
+                var selection = RED.view.selection();
                 // Don't include the subflow meta-port nodes in the exported selection
-                nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
+                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});
@@ -364,17 +234,12 @@ RED.clipboard = (function() {
         $("#clipboard-dialog-cancel").hide();
         $("#clipboard-dialog-copy").hide();
         $("#clipboard-dialog-close").hide();
-        var selection = RED.workspaces.selection();
-        if (selection.length > 0) {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
             $("#export-range-selected").click();
         } else {
-            selection = RED.view.selection();
-            if (selection.nodes) {
-                $("#export-range-selected").click();
-            } else {
-                $("#export-range-selected").addClass('disabled').removeClass('selected');
-                $("#export-range-flow").click();
-            }
+            $("#export-range-selected").addClass('disabled').removeClass('selected');
+            $("#export-range-flow").click();
         }
         if (format === "export-format-full") {
             $("#export-format-full").click();
@@ -400,8 +265,6 @@ RED.clipboard = (function() {
             $("#clipboard-dialog-cancel").show();
             $("#clipboard-dialog-copy").show();
         }
-        $("#clipboard-dialog-download").show();
-
     }
 
     function hideDropTarget() {

editor/js/ui/common/editableList.js

@@ -327,14 +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)
-            }
         }
     });
 })(jQuery);

editor/js/ui/common/menu.js

@@ -150,14 +150,13 @@ RED.menu = (function() {
 
     }
     function createMenu(options) {
-        var topMenu = $("<ul/>",{class:"dropdown-menu pull-right"});
 
-        if (options.id) {
-            topMenu.attr({id:options.id+"-submenu"});
-            var menuParent = $("#"+options.id);
-            if (menuParent.length === 1) {
-                topMenu.insertAfter(menuParent);
-            }
+        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;

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
+    }
+})();

editor/js/ui/common/popover.js

@@ -0,0 +1,171 @@
+/**
+ * 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.popover = (function() {
+    var deltaSizes = {
+        "default": {
+            top: 10,
+            leftRight: 17,
+            leftLeft: 25,
+            leftBottom: 8,
+        },
+        "small": {
+            top: 5,
+            leftRight: 17,
+            leftLeft: 16,
+            leftBottom: 3,
+        }
+    }
+    function createPopover(options) {
+        var target = options.target;
+        var direction = options.direction || "right";
+        var trigger = options.trigger;
+        var content = options.content;
+        var delay = options.delay;
+        var autoClose = options.autoClose;
+        var width = options.width||"auto";
+        var size = options.size||"default";
+        if (!deltaSizes[size]) {
+            throw new Error("Invalid RED.popover size value:",size);
+        }
+
+        var timer = null;
+        var active;
+        var div;
+
+        var openPopup = function(instant) {
+            if (active) {
+                div = $('<div class="red-ui-popover red-ui-popover-'+direction+'"></div>');
+                if (size !== "default") {
+                    div.addClass("red-ui-popover-size-"+size);
+                }
+                if (typeof content === 'function') {
+                    var result = content.call(res);
+                    if (result === null) {
+                        return;
+                    }
+                    if (typeof result === 'string') {
+                        div.text(result);
+                    } else {
+                        div.append(result);
+                    }
+                } else {
+                    div.html(content);
+                }
+                if (width !== "auto") {
+                    div.width(width);
+                }
+                div.appendTo("body");
+
+                var targetPos = target.offset();
+                var targetWidth = target.outerWidth();
+                var targetHeight = target.outerHeight();
+                var divHeight = div.height();
+                var divWidth = div.width();
+                if (direction === 'right') {
+                    div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left+targetWidth+deltaSizes[size].leftRight});
+                } else if (direction === 'left') {
+                    div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left-deltaSizes[size].leftLeft-divWidth});
+                } else if (direction === 'bottom') {
+                    div.css({top: targetPos.top+targetHeight+deltaSizes[size].top,left:targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom});
+                }
+                if (instant) {
+                    div.show();
+                } else {
+                    div.fadeIn("fast");
+                }
+            }
+        }
+        var closePopup = function(instant) {
+            if (!active) {
+                if (div) {
+                    if (instant) {
+                        $(this).remove();
+                    } else {
+                        div.fadeOut("fast",function() {
+                            $(this).remove();
+                        });
+                    }
+                    div = null;
+                }
+            }
+        }
+
+        if (trigger === 'hover') {
+            target.on('mouseenter',function(e) {
+                clearTimeout(timer);
+                active = true;
+                timer = setTimeout(openPopup,delay.show);
+            });
+            target.on('mouseleave', function(e) {
+                if (timer) {
+                    clearTimeout(timer);
+                }
+                active = false;
+                setTimeout(closePopup,delay.hide);
+            });
+        } else if (trigger === 'click') {
+            target.click(function(e) {
+                e.preventDefault();
+                e.stopPropagation();
+                active = !active;
+                if (!active) {
+                    closePopup();
+                } else {
+                    openPopup();
+                }
+            });
+        } else if (autoClose) {
+            setTimeout(function() {
+                active = false;
+                closePopup();
+            },autoClose);
+        }
+        var res = {
+            setContent: function(_content) {
+                content = _content;
+                return res;
+            },
+            open: function (instant) {
+                active = true;
+                openPopup(instant);
+                return res;
+            },
+            close: function (instant) {
+                active = false;
+                closePopup(instant);
+                return res;
+            }
+        }
+        return res;
+
+    }
+
+    return {
+        create: createPopover,
+        tooltip: function(target,content) {
+            RED.popover.create({
+                target:target,
+                trigger: "hover",
+                size: "small",
+                direction: "bottom",
+                content: content,
+                delay: { show: 550, hide: 10 }
+            });
+        }
+    }
+
+})();