Remove sentiment from core

(moved to node-red-nodes)

.gitattributes

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

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

CHANGELOG.md

@@ -1,236 +1,3 @@
-#### 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.5: Maintenance Release
-
- - Recognize pip installs of RPi.GPIO (#1934)
- - Merge pull request #1941 from node-red-hitachi/master-batch
- - Merge pull request #1931 from node-red-hitachi/master-typedinput
- - Set min value of properties and spinners for batch
- - Fix that unnecessary optionMenu remains
- - Merge pull request #1894 from node-red-hitachi/fix-overlapping-file-node-execution
- - Merge pull request #1924 from imZack/patch-1
- - Add missing comma
- - Do not disable context sidebar during node edit Fixes #1921
- - Don't allow virtual links to be spliced Fixes #1920
- - Merge project package changes to avoid overwritten changes
- - Handle manually added project deps that are unused Fixes #1908
- - update close & input handling of File node
- - make close handler argument only one
- - Merge pull request #1907 from amilajack/patch-2
- - Change repo badge to point to master branch
- - invoke callbacks if async handler is specified
- - Merge pull request #1891 from camlow325/resolve-example-path-for-windows-support
- - Merge pull request #1900 from kazuhitoyokoi/master-addtestcases4settings.js
- - wait closing while pending messages exist
- - Add test cases for red/api/editor/settings.js
- - Ensure all palette categories are opened properly Closes #1893
- - Resolve path when sending example file for Windows support
- - fix multiple input message processing of file node
-
-#### 0.19.4: Maintenance Release
-
- - Fix race condition in non-cache lfs context Fixes #1888
- - LocalFileSystem Context: Remove extra flush code
- - Prevent race condition in caching mode of lfs context (#1889)
- - Allow context store name to be provided in the key
- - Switch node: only use promises when absolutely necessary
- - Fix dbl-click handling on webkit-based browsers
- - Ensure context.flow/global cannot be deleted or enumerated
- - Handle context.get with multiple levels of unknown key Fixes #1883
- - Fix global.get("foo.bar") for functionGlobalContext set values
- - Fix node color bug (#1877)
- - Merge pull request #1857 from cclauss/patch-1
- - Define raw_input() in Python 3 & fix time.sleep()
-
-#### 0.19.3: Maintenance Release
-
- - Split node - fix complete to send msg for k/v object
- - Remove unused Join node merged object key typed input
- - Set the JavaScript editor to full-screen
- - Filter global modules installed locally
- - Add svg to permitted icon extension list
- - Debug node - indicate status all the time if selected to do so
- - pi nodes - increase test coverage slightly
- - TCP-request node - only write payload
- - JSON schema: perform validation when obj -> obj or str -> str
- - JSON schema: add draft-06 support (via $schema keyword)
- - Mqtt proxy configuration for websocket connection, #1651.
- - Allows MQTT Shared Subscriptions for MQTT-In core node
- - Fix use of HTML tag or CSS class specification as icon of typedInput
-
-#### 0.19.2: Maintenance Release
-
- - Ensure node default colour is used if palette.theme has no match
- - fix lost messages / properties in TCPRequest Node; closes #1863 (#1864)
- - Fix typo in template.html
- - Improve error reporting from context plugin loading
- - Prevent no-op edit of node marking as changed due to icon
- - Change node must handle empty rule set
-
-#### 0.19.1: Maintenance Release
-
- - Pull in latest twitter node
- - Handle windows paths for context storage
- - Handle persisting objects with circular refs in context
- - Ensure js editor can expand to fill available space
- - Add example localfilesystem contextStorage to settings
- - Fix template node handling of nested context tags
-
-#### 0.19: Milestone Release
-
-Editor
-
- - Add editorTheme.palette.theme to allow overriding colours
- - Index all node properties when searching Fixes #1446
- - Handle NaN and Infinity properly in debug sidebar Fixes #1778 #1779
- - Prevent horizontal scroll when palette name cannot wrap
- - Ignore middle-click on node/ports to enable panning
- - Better wire layout when looping back
- - fix appearence of retry button of remote branch management dialog
- - Handle releasing ctrl when using quick-add node dialog
- - Add $env function to JSONata expressions
- - Widen support for env var to use ${} or $() syntax
- - Add env-var support to TypedInput
- - Show unknown node properties in info tab
- - Add node icon picker widget
- - Only edit nodes on dbl click on primary button with no modifiers
- - Allow subflows to be put in any palette category
- - Add flow navigator widget
- - Cache flow library result to improve response time Fixes #1753
- - Add middle-button-drag to pan the workspace
- - allow multi-line category name in editor
- - Redesign sidebar tabs
- - Do not disable the export-clipboard menu option with empty selection
-
-Nodes
-
- - Change: Ensure runtime errors in Change node can be caught Fixes #1769
- - File: Add output to File Out node
- - Function: add expandable JavaScript editor pane
- - Function: allow id and name reference in function node code (#1731)
- - HTTP Request: Move to request module
- - HTTP: Ensure apiMaxLength applies to HTTP Nodes Fixes #1278
- - Join: accumulate top level properties
- - Join: allow environment variable as reduce init value
- - JSON: add JSON schema validation via msg.schema
- - Pi: Let nrgpio code work with python 3
- - Pi: let Pi nodes be visible/editable on all platforms
- - Switch: add isEmpty rule
- - TCP: queue messages while connecting; closes #1414
- - TLS: Add servername option to TLS config node for SNI Fixes #1805
- - UDP: Don't accidentally re-use udp port when set to not do so
-
-Persistent Context
-
- - Add Context data sidebar
- - Add persistable context option
- - Add default memory store
- - Add file-based context store
- - Add async mode to evaluateJSONataExpression
- - Update RED.util.evaluateNodeProperty to support context stores
-
-Runtime
-
- - Support flow.disabled and .info in /flow API
- - Node errors should be Strings not Errors Fixes #1781
- - Add detection of connection timeout in git communication Fixes #1770
- - Handle loading empty nodesDir
- - Add 'private' property to userDir generated package.json
- - Add RED.require to allow nodes to access other modules
- - Ensure add/remove modules are run sequentially
-
 #### 0.18.7: Maintenance Release
 
 Editor Fixes

Gruntfile.js

@@ -24,10 +24,6 @@ module.exports = function(grunt) {
         nodemonArgs.push(flowFile);
     }
 
-    var nonHeadless = grunt.option('non-headless');
-    if (nonHeadless) {
-        process.env.NODE_RED_NON_HEADLESS = 'true';
-    }
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
         paths: {
@@ -42,7 +38,7 @@ module.exports = function(grunt) {
                 reporter: 'spec'
             },
             all: { src: ['test/**/*_spec.js'] },
-            core: { src: ["test/_spec.js","test/unit/**/*_spec.js"]},
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         webdriver: {
@@ -57,11 +53,10 @@ module.exports = function(grunt) {
                 ignoreLeaks: false,
                 ui: 'bdd',
                 reportFormats: ['lcov','html'],
-                print: 'both',
-                istanbulOptions: ['--no-default-excludes', '-i','**/packages/node_modules/**']
+                print: 'both'
             },
-            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
+            all: { src: ["test/_spec.js","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] },
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         jshint: {
@@ -81,14 +76,16 @@ module.exports = function(grunt) {
             all: [
                 'Gruntfile.js',
                 'red.js',
-                'packages/**/*.js'
+                'red/**/*.js',
+                'nodes/core/*/*.js',
+                'editor/js/**/*.js'
             ],
             core: {
                 files: {
                     src: [
                         'Gruntfile.js',
                         'red.js',
-                        'packages/**/*.js',
+                        'red/**/*.js'
                     ]
                 }
             },
@@ -119,84 +116,79 @@ 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/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/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/palette-editor.js",
+                    "editor/js/ui/editor.js",
+                    "editor/js/ui/tray.js",
+                    "editor/js/ui/clipboard.js",
+                    "editor/js/ui/library.js",
+                    "editor/js/ui/notifications.js",
+                    "editor/js/ui/search.js",
+                    "editor/js/ui/typeSearch.js",
+                    "editor/js/ui/subflow.js",
+                    "editor/js/ui/userSettings.js",
+                    "editor/js/ui/projects/projects.js",
+                    "editor/js/ui/projects/projectSettings.js",
+                    "editor/js/ui/projects/projectUserSettings.js",
+                    "editor/js/ui/projects/tab-versionControl.js",
+                    "editor/js/ui/touch/radialMenu.js"
                 ],
-                dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
+                dest: "public/red/red.js"
             },
             vendor: {
                 files: {
-                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-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"
                     ]
                 }
             }
@@ -204,10 +196,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'
                 }
             }
         },
@@ -217,50 +209,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: {
@@ -272,27 +264,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']
             },
@@ -307,13 +299,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'
                     ]
                 }
             }
@@ -332,21 +323,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/**',
@@ -355,35 +346,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: {
@@ -392,79 +394,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: [
-                    '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',
-                    ],
-                options: {
-                    destination: '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 %>/**']
             }
         }
     });
@@ -484,10 +426,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;
@@ -529,18 +467,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('setDevEnv',
         'Sets NODE_ENV=development so non-minified assets are used',
             function () {
@@ -549,7 +475,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',
@@ -577,18 +503,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','jsdoc2md']);
 };

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) {

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);

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: {
@@ -39,7 +36,7 @@ RED.i18n = (function() {
             }
 
         },
-        loadNodeCatalog: function(namespace,done) {
+        loadCatalog: function(namespace,done) {
             var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
             var toLoad = languageList.length;
             languageList.forEach(function(lang) {
@@ -48,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--;
@@ -71,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

@@ -10,23 +10,14 @@
         "ctrl-g i": "core:show-info-tab",
         "ctrl-g d": "core:show-debug-tab",
         "ctrl-g c": "core:show-config-tab",
-        "ctrl-g x": "core:show-context-tab",
         "ctrl-e": "core:show-export-dialog",
         "ctrl-i": "core:show-import-dialog",
         "ctrl-space": "core:toggle-sidebar",
-        "ctrl-p": "core:toggle-palette",
         "ctrl-,": "core:show-user-settings",
         "ctrl-alt-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,31 +24,13 @@ var RED = (function() {
             moduleId = "unknown";
         }
         try {
-            var hasDeferred = false;
-
-            var nodeConfigEls = $("<div>"+nodeConfig+"</div>");
-            nodeConfigEls.find("script").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() { $("body").append(nodeConfigEls); done() }
-                    $('body').append(newScript);
-                    newScript.src = RED.settings.apiRootUrl+srcUrl;
-                    hasDeferred = true;
-                }
-            })
-            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();
         }
     }
 
@@ -94,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();
+                });
             }
         });
     }
@@ -201,16 +178,7 @@ 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") {
+                    if (msg.error === "missing-types") {
                         text+="<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
                         if (!!RED.projects.getActiveProject()) {
                             options.buttons = [
@@ -222,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 = [
                                 {
@@ -239,7 +207,7 @@ var RED = (function() {
                             if (RED.user.hasPermission("projects.write")) {
                                 options.buttons = [
                                     {
-                                        text: "Setup credentials",
+                                        text: RED._("notification.label.setup-cred"),
                                         click: function() {
                                             persistentNotifications[notificationId].hideNotification();
                                             RED.projects.showCredentialsPrompt();
@@ -250,7 +218,7 @@ var RED = (function() {
                         } else {
                             options.buttons = [
                                 {
-                                    text: "Close",
+                                    text: RED._("common.label.close"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
@@ -261,7 +229,7 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "Setup project files",
+                                    text: RED._("notification.label.setup-project"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.showFilesPrompt();
@@ -273,7 +241,7 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "Create default package file",
+                                    text: RED._("notification.label.create-default-package"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.createDefaultPackageFile();
@@ -285,13 +253,13 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "No thanks",
+                                    text: RED._("notification.label.no-thanks"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                     }
                                 },
                                 {
-                                    text: "Create default project files",
+                                    text: RED._("notification.label.create-default-project"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.projects.createDefaultFileSet();
@@ -305,7 +273,7 @@ var RED = (function() {
                         if (RED.user.hasPermission("projects.write")) {
                             options.buttons = [
                                 {
-                                    text: "Show merge conflicts",
+                                    text: RED._("notification.label.show-merge-conflicts"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
                                         RED.sidebar.versionControl.showLocalChanges();
@@ -349,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);
                         });
@@ -398,17 +366,13 @@ var RED = (function() {
             // 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();
@@ -438,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);
@@ -488,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 {
@@ -525,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];
@@ -359,6 +354,7 @@ RED.nodes = (function() {
         subflows[sf.id] = sf;
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{name:{value:""}},
+            info: sf.info,
             icon: function() { return sf.icon||"subflow.png" },
             category: sf.category || "subflows",
             inputs: sf.in.length,
@@ -513,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;
     }
@@ -653,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) {
@@ -765,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);
         }
 
@@ -913,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];
@@ -955,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;
@@ -1382,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/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",
@@ -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() {
@@ -413,20 +276,9 @@ RED.clipboard = (function() {
         if (typeof value !== "string" ) {
             value = JSON.stringify(value, function(key,value) {
                 if (value !== null && typeof value === 'object') {
-                    if (value.__enc__) {
-                        if (value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
-                            truncated = value.data.length !== value.length;
-                            return value.data;
-                        }
-                        if (value.type === 'function' || value.type === 'internal') {
-                            return undefined
-                        }
-                        if (value.type === 'number') {
-                            // Handle NaN and Infinity - they are not permitted
-                            // in JSON. We can either substitute with a String
-                            // representation or null
-                            return null;
-                        }
+                    if (value.__encoded__ && value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
+                        truncated = value.data.length !== value.length;
+                        return value.data;
                     }
                 }
                 return value;

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,153 @@
+/**
+ * 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>').appendTo("body");
+                if (size !== "default") {
+                    div.addClass("red-ui-popover-size-"+size);
+                }
+                if (typeof content === 'function') {
+                    content.call(res).appendTo(div);
+                } else {
+                    div.html(content);
+                }
+                if (width !== "auto") {
+                    div.width(width);
+                }
+
+
+                var targetPos = target.offset();
+                var targetWidth = target.width();
+                var targetHeight = target.height();
+                var divHeight = div.height();
+                var divWidth = div.width();
+                if (direction === 'right') {
+                    div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left+targetWidth+deltaSizes[size].leftRight});
+                } else if (direction === 'left') {
+                    div.css({top: targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top,left:targetPos.left-deltaSizes[size].leftLeft-divWidth});
+                } else if (direction === 'bottom') {
+                    div.css({top: targetPos.top+targetHeight+deltaSizes[size].top,left:targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom});
+                }
+                if (instant) {
+                    div.show();
+                } else {
+                    div.fadeIn("fast");
+                }
+            }
+        }
+        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
+    }
+
+})();

editor/js/ui/common/tabs.js

@@ -17,9 +17,6 @@
 
 
 RED.tabs = (function() {
-
-    var defaultTabIcon = "fa fa-lemon-o";
-
     function createTabs(options) {
         var tabs = {};
         var pinnedTabsCount = 0;
@@ -34,42 +31,13 @@ RED.tabs = (function() {
         if (options.vertical) {
             wrapper.addClass("red-ui-tabs-vertical");
         }
-        if (options.addButton) {
+        if (options.addButton && typeof options.addButton === 'function') {
             wrapper.addClass("red-ui-tabs-add");
             var addButton = $('<div class="red-ui-tab-button"><a href="#"><i class="fa fa-plus"></i></a></div>').appendTo(wrapper);
             addButton.find('a').click(function(evt) {
                 evt.preventDefault();
-                if (typeof options.addButton === 'function') {
-                    options.addButton();
-                } else if (typeof options.addButton === 'string') {
-                    RED.actions.invoke(options.addButton);
-                }
+                options.addButton();
             })
-            if (typeof options.addButton === 'string') {
-                var l = options.addButton;
-                if (options.addButtonCaption) {
-                    l = options.addButtonCaption
-                }
-                RED.popover.tooltip(addButton,l,options.addButton);
-            }
-            ul.on("dblclick", function(evt) {
-                var existingTabs = ul.children();
-                var clickX = evt.clientX;
-                var targetIndex = 0;
-                existingTabs.each(function(index) {
-                    var pos = $(this).offset();
-                    if (pos.left > clickX) {
-                        return false;
-                    }
-                    targetIndex = index+1;
-                })
-                if (typeof options.addButton === 'function') {
-                    options.addButton({index:targetIndex});
-                } else if (typeof options.addButton === 'string') {
-                    RED.actions.invoke(options.addButton,{index:targetIndex});
-                }
-            });
-
 
         }
         var scrollLeft;
@@ -92,47 +60,44 @@ RED.tabs = (function() {
 
             var collapsedButtonsRow = $('<div class="red-ui-tab-link-buttons"></div>').appendTo(wrapper);
 
-            if (options.menu !== false) {
-                var selectButton = $('<a href="#"><i class="fa fa-caret-down"></i></a>').appendTo(collapsedButtonsRow);
-                selectButton.addClass("red-ui-tab-link-button-menu")
-                selectButton.click(function(evt) {
-                    evt.preventDefault();
-                    if (!collapsibleMenu) {
-                        var pinnedOptions = [];
-                        var options = [];
-                        ul.children().each(function(i,el) {
-                            var id = $(el).data('tabId');
-                            var opt = {
-                                id:"red-ui-tabs-menu-option-"+id,
-                                icon: tabs[id].iconClass || defaultTabIcon,
-                                label: tabs[id].name,
-                                onselect: function() {
-                                    activateTab(id);
-                                }
-                            };
-                            if (tabs[id].pinned) {
-                                pinnedOptions.push(opt);
-                            } else {
-                                options.push(opt);
+            var selectButton = $('<a href="#"><i class="fa fa-caret-down"></i></a>').appendTo(collapsedButtonsRow);
+            selectButton.addClass("red-ui-tab-link-button-menu")
+            selectButton.click(function(evt) {
+                evt.preventDefault();
+                if (!collapsibleMenu) {
+                    var pinnedOptions = [];
+                    var options = [];
+                    ul.children().each(function(i,el) {
+                        var id = $(el).data('tabId');
+                        var opt = {
+                            id:"red-ui-tabs-menu-option-"+id,
+                            label: tabs[id].name,
+                            onselect: function() {
+                                activateTab(id);
                             }
-                        });
-                        options = pinnedOptions.concat(options);
-                        collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
-                        collapsibleMenu.css({
-                            position: "absolute"
-                        })
-                        collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
-                        collapsibleMenu.on('mouseup', function() { $(this).hide() });
-                        collapsibleMenu.appendTo("body");
-                    }
+                        };
+                        if (tabs[id].pinned) {
+                            pinnedOptions.push(opt);
+                        } else {
+                            options.push(opt);
+                        }
+                    });
+                    options = pinnedOptions.concat(options);
+                    collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
+                    collapsibleMenu.css({
+                        position: "absolute"
+                    })
+                    collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
+                    collapsibleMenu.on('mouseup', function() { $(this).hide() });
+                    collapsibleMenu.appendTo("body");
                     var elementPos = selectButton.offset();
                     collapsibleMenu.css({
                         top: (elementPos.top+selectButton.height()-20)+"px",
                         left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
                     })
-                    collapsibleMenu.toggle();
-                })
-            }
+                }
+                collapsibleMenu.toggle();
+            })
 
         }
 
@@ -161,86 +126,11 @@ RED.tabs = (function() {
         ul.children().first().addClass("active");
         ul.children().addClass("red-ui-tab");
 
-        function getSelection() {
-            var selection = ul.find("li.red-ui-tab.selected");
-            var selectedTabs = [];
-            selection.each(function() {
-                selectedTabs.push(tabs[$(this).find('a').attr('href').slice(1)])
-            })
-            return selectedTabs;
-        }
-
-        function selectionChanged() {
-            options.onselect(getSelection());
-        }
-
-        function onTabClick(evt) {
-            evt.preventDefault();
-            var currentTab = ul.find("li.red-ui-tab.active");
-            var thisTab = $(this).parent();
-            var fireSelectionChanged = false;
-            if (options.onselect) {
-                if (evt.metaKey) {
-                    if (thisTab.hasClass("selected")) {
-                        thisTab.removeClass("selected");
-                        if (thisTab[0] !== currentTab[0]) {
-                            // Deselect background tab
-                            // - don't switch to it
-                            selectionChanged();
-                            return;
-                        } else {
-                            // Deselect current tab
-                            // - if nothing remains selected, do nothing
-                            // - otherwise switch to first selected tab
-                            var selection = ul.find("li.red-ui-tab.selected");
-                            if (selection.length === 0) {
-                                selectionChanged();
-                                return;
-                            }
-                            thisTab = selection.first();
-                        }
-                    } else {
-                        if (!currentTab.hasClass("selected")) {
-                            var currentTabObj = tabs[currentTab.find('a').attr('href').slice(1)];
-                            // Auto select current tab
-                            currentTab.addClass("selected");
-                        }
-                        thisTab.addClass("selected");
-                    }
-                    fireSelectionChanged = true;
-                } else if (evt.shiftKey) {
-                    if (currentTab[0] !== thisTab[0]) {
-                        var firstTab,lastTab;
-                        if (currentTab.index() < thisTab.index()) {
-                            firstTab = currentTab;
-                            lastTab = thisTab;
-                        } else {
-                            firstTab = thisTab;
-                            lastTab = currentTab;
-                        }
-                        ul.find("li.red-ui-tab").removeClass("selected");
-                        firstTab.addClass("selected");
-                        lastTab.addClass("selected");
-                        firstTab.nextUntil(lastTab).addClass("selected");
-                    }
-                    fireSelectionChanged = true;
-                } else {
-                    var selection = ul.find("li.red-ui-tab.selected");
-                    if (selection.length > 0) {
-                        selection.removeClass("selected");
-                        fireSelectionChanged = true;
-                    }
-                }
-            }
-
-            var thisTabA = thisTab.find("a");
+        function onTabClick() {
             if (options.onclick) {
-                options.onclick(tabs[thisTabA.attr('href').slice(1)]);
-            }
-            activateTab(thisTabA);
-            if (fireSelectionChanged) {
-                selectionChanged();
+                options.onclick(tabs[$(this).attr('href').slice(1)]);
             }
+            activateTab($(this));
             return false;
         }
 
@@ -261,12 +151,7 @@ RED.tabs = (function() {
                 }
             }
         }
-        function onTabDblClick(evt) {
-            evt.preventDefault();
-            evt.stopPropagation();
-            if (evt.metaKey || evt.shiftKey) {
-                return;
-            }
+        function onTabDblClick() {
             if (options.ondblclick) {
                 options.ondblclick(tabs[$(this).attr('href').slice(1)]);
             }
@@ -285,8 +170,8 @@ RED.tabs = (function() {
                 ul.children().css({"transition": "width 100ms"});
                 link.parent().addClass("active");
                 var parentId = link.parent().attr('id');
-                wrapper.find(".red-ui-tab-link-button").removeClass("active selected");
-                $("#"+parentId+"-link-button").addClass("active selected");
+                wrapper.find(".red-ui-tab-link-button").removeClass("active");
+                $("#"+parentId+"-link-button").addClass("active");
                 if (options.scrollable) {
                     var pos = link.parent().position().left;
                     if (pos-21 < 0) {
@@ -368,23 +253,23 @@ RED.tabs = (function() {
                         currentActiveTabWidth = 0;
                     }
                 }
-                // if (options.collapsible) {
-                //     console.log(currentTabWidth);
-                // }
+                if (options.collapsible) {
+                    console.log(currentTabWidth);
+                }
 
                 tabs.css({width:currentTabWidth});
                 if (tabWidth < 50) {
-                    // ul.find(".red-ui-tab-close").hide();
+                    ul.find(".red-ui-tab-close").hide();
                     ul.find(".red-ui-tab-icon").hide();
                     ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
                 } else {
-                    // ul.find(".red-ui-tab-close").show();
+                    ul.find(".red-ui-tab-close").show();
                     ul.find(".red-ui-tab-icon").show();
                     ul.find(".red-ui-tab-label").css({paddingLeft:""})
                 }
                 if (currentActiveTabWidth !== 0) {
                     ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
-                    // ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
+                    ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
                     ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
                     ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
                 }
@@ -399,13 +284,6 @@ RED.tabs = (function() {
 
 
         function removeTab(id) {
-            if (options.onselect) {
-                var selection = ul.find("li.red-ui-tab.selected");
-                if (selection.length > 0) {
-                    selection.removeClass("selected");
-                    selectionChanged();
-                }
-            }
             var li = ul.find("a[href='#"+id+"']").parent();
             if (li.hasClass("active")) {
                 var tab = li.prev();
@@ -427,26 +305,9 @@ RED.tabs = (function() {
         }
 
         return {
-            addTab: function(tab,targetIndex) {
-                if (options.onselect) {
-                    var selection = ul.find("li.red-ui-tab.selected");
-                    if (selection.length > 0) {
-                        selection.removeClass("selected");
-                        selectionChanged();
-                    }
-                }
+            addTab: function(tab) {
                 tabs[tab.id] = tab;
-                var li = $("<li/>",{class:"red-ui-tab"});
-                if (ul.children().length === 0) {
-                    targetIndex = undefined;
-                }
-                if (targetIndex === 0) {
-                    li.prependTo(ul);
-                } else if (targetIndex > 0) {
-                    li.insertAfter(ul.find("li:nth-child("+(targetIndex)+")"));
-                } else {
-                    li.appendTo(ul);
-                }
+                var li = $("<li/>",{class:"red-ui-tab"}).appendTo(ul);
                 li.attr('id',"red-ui-tab-"+(tab.id.replace(".","-")));
                 li.data("tabId",tab.id);
 
@@ -471,18 +332,14 @@ RED.tabs = (function() {
                             pinnedLink.insertAfter(collapsedButtonsRow.find("a.red-ui-tab-link-button-pinned:last"));
                         }
                     } else {
-                        if (options.menu !== false) {
-                            pinnedLink.insertBefore(collapsedButtonsRow.find("a:last"));
-                        } else {
-                            pinnedLink.appendTo(collapsedButtonsRow);
-                        }
+                        pinnedLink.insertBefore(collapsedButtonsRow.find("a:last"));
                     }
 
                     pinnedLink.attr('id',li.attr('id')+"-link-button");
                     if (tab.iconClass) {
                         $('<i>',{class:tab.iconClass}).appendTo(pinnedLink);
                     } else {
-                        $('<i>',{class:defaultTabIcon}).appendTo(pinnedLink);
+                        $('<i>',{class:"fa fa-lemon-o"}).appendTo(pinnedLink);
                     }
                     pinnedLink.click(function(evt) {
                         evt.preventDefault();
@@ -492,28 +349,28 @@ RED.tabs = (function() {
                         pinnedLink.addClass("red-ui-tab-link-button-pinned");
                         pinnedTabsCount++;
                     }
-                    RED.popover.tooltip($(pinnedLink), tab.name, tab.action);
+                    RED.popover.create({
+                        target:$(pinnedLink),
+                        trigger: "hover",
+                        size: "small",
+                        direction: "bottom",
+                        content: tab.name,
+                        delay: { show: 550, hide: 10 }
+                    });
 
                 }
                 link.on("click",onTabClick);
                 link.on("dblclick",onTabDblClick);
-
-
                 if (tab.closeable) {
-                    li.addClass("red-ui-tabs-closeable")
                     var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close"}).appendTo(li);
                     closeLink.append('<i class="fa fa-times" />');
+
                     closeLink.on("click",function(event) {
                         event.preventDefault();
                         removeTab(tab.id);
                     });
                 }
-
-                var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
-                if (options.onselect) {
-                    $('<i class="red-ui-tabs-badge-changed fa fa-circle"></i>').appendTo(badges);
-                    $('<i class="red-ui-tabs-badge-selected fa fa-check-circle"></i>').appendTo(badges);
-                }
+                updateTabWidths();
                 if (options.onadd) {
                     options.onadd(tab);
                 }
@@ -598,9 +455,6 @@ RED.tabs = (function() {
                         }
                     })
                 }
-                setTimeout(function() {
-                    updateTabWidths();
-                },10);
                 collapsibleMenu = null;
             },
             removeTab: removeTab,
@@ -621,7 +475,6 @@ RED.tabs = (function() {
                 tab.find("span.bidiAware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
                 updateTabWidths();
             },
-            selection: getSelection,
             order: function(order) {
                 var existingTabOrder = $.makeArray(ul.children().map(function() { return $(this).data('tabId');}));
                 if (existingTabOrder.length !== order.length) {

editor/js/ui/common/typedInput.js

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

editor/js/ui/deploy.js

@@ -67,10 +67,7 @@ RED.deploy = (function() {
                   options: [
                       {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
                       {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
-                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
-                      null,
-                      {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.png",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
-
+                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}}
                   ]
               });
         } else if (type == "simple") {
@@ -99,7 +96,6 @@ RED.deploy = (function() {
         });
 
         RED.actions.add("core:deploy-flows",save);
-        RED.actions.add("core:restart-flows",restart);
 
 
         RED.events.on('nodes:change',function(state) {
@@ -261,56 +257,6 @@ RED.deploy = (function() {
         }
         return list;
     }
-
-    function restart() {
-        var startTime = Date.now();
-        $(".deploy-button-content").css('opacity',0);
-        $(".deploy-button-spinner").show();
-        var deployWasEnabled = !$("#btn-deploy").hasClass("disabled");
-        $("#btn-deploy").addClass("disabled");
-        deployInflight = true;
-        $("#header-shade").show();
-        $("#editor-shade").show();
-        $("#palette-shade").show();
-        $("#sidebar-shade").show();
-
-        $.ajax({
-            url:"flows",
-            type: "POST",
-            headers: {
-                "Node-RED-Deployment-Type":"reload"
-            }
-        }).done(function(data,textStatus,xhr) {
-            if (deployWasEnabled) {
-                $("#btn-deploy").removeClass("disabled");
-            }
-            RED.notify('<p>'+RED._("deploy.successfulRestart")+'</p>',"success");
-        }).fail(function(xhr,textStatus,err) {
-            if (deployWasEnabled) {
-                $("#btn-deploy").removeClass("disabled");
-            }
-            if (xhr.status === 401) {
-                RED.notify(RED._("deploy.deployFailed",{message:RED._("user.notAuthorized")}),"error");
-            } else if (xhr.status === 409) {
-                resolveConflict(nns, true);
-            } else if (xhr.responseText) {
-                RED.notify(RED._("deploy.deployFailed",{message:xhr.responseText}),"error");
-            } else {
-                RED.notify(RED._("deploy.deployFailed",{message:RED._("deploy.errors.noResponse")}),"error");
-            }
-        }).always(function() {
-            deployInflight = false;
-            var delta = Math.max(0,300-(Date.now()-startTime));
-            setTimeout(function() {
-                $(".deploy-button-content").css('opacity',1);
-                $(".deploy-button-spinner").hide();
-                $("#header-shade").hide();
-                $("#editor-shade").hide();
-                $("#palette-shade").hide();
-                $("#sidebar-shade").hide();
-            },delta);
-        });
-    }
     function save(skipValidation,force) {
         if (!$("#btn-deploy").hasClass("disabled")) {
             if (!RED.user.hasPermission("flows.write")) {