Tidy up merge of #1026

Closes #1026

.gitattributes

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

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/--bug_report.md

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

.github/ISSUE_TEMPLATE/-anything-else.md

@@ -1,17 +0,0 @@
----
-name: Anything Else
-about: Something that is not a bug report
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Please DO NOT raise an issue.
-
-We DO NOT use the issue tracker for general support or feature requests. Only bug reports should be raised here using the 'Bug report' template.
-
-For general support, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack). You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`. 
-That way the whole Node-RED user community can help, rather than rely on the core development team.
-
-For feature requests, please use the Node-RED Forum](https://discourse.nodered.org). Many ideas have already been discussed there and you should search that for your request before starting a new discussion.

.github/PULL_REQUEST_TEMPLATE.md

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

.github/scripts/update-node-red-docker.js

@@ -1,29 +0,0 @@
-const fs = require("fs");
-
-const newVersion = require("../../package.json").version;
-
-if (process.env.GITHUB_REF !== "refs/tags/"+newVersion) {
-    console.log(`GITHUB_REF doesn't match the package.json version: ${process.env.GITHUB_REF} !== ${newVersion}`);
-    process.exit(0);
-}
-
-if (!/^\d+\.\d+\.\d+$/.test(newVersion)) {
-    console.log(`Not updating for a non-stable release - ${newVersion}`);
-    process.exit(0);
-}
-
-const currentVersion = require("../../../node-red-docker/package.json").version;
-
-console.log(`Update from ${currentVersion} to ${newVersion}`)
-
-updateFile(__dirname+"/../../../node-red-docker/package.json", currentVersion, newVersion);
-updateFile(__dirname+"/../../../node-red-docker/docker-custom/package.json", currentVersion, newVersion);
-updateFile(__dirname+"/../../../node-red-docker/README.md", currentVersion, newVersion);
-
-console.log(`::set-env name=newVersion::${newVersion}`);
-
-function updateFile(path,from,to) {
-    let contents = fs.readFileSync(path,"utf8");
-    contents = contents.replace(new RegExp(from.replace(/\./g,"\\."),"g"), to);
-    fs.writeFileSync(path, contents);
-}

.github/scripts/update-node-red-website.js

@@ -1,18 +0,0 @@
-const fs = require("fs");
-
-const newVersion = require("../../package.json").version;
-
-if (process.env.GITHUB_REF !== "refs/tags/"+newVersion) {
-    console.log(`GITHUB_REF doesn't match the package.json version: ${process.env.GITHUB_REF} !== ${newVersion}`);
-    process.exit(0);
-}
-
-if (!/^\d+\.\d+\.\d+$/.test(newVersion)) {
-    console.log(`Not updating for a non-stable release - ${newVersion}`);
-    process.exit(0);
-}
-
-const path = __dirname+"/../../../node-red.github.io/index.html";
-let contents = fs.readFileSync(path, "utf8");
-contents = contents.replace(/<span class="node-red-latest-version">v\d+\.\d+\.\d+<\/span>/, `<span class="node-red-latest-version">v${newVersion}<\/span>` );
-fs.writeFileSync(path, contents);

.github/workflows/build.yml

@@ -1,59 +0,0 @@
-name: PublishDockerImage
-env:
-  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-on:
-  release:
-    types: [published]
-
-jobs:
-  generate:
-    name: 'Update node-red-docker image'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out node-red repository
-        uses: actions/checkout@v2
-        with:
-            path: 'node-red'
-      - name: Check out node-red-docker repository
-        uses: actions/checkout@v2
-        with:
-            repository: 'node-red/node-red-docker'
-            path: 'node-red-docker'
-      - name: Check out node-red.github.io repository
-        uses: actions/checkout@v2
-        with:
-            repository: 'node-red/node-red.github.io'
-            path: 'node-red.github.io'
-      - uses: actions/setup-node@v1
-        with:
-            node-version: '12'
-      - run: node ./node-red/.github/scripts/update-node-red-docker.js
-      - name: Create Docker Pull Request
-        uses: peter-evans/create-pull-request@v2
-        with:
-          token: ${{ secrets.NR_REPO_TOKEN }}
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          path: 'node-red-docker'
-          commit-message: 'Bump to ${{ env.newVersion }}'
-          title: '🚀 Update to Node-RED ${{ env.newVersion }} release'
-          body: |
-            Updates the Node-RED Docker repo for the ${{ env.newVersion }} release.
-
-            Once this is merged, you will need to create a new release with the tag `v${{ env.newVersion }}`.
-
-            This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary
-      - run: node ./node-red/.github/scripts/update-node-red-website.js
-      - name: Create Website Pull Request
-        uses: peter-evans/create-pull-request@v2
-        with:
-          token: ${{ secrets.NR_REPO_TOKEN }}
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          path: 'node-red.github.io'
-          commit-message: 'Bump to ${{ env.newVersion }}'
-          title: '🚀 Update to Node-RED ${{ env.newVersion }} release'
-          body: |
-            Updates the Node-RED Website repo for the ${{ env.newVersion }} release.
-
-            This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary

.gitignore

@@ -17,10 +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
-.vscode
-.nyc_output

.jshintrc

@@ -2,9 +2,6 @@
     "asi": true,        // allow missing semicolons
     "curly": true,      // require braces
     "eqnull": true,     // ignore ==null
-    //"eqeqeq": true,   // enforce ===
-    "freeze": true,     // don't allow override
-    "indent": 4,        // default indent of 4
     "forin": true,      // require property filtering in "for in" loops
     "immed": true,      // require immediate functions to be wrapped in ( )
     "nonbsp": true,     // warn on unexpected whitespace breaking chars
@@ -12,8 +9,6 @@
     //"unused": true,   // Check for unused functions and variables
     "loopfunc": true,   // allow functions to be defined in loops
     //"expr": true,     // allow ternery operator syntax...
-    "shadow": true,     // allow variable shadowing (re-use of names...)
     "sub": true,        // don't warn that foo['bar'] should be written as foo.bar
-    "proto": true,      // allow setting of __proto__ in node < v0.12,
-    "esversion": 6      // allow es6
+    "proto": true       // allow setting of __proto__ in node < v0.12
 }

.nodemonignore

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

.npmignore

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

.travis.yml

@@ -1,21 +1,24 @@
 sudo: false
-addons:
-  chrome: stable
 language: node_js
+env:
+  - CXX="g++-4.8"
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
+    - gcc-4.8
 matrix:
-  include:
-    - node_js: "14"
-      script:
-        - ./node_modules/.bin/grunt && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
-        #    - scripts/install-ui-test-dependencies.sh && grunt test-ui
-      before_script:
-        - npm install -g coveralls
-    - node_js: "12"
-      script:
-        - ./node_modules/.bin/grunt no-coverage
-    - node_js: "10"
-      script:
-        - ./node_modules/.bin/grunt no-coverage
-    - node_js: "8"
-      script:
-        - ./node_modules/.bin/grunt no-coverage
+  allow_failures:
+  - node_js: "7"
+node_js:
+  - "7"
+  - "6"
+  - "4"
+  - "0.10"
+script:
+  - istanbul cover ./node_modules/.bin/grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js || true ) && rm -rf coverage
+before_script:
+  - npm install -g istanbul
+  - npm install coveralls

API.md

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

CONTRIBUTING.md

@@ -9,7 +9,7 @@ We welcome contributions, but request you follow these guidelines.
 
 This project adheres to the [Contributor Covenant 1.4](http://contributor-covenant.org/version/1/4/).
 By participating, you are expected to uphold this code. Please report unacceptable
-behavior to the project's core team at team@nodered.org.
+behavior to any of the [project's core team](https://github.com/orgs/node-red/teams/core).
 
 ## Raising issues
 
@@ -26,25 +26,33 @@ relevant nodes, press Ctrl-E and copy the flow data from the Export dialog.
 At a minimum, please include:
 
  - Version of Node-RED - either release number if you downloaded a zip, or the first few lines of `git log` if you are cloning the repository directly.
- - Version of Node.js - what does `node -v` say?
+ - Version of node.js - what does `node -v` say?
 
 ## Feature requests
 
-For feature requests, please raise them on the [forum](https://discourse.nodered.org).
+For feature requests, please raise them on the [mailing list](https://groups.google.com/forum/#!forum/node-red).
 
 ## Pull-Requests
 
 If you want to raise a pull-request with a new feature, or a refactoring
 of existing code, it may well get rejected if you haven't discussed it on
-the [forum](https://discourse.nodered.org) first.
+the [mailing list](https://groups.google.com/forum/#!forum/node-red) first.
 
-All contributors need to sign the JS Foundation's Contributor License Agreement.
-It is an online process and quick to do. You can read the details of the agreement
-here: https://cla.js.foundation/node-red/node-red.
+### Contributor License Agreement
 
-If you raise a pull-request without having signed the CLA, you will be prompted
-to do so automatically.
+In order for us to accept pull-requests, the contributor must first complete
+a Contributor License Agreement (CLA). This clarifies the intellectual
+property license granted with any contribution. It is for your protection as a
+Contributor as well as the protection of IBM and its customers; it does not
+change your rights to use your own Contributions for any other purpose.
 
+You can download the CLAs here:
+
+ - [individual](http://nodered.org/cla/node-red-cla-individual.pdf)
+ - [corporate](http://nodered.org/cla/node-red-cla-corporate.pdf)
+
+If you are an IBMer, please contact us directly as the contribution process is
+slightly different.
 
 ### Coding standards
 

Gruntfile.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2013, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,31 +15,15 @@
  **/
 
 var path = require("path");
-var fs = require("fs-extra");
-var sass = require("node-sass");
 
 module.exports = function(grunt) {
 
-    var nodemonArgs = ["-V"];
+    var nodemonArgs = ["-v"];
     var flowFile = grunt.option('flowFile');
     if (flowFile) {
         nodemonArgs.push(flowFile);
-        process.env.NODE_RED_ENABLE_PROJECTS=false;
-    }
-    var userDir = grunt.option('userDir');
-    if (userDir) {
-        nodemonArgs.push("-u");
-        nodemonArgs.push(userDir);
     }
 
-    var browserstack = grunt.option('browserstack');
-    if (browserstack) {
-        process.env.BROWSERSTACK = true;
-    }
-    var nonHeadless = grunt.option('non-headless');
-    if (nonHeadless) {
-        process.env.NODE_RED_NON_HEADLESS = true;
-    }
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
         paths: {
@@ -53,29 +37,10 @@ module.exports = function(grunt) {
                 ui: 'bdd',
                 reporter: 'spec'
             },
-            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
+            all: { src: ['test/**/*_spec.js'] },
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
-        webdriver: {
-            all: {
-                configFile: 'test/editor/wdio.conf.js'
-            }
-        },
-        nyc: {
-            options: {
-                cwd: '.',
-                include: ['packages/node_modules/**'],
-                excludeNodeModules: false,
-                exclude: ['packages/node_modules/@node-red/editor-client/**'],
-                reporter: ['lcov', 'html','text-summary'],
-                reportDir: 'coverage',
-                all: true
-            },
-            all:   { cmd: false, args: ['grunt', 'simplemocha:all'] },
-            core:  { options: { exclude:['packages/node_modules/@node-red/editor-client/**', 'packages/node_modules/@node-red/nodes/**']},cmd: false, args: ['grunt', 'simplemocha:core'] },
-            nodes: { cmd: false, args: ['grunt', 'simplemocha:nodes'] }
-        },
         jshint: {
             options: {
                 jshintrc:true
@@ -90,20 +55,22 @@ module.exports = function(grunt) {
                 //"loopfunc": true, // allow functions to be defined in loops
                 //"sub": true       // don't warn that foo['bar'] should be written as foo.bar
             },
-            // all: [
-            //     'Gruntfile.js',
-            //     'red.js',
-            //     'packages/**/*.js'
-            // ],
-            // core: {
-            //     files: {
-            //         src: [
-            //             'Gruntfile.js',
-            //             'red.js',
-            //             'packages/**/*.js',
-            //         ]
-            //     }
-            // },
+            all: [
+                'Gruntfile.js',
+                'red.js',
+                'red/**/*.js',
+                'nodes/core/*/*.js',
+                'editor/js/**/*.js'
+            ],
+            core: {
+                files: {
+                    src: [
+                        'Gruntfile.js',
+                        'red.js',
+                        'red/**/*.js'
+                    ]
+                }
+            },
             nodes: {
                 files: {
                     src: [ 'nodes/core/*/*.js' ]
@@ -111,7 +78,7 @@ module.exports = function(grunt) {
             },
             editor: {
                 files: {
-                    src: [ 'packages/node_modules/@node-red/editor-client/src/js/**/*.js' ]
+                    src: [ 'editor/js/**/*.js' ]
                 }
             },
             tests: {
@@ -131,96 +98,60 @@ module.exports = function(grunt) {
                 src: [
                     // Ensure editor source files are concatenated in
                     // the right order
-                    "packages/node_modules/@node-red/editor-client/src/js/polyfills.js",
-                    "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/plugins.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/nodes.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/history.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/validators.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/colorPicker.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/actions.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/statusBar.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/editor.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/*.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tray.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/search.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/group.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/main.js",
+                    "editor/js/events.js",
+                    "editor/js/i18n.js",
+                    "editor/js/settings.js",
+                    "editor/js/user.js",
+                    "editor/js/comms.js",
+                    "editor/js/bidi/bidi.js",
+                    "editor/js/bidi/base-text-dir.js",
+                    "editor/js/bidi/format.js",
+                    "editor/js/bidi/numeric-shaping.js",
+                    "editor/js/ui/state.js",
+                    "editor/js/nodes.js",
+                    "editor/js/history.js",
+                    "editor/js/validators.js",
+                    "editor/js/ui/common/editableList.js",
+                    "editor/js/ui/common/menu.js",
+                    "editor/js/ui/common/popover.js",
+                    "editor/js/ui/common/searchBox.js",
+                    "editor/js/ui/common/tabs.js",
+                    "editor/js/ui/common/typedInput.js",
+                    "editor/js/ui/deploy.js",
+                    "editor/js/ui/keyboard.js",
+                    "editor/js/ui/workspaces.js",
+                    "editor/js/ui/view.js",
+                    "editor/js/ui/sidebar.js",
+                    "editor/js/ui/palette.js",
+                    "editor/js/ui/tab-info.js",
+                    "editor/js/ui/tab-config.js",
+                    "editor/js/ui/palette-editor.js",
+                    "editor/js/ui/editor.js",
+                    "editor/js/ui/tray.js",
+                    "editor/js/ui/clipboard.js",
+                    "editor/js/ui/library.js",
+                    "editor/js/ui/notifications.js",
+                    "editor/js/ui/search.js",
+                    "editor/js/ui/subflow.js",
+                    "editor/js/ui/touch/radialMenu.js"
                 ],
-                dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
+                dest: "public/red/red.js"
             },
             vendor: {
                 files: {
-                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.5.1.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.3.0.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                        "node_modules/marked/marked.min.js",
-                        "node_modules/dompurify/dist/purify.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js",
-                        "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js",
+                    "public/vendor/vendor.js": [
+                        "editor/vendor/jquery/js/jquery-1.11.3.min.js",
+                        "editor/vendor/bootstrap/js/bootstrap.min.js",
+                        "editor/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js",
+                        "editor/vendor/jquery/js/jquery.ui.touch-punch.min.js",
+                        "editor/vendor/marked/marked.min.js",
+                        "editor/vendor/d3/d3.v3.min.js",
+                        "editor/vendor/i18next/i18next.min.js"
                     ],
-                    // "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
-                    //     // TODO: resolve relative resource paths in
-                    //     //       bootstrap/FA/jquery
-                    // ],
-                    "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
-                        "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
+                    "public/vendor/vendor.css": [
+                        // TODO: resolve relative resource paths in
+                        //       bootstrap/FA/jquery
                     ]
                 }
             }
@@ -228,60 +159,54 @@ 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'
                 }
             }
         },
         sass: {
             build: {
                 options: {
-                    implementation: sass,
                     outputStyle: 'compressed'
                 },
                 files: [{
-                    dest: 'packages/node_modules/@node-red/editor-client/public/red/style.min.css',
-                    src: 'packages/node_modules/@node-red/editor-client/src/sass/style.scss'
+                    dest: 'public/red/style.min.css',
+                    src: 'editor/sass/style.scss'
+                },
+                {
+                    dest: 'public/vendor/bootstrap/css/bootstrap.min.css',
+                    src: 'editor/vendor/bootstrap/css/bootstrap.css'
                 }]
             }
         },
         jsonlint: {
             messages: {
                 src: [
-                    'packages/node_modules/@node-red/nodes/locales/**/*.json',
-                    'packages/node_modules/@node-red/editor-client/locales/**/*.json',
-                    'packages/node_modules/@node-red/runtime/locales/**/*.json'
-                ]
-            },
-            keymaps: {
-                src: [
-                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
+                    'nodes/core/locales/en-US/messages.json',
+                    'red/api/locales/en-US/editor.json',
+                    'red/runtime/locales/en-US/runtime.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'
                 ]
             },
             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: {
@@ -293,30 +218,24 @@ module.exports = function(grunt) {
         watch: {
             js: {
                 files: [
-                    'packages/node_modules/@node-red/editor-client/src/js/**/*.js'
+                    'editor/js/**/*.js'
                 ],
-                tasks: ['copy:build','concat',/*'uglify',*/ 'attachCopyright:js']
+                tasks: ['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'
-                ],
-                tasks: ['jsonlint:keymaps','copy:build']
-            },
             misc: {
                 files: [
                     'CHANGELOG.md'
@@ -328,13 +247,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'
                     ]
                 }
             }
@@ -351,58 +269,62 @@ module.exports = function(grunt) {
 
         copy: {
             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: 'packages/node_modules/@node-red/editor-client/src/js/keymap.json',
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/keymap.json'
-                    },
-                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/images',
-                        src: '**',
-                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/images/'
-                    },
-                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/vendor',
-                        src: [
-                            'ace/**',
-                            'jquery/css/base/**',
-                            'font-awesome/**'
-                        ],
-                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
-                    },
-                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/icons',
-                        src: '**',
-                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/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/',
-                        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/'
-                    }
+                files:[{
+                    cwd: 'editor/images',
+                    src: '**',
+                    expand: true,
+                    dest: 'public/red/images/'
+                },
+                {
+                    cwd: 'editor/vendor',
+                    src: [
+                        'ace/**',
+                        //'bootstrap/css/**',
+                        'bootstrap/img/**',
+                        'jquery/css/**',
+                        'font-awesome/**'
+                    ],
+                    expand: true,
+                    dest: 'public/vendor/'
+                },
+                {
+                    cwd: 'editor/icons',
+                    src: '**',
+                    expand: true,
+                    dest: 'public/icons/'
+                },
+                {
+                    expand: true,
+                    src: ['editor/index.html','editor/favicon.ico'],
+                    dest: 'public/',
+                    flatten: true
+                },
+                {
+                    src: 'CHANGELOG.md',
+                    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: {
@@ -410,95 +332,20 @@ module.exports = function(grunt) {
                 mode: '755'
             },
             release: {
+                // Target-specific file/dir lists and/or options go here.
                 src: [
-                    "packages/node_modules/@node-red/nodes/core/hardware/nrgpio",
-                    "packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-*sh"
+                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/nodes/core/hardware/nrgpio*')
                 ]
             }
         },
-        'npm-command': {
-            options: {
-                cmd: "pack",
-                cwd: "<%= paths.dist %>/modules"
-            },
-            'node-red': { options: { args: [__dirname+'/packages/node_modules/node-red'] } },
-            '@node-red/editor-api': { options: { args: [__dirname+'/packages/node_modules/@node-red/editor-api'] } },
-            '@node-red/editor-client': { options: { args: [__dirname+'/packages/node_modules/@node-red/editor-client'] } },
-            '@node-red/nodes': { options: { args: [__dirname+'/packages/node_modules/@node-red/nodes'] } },
-            '@node-red/registry': { options: { args: [__dirname+'/packages/node_modules/@node-red/registry'] } },
-            '@node-red/runtime': { options: { args: [__dirname+'/packages/node_modules/@node-red/runtime'] } },
-            '@node-red/util': { options: { args: [__dirname+'/packages/node_modules/@node-red/util'] } }
-
-
-        },
-        mkdir: {
-            release: {
-                options: {
-                    create: ['<%= paths.dist %>/modules']
-                },
-            },
-        },
         compress: {
             release: {
                 options: {
                     archive: '<%= paths.dist %>/node-red-<%= pkg.version %>.zip'
                 },
                 expand: true,
-                cwd: 'packages/node_modules/',
-                src: [
-                    '**',
-                    '!@node-red/editor-client/src/**'
-                ]
-            }
-        },
-        jsdoc : {
-            modules: {
-                src: [
-                    'API.md',
-                    'packages/node_modules/node-red/lib/red.js',
-                    'packages/node_modules/@node-red/runtime/lib/index.js',
-                    'packages/node_modules/@node-red/runtime/lib/api/*.js',
-                    'packages/node_modules/@node-red/runtime/lib/events.js',
-                    'packages/node_modules/@node-red/runtime/lib/hooks.js',
-                    'packages/node_modules/@node-red/util/**/*.js',
-                    'packages/node_modules/@node-red/editor-api/lib/index.js',
-                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js',
-                    'packages/node_modules/@node-red/registry/lib/index.js'
-                ],
-                options: {
-                    destination: 'docs',
-                    configure: './jsdoc.json'
-                }
-            },
-            _editor: {
-                src: [
-                    'packages/node_modules/@node-red/editor-client/src/js'
-                    ],
-                options: {
-                    destination: 'packages/node_modules/@node-red/editor-client/docs',
-                    configure: './jsdoc.json'
-                }
-            }
-
-        },
-        jsdoc2md: {
-            runtimeAPI: {
-                options: {
-                    separators: true
-                },
-                src: [
-                    'packages/node_modules/@node-red/runtime/lib/index.js',
-                    'packages/node_modules/@node-red/runtime/lib/api/*.js',
-                    'packages/node_modules/@node-red/runtime/lib/events.js'
-                ],
-                dest: 'packages/node_modules/@node-red/runtime/docs/api.md'
-            },
-            nodeREDUtil: {
-                options: {
-                    separators: true
-                },
-                src: 'packages/node_modules/@node-red/util/**/*.js',
-                dest: 'packages/node_modules/@node-red/util/docs/api.md'
+                cwd: '<%= paths.dist %>/',
+                src: ['node-red-<%= pkg.version %>/**']
             }
         }
     });
@@ -511,42 +358,16 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-concurrent');
     grunt.loadNpmTasks('grunt-sass');
+    grunt.loadNpmTasks('grunt-nodemon');
     grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-chmod');
     grunt.loadNpmTasks('grunt-jsonlint');
-    if (fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-        grunt.loadNpmTasks('grunt-webdriver');
-    }
-    grunt.loadNpmTasks('grunt-jsdoc');
-    grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
-    grunt.loadNpmTasks('grunt-npm-command');
-    grunt.loadNpmTasks('grunt-mkdir');
-    grunt.loadNpmTasks('grunt-simple-nyc');
-
-    grunt.registerMultiTask('nodemon', 'Runs a nodemon monitor of your node.js server.', function () {
-        const nodemon = require('nodemon');
-        this.async();
-        const options = this.options();
-        options.script = this.data.script;
-        let callback;
-        if (options.callback) {
-            callback = options.callback;
-            delete options.callback;
-        } else {
-            callback = function(nodemonApp) {
-                nodemonApp.on('log', function (event) {
-                    console.log(event.colour);
-                });
-            };
-        }
-        callback(nodemon(options));
-    });
 
     grunt.registerMultiTask('attachCopyright', function() {
         var files = this.data.src;
         var copyright = "/**\n"+
-            " * Copyright JS Foundation and other contributors, http://js.foundation\n"+
+            " * Copyright 2013, 2015 IBM Corp.\n"+
             " *\n"+
             " * Licensed under the Apache License, Version 2.0 (the \"License\");\n"+
             " * you may not use this file except in compliance with the License.\n"+
@@ -562,7 +383,7 @@ module.exports = function(grunt) {
             " **/\n";
 
         if (files) {
-            for (var i=0; i<files.length; i++) {
+            for (var i=0;i<files.length;i++) {
                 var file = files[i];
                 if (!grunt.file.exists(file)) {
                     grunt.log.warn('File '+ file + ' not found');
@@ -583,38 +404,6 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.registerTask('verifyPackageDependencies', function() {
-        var done = this.async();
-        var verifyDependencies = require("./scripts/verify-package-dependencies.js");
-        verifyDependencies().then(function(failures) {
-            if (failures.length > 0) {
-                failures.forEach(f => grunt.log.error(f));
-                grunt.fail.fatal("Failed to verify package dependencies");
-            }
-            done();
-        });
-    });
-
-    grunt.registerTask('verifyUiTestDependencies', function() {
-        if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-            grunt.fail.fatal('You need to install the UI test dependencies first.\nUse the script in "scripts/install-ui-test-dependencies.sh"');
-            return false;
-        }
-    });
-    grunt.registerTask('generatePublishScript',
-        'Generates a script to publish build output to npm',
-            function () {
-                const done = this.async();
-                const generatePublishScript = require("./scripts/generate-publish-script.js");
-                generatePublishScript().then(function(output) {
-                    grunt.log.writeln(output);
-
-                    const filePath = path.join(grunt.config.get('paths.dist'),"modules","publish.sh");
-                    grunt.file.write(filePath,output);
-
-                    done();
-                });
-            });
     grunt.registerTask('setDevEnv',
         'Sets NODE_ENV=development so non-minified assets are used',
             function () {
@@ -623,42 +412,23 @@ 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','nyc:all']);
-
-    grunt.registerTask('no-coverage',
-        'Builds editor content then runs code style checks and unit tests on all components without code coverage',
-        ['build','verifyPackageDependencies','jshint:editor','simplemocha:all']);
-
+        ['build','test-core','test-editor','test-nodes']);
 
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',
-        ['build','nyc:core']);
+        ['jshint:core','simplemocha:core']);
 
     grunt.registerTask('test-editor',
         'Runs code style check on editor code',
         ['jshint:editor']);
 
-    if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-        grunt.registerTask('test-ui',
-            'Builds editor content then runs unit tests on editor ui',
-            ['verifyUiTestDependencies']);
-    } else {
-        grunt.registerTask('test-ui',
-            'Builds editor content then runs unit tests on editor ui',
-            ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
-    }
-
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',
-        ['build','nyc:nodes']);
+        ['simplemocha:nodes']);
 
     grunt.registerTask('build',
         'Builds editor content',
-        ['clean:build','jsonlint','concat:build','concat:vendor','copy:build','uglify:build','sass:build','attachCopyright']);
-
-    grunt.registerTask('build-dev',
-        'Developer mode: build dev version',
-        ['clean:build','concat:build','concat:vendor','copy:build','sass:build','setDevEnv']);
+        ['clean:build','concat:build','concat:vendor','uglify:build','sass:build','jsonlint:messages','copy:build','attachCopyright']);
 
     grunt.registerTask('dev',
         'Developer mode: run node-red, watch for source changes and build/restart',
@@ -666,18 +436,6 @@ module.exports = function(grunt) {
 
     grunt.registerTask('release',
         'Create distribution zip file',
-        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules','generatePublishScript']);
+        ['build','clean:release','copy:release','chmod:release','compress:release']);
 
-    grunt.registerTask('pack-modules',
-        'Create module pack files for release',
-        ['mkdir:release','npm-command']);
-
-
-    grunt.registerTask('coverage',
-        'Run Istanbul code test coverage task',
-        ['build','nyc:all']);
-
-    grunt.registerTask('docs',
-        'Generates API documentation',
-        ['jsdoc']);
 };

LICENSE

@@ -1,4 +1,3 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

README.md

@@ -2,19 +2,19 @@
 
 http://nodered.org
 
-[![Build Status](https://travis-ci.org/node-red/node-red.svg?branch=master)](https://travis-ci.org/node-red/node-red)
+[![Build Status](https://travis-ci.org/node-red/node-red.svg)](https://travis-ci.org/node-red/node-red)
 [![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)
 
-Low-code programming for event-driven applications.
+A visual tool for wiring the Internet of Things.
 
-![Node-RED: Low-code programming for event-driven applications](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: A visual tool for wiring the Internet of Things](http://nodered.org/images/node-red-screenshot.png)
 
 ## Quick Start
 
 Check out http://nodered.org/docs/getting-started/ for full instructions on getting
 started.
 
-1. `sudo npm install -g --unsafe-perm node-red`
+1. `sudo npm install -g node-red`
 2. `node-red`
 3. Open <http://localhost:1880>
 
@@ -22,7 +22,8 @@ started.
 
 More documentation can be found [here](http://nodered.org/docs).
 
-For further help, or general discussion, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
+For further help, or general discussion, please use the
+[mailing list](https://groups.google.com/forum/#!forum/node-red).
 
 ## Developers
 
@@ -44,6 +45,9 @@ If you want to run the latest code from git, here's how to get started:
 4. Run
 
         npm start
+   or
+
+        node red.js
 
 ## Contributing
 
@@ -52,19 +56,17 @@ Before raising a pull-request, please read our
 
 This project adheres to the [Contributor Covenant 1.4](http://contributor-covenant.org/version/1/4/).
  By participating, you are expected to uphold this code. Please report unacceptable
- behavior to any of the project's core team at team@nodered.org.
+ behavior to any of the [project's core team](https://github.com/orgs/node-red/teams/core).
 
 ## Authors
 
-Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
-
-It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
+Node-RED is a creation of [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
 
 * Nick O'Leary [@knolleary](http://twitter.com/knolleary)
 * Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
 
-
+For more open-source projects from IBM, head over [here](http://ibm.github.io).
 
 ## Copyright and license
 
-Copyright OpenJS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).
+Copyright 2013, 2016 IBM Corp. under [the Apache 2.0 license](LICENSE).

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report any potential security issues to `team@nodered.org`. This will notify the core project team who will respond accordingly.

bin/node-red-pi

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright JS Foundation and other contributors, http://js.foundation
+# Copyright 2015 IBM Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ done
 # Find the real location of this script
 CURRENT_PATH=`pwd`
 SCRIPT_PATH="${BASH_SOURCE[0]}";
-while [ -h "${SCRIPT_PATH}" ]; do
+while([ -h "${SCRIPT_PATH}" ]); do
     cd "`dirname "${SCRIPT_PATH}"`"
     SCRIPT_PATH="$(readlink "`basename "${SCRIPT_PATH}"`")";
 done

editor/js/bidi/base-text-dir.js

@@ -0,0 +1,67 @@
+/**
+ * Copyright 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+RED.bidi.baseTextDir = (function() {
+    var LRE = "\u202A",
+        RLE = "\u202B",
+        PDF = "\u202C";
+
+    function _isRTLValue(stringValue) {
+        var length = stringValue.length;
+        for (var i = 0 ; i < length; i++) {
+            if (_isBidiChar(stringValue.charCodeAt(i))) {
+                return true;
+            } else if (_isLatinChar(stringValue.charCodeAt(i))) {
+                return false;
+            }
+         }
+           return RED.bidi.isMirroringEnabled();
+    }
+
+    function _isBidiChar(c) {
+        return (c >= 0x05d0 && c <= 0x05ff)||
+               (c >= 0x0600 && c <= 0x065f)||
+               (c >= 0x066a && c <= 0x06ef)||
+               (c >= 0x06fa && c <= 0x07ff)||
+               (c >= 0xfb1d && c <= 0xfdff)||
+               (c >= 0xfe70 && c <= 0xfefc);
+    }
+
+    function _isLatinChar(c) {
+        return (c > 64 && c < 91) || (c > 96 && c < 123);
+    }
+
+    /**
+     * Enforces the text direction of a given string by adding
+     * UCC (Unicode Control Characters)
+     * @param value - the string
+     */
+    function _enforceTextDirectionWithUCC(value) {
+        if (value) {
+            var dir = RED.bidi.resolveBaseTextDir(value);
+            if (dir == "ltr") {
+               return LRE + value + PDF;
+            } else if (dir == "rtl") {
+               return RLE + value + PDF;
+            }
+        }
+        return value;
+    }
+
+    return {
+        enforceTextDirectionWithUCC: _enforceTextDirectionWithUCC,
+        isRTLValue : _isRTLValue
+    }
+})();

editor/js/bidi/bidi.js

@@ -0,0 +1,189 @@
+/**
+ * Copyright 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+RED.bidi = (function() {
+    var textDir = "";
+    var shaperType = "";
+    var calendarType = "";
+    
+    /**
+     * Indicates the type of bidi-support
+     * BTD : Base text direction
+     * NS : Numeric Shaping
+     * CALENDAR : National Calendar
+     * STT_ATTACH : Structure Text Support, it is using to call attach function located at format.js
+     * STT_GETHTML : STT_ATTACH : Structure Text Support, it is using to call getHtml function located at format.js
+     */
+    var _flags = {
+        BTD: 1,
+        NS: 2,
+        CALENDAR: 4,
+        STT_ATTACH: 8,
+        STT_GETHTML: 16
+    };
+    
+   /**
+    * Reverse component position when mirroring is enabled
+    */
+    var _componentPos = {};
+    
+    /**
+     * Check if browser language is RTL language
+     */
+    function _isMirroringEnabled() {
+        var isRTLLang = new RegExp("^(ar|he)").test(navigator.language);
+        if (isRTLLang) {
+        	_componentPos.left = "right";
+        	_componentPos.right = "left";
+            return true;
+        } else {
+        	_componentPos.left = "left";
+        	_componentPos.right = "right";
+            return false;
+        }
+    }
+   
+    /**
+     * @param val - the numeric shaping type: None , National or contextual
+     */
+    function _setNumericShapingType(val) {
+        shaperType = val;
+        _refreshView();
+    }
+    
+    /**
+     * Sets the national calendar preference
+     * @param val - the calendar type hijri, hebrew or gregorian
+     */
+    function _setCalendarType(val) {
+        calendarType = val;
+    }
+      
+    /**
+     * Formats the date according to the current selected calendar 
+     * @param date - the date object to be formatted
+     */
+    function _getGlobalizedDate(date) {
+        var options = {};
+        var lang = navigator.language;
+        if (calendarType === "hijri") {
+            options = lang + "-u-ca-islamic";
+        } else if (calendarType === "hebrew") {
+            options = lang + "-u-ca-hebrew";
+        }
+        return date.toLocaleString(options);
+    }  
+    
+    /**
+     * Sets the text direction preference
+     * @param dir - the text direction preference
+     */
+    function _setTextDirection(dir) {
+        textDir = dir;
+        _refreshView();
+        _enforceTextDirectionOnPage();
+    }
+    
+    /**
+     * Enforces the text direction for all the spans with style bidiAware under
+     * workspace or sidebar div
+     */
+    function _enforceTextDirectionOnPage() {
+        $("#workspace").find('span.bidiAware').each(function() {
+            $(this).attr("dir", _resolveBaseTextDir($(this).html()));
+        });
+        $("#sidebar").find('span.bidiAware').each(function() {
+            $(this).attr("dir", _resolveBaseTextDir($(this).text()));
+        });
+    }
+    
+    /**
+     * Determines the text direction of a given string.
+     * @param value - the string
+     */
+    function _resolveBaseTextDir(value) {
+        if (textDir == "auto") {
+            if (RED.bidi.baseTextDir.isRTLValue(value)) {
+                return "rtl";
+            } else {
+                return "ltr";
+            }
+        } else {
+            return textDir;
+        }
+    }
+    
+    /**
+     * Adds event listeners to the Input to ensure its text-direction attribute
+     * is properly set based on its content.
+     * @param input - the input field
+     */
+    function _prepareInput(input) {
+        input.on("keyup",_onInputChange).on("paste",_onInputChange).on("cut",_onInputChange);
+        // Set the initial text direction
+        _onInputChange.call(input);
+    }
+    
+    function _onInputChange() {
+        $(this).attr("dir", _resolveBaseTextDir($(this).val()));
+    }
+    
+    /**
+     * Refreshes the view whenever changing the user preferences
+     */
+    function _refreshView() {
+        RED.nodes.eachNode(function(n) { n.dirty = true;});
+        RED.view.redraw();
+        RED.palette.refresh();
+    }
+    
+    /**
+     * Applying bidi support for these features: base-text-dir ,Numeric-shaping or both, STT ,Calendar which is controlled by the flag value.
+     * @param value- the string to apply the bidi-support on it.
+     * @param flag - indicates the type of bidi-support (Base-text-dir ,Numeric-shaping or both, STT , Calendar)
+     * @param type - could be one of filepath, url, email
+     * @param args - pass additional arguments to the handler. generally null.
+     */
+    function _applyBidiSupport(value, flag, type, args) {
+        switch (flag) {
+        case 0:
+            value = RED.bidi.baseTextDir.enforceTextDirectionWithUCC(value);
+            return RED.bidi.numericShaping.shape(value, shaperType, textDir);
+        case 1:
+            return RED.bidi.baseTextDir.enforceTextDirectionWithUCC(value);
+        case 2:
+            return RED.bidi.numericShaping.shape(value, shaperType, textDir);
+        case 4:
+            return _getGlobalizedDate(value);
+        case 8:
+            return RED.bidi.format.attach(value, type, args, _isMirroringEnabled(), navigator.language);
+        case 16:
+            return RED.bidi.format.getHtml(value, type, args, _isMirroringEnabled(), navigator.language);
+        default:
+            return value;
+        }
+    }
+    return {
+        isMirroringEnabled: _isMirroringEnabled,
+        setNumericShapingType : _setNumericShapingType,
+        setCalendarType: _setCalendarType,
+        setTextDirection : _setTextDirection,
+        applyBidiSupport : _applyBidiSupport,
+        resolveBaseTextDir : _resolveBaseTextDir,
+        prepareInput: _prepareInput,
+        flags: _flags,
+        componentPos: _componentPos
+    }
+ })();

editor/js/bidi/format.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-RED.text.format = (function() {
+
+RED.bidi.format = (function() {
 
     var TextSegment = (function() {
         var TextSegment = function (obj) {
@@ -758,7 +759,7 @@ RED.text.format = (function() {
                 {
                         guiDir: isRtl ? "rtl" : "ltr",
                         dir: "ltr",
-                        points: "/\\:."
+                        points: "/\\:.&<>"
                 };
                 if (!parseOnly) {
                     return stext.parseAndDisplayStructure(text, fArgs, !!isHtml, locale);
@@ -876,7 +877,7 @@ RED.text.format = (function() {
                 {
                         guiDir: isRtl ? "rtl" : "ltr",
                         dir: "ltr",
-                        points: ":?#/@.[]="
+                        points: ":?#/@.[]=&<>"
                 };
                 if (!parseOnly) {
                     return stext.parseAndDisplayStructure(text, fArgs, !!isHtml, locale);
@@ -1242,7 +1243,7 @@ RED.text.format = (function() {
             element.dispatchEvent(event);
             return;
         }
-
+        
         var range = selection.getRangeAt(0);
         var tempRange = range.cloneRange(), startNode, startOffset;
         startNode = range.startContainer;
@@ -1304,7 +1305,19 @@ RED.text.format = (function() {
     }
 
     return {
-        /*!
+	    /**
+        * Returns the string representation of a given structured text
+        * @param text - the structured text
+        * @param type - could be one of filepath, url, email
+        * @param args - pass additional arguments to the handler. generally null.
+        * @param isRtl - indicates if the GUI is mirrored
+        * @param locale - the browser locale
+        */
+        getString:  function (text, type, args, isRtl, locale) {
+            return getHandler(type).format(text, args, isRtl, false, locale);
+        },
+
+        /**
         * Returns the HTML representation of a given structured text
         * @param text - the structured text
         * @param type - could be one of filepath, url, email
@@ -1315,7 +1328,7 @@ RED.text.format = (function() {
         getHtml: function (text, type, args, isRtl, locale) {
             return getHandler(type).format(text, args, isRtl, true, locale);
         },
-        /*!
+        /**
         * Handle Structured text correct display for a given HTML element.
         * @param element - the element  : should be of type div contenteditable=true
         * @param type - could be one of filepath, url, email

editor/js/bidi/numeric-shaping.js

@@ -0,0 +1,86 @@
+/**
+ * Copyright 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+RED.bidi.numericShaping = (function(){
+    var regex = /([0-9])|([\u0660-\u0669])|([\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FF\u0750-\u077F\u08A0-\u08E3\u200F\u202B\u202E\u2067\uFB50-\uFD3D\uFD40-\uFDCF\uFDF0-\uFDFC\uFDFE-\uFDFF\uFE70-\uFEFE]+)|([^0-9\u0660-\u0669\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FF\u0750-\u077F\u08A0-\u08E3\u200F\u202B\u202E\u2067\uFB50-\uFD3D\uFD40-\uFDCF\uFDF0-\uFDFC\uFDFE-\uFDFF\uFE70-\uFEFE\u0600-\u0607\u0609-\u060A\u060C\u060E-\u061A\u064B-\u066C\u0670\u06D6-\u06E4\u06E7-\u06ED\u06F0-\u06F9\u08E4-\u08FF\uFD3E-\uFD3F\uFDD0-\uFDEF\uFDFD\uFEFF\u0000-\u0040\u005B-\u0060\u007B-\u007F\u0080-\u00A9\u00AB-\u00B4\u00B6-\u00B9\u00BB-\u00BF\u00D7\u00F7\u02B9-\u02BA\u02C2-\u02CF\u02D2-\u02DF\u02E5-\u02ED\u02EF-\u02FF\u2070\u2074-\u207E\u2080-\u208E\u2100-\u2101\u2103-\u2106\u2108-\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A-\u213B\u2140-\u2144\u214A-\u214D\u2150-\u215F\u2189\uA720-\uA721\uA788\uFF01-\uFF20\uFF3B-\uFF40\uFF5B-\uFF65\uFFE0-\uFFE6\uFFE8-\uFFEE]+)/g;
+	
+    /**
+     * Converts the digits in the text to European or Arabic digits According to
+     * the shaperType & the textDir.
+     */
+    function _shape(text, shaperType, textDir) {
+        text = text.toString();
+        if(textDir === "auto"){
+        	textDir = RED.bidi.resolveBaseTextDir(text);
+        }
+        if (!text) { 
+            return text;
+        }
+        switch (shaperType) {
+            case "defaultNumeral":
+                return _shapeEuropean(text);
+            case "national":
+                return _shapeArabic(text);
+            case "contextual":
+                return _shapeContextual(text, textDir === "rtl" ? 2 : 1);
+            default:
+                return text;
+        }
+    }
+    
+    /**
+     * Converts the digits in the text to European digits.
+     */
+    function _shapeEuropean(text) {
+        return text.replace(/[\u0660-\u0669]/g, function(c) {
+            return c.charCodeAt(0) - 1632;
+        });
+    }
+    
+    /**
+     * Converts the digits in the text to Arabic digits.
+     */
+    function _shapeArabic(text) {
+        return text.replace(/[0-9]/g, function(c) {
+            return String.fromCharCode(parseInt(c) + 1632);
+        });
+    }
+	
+    /**
+     * Converts the digits in the text to European or Arabic digits
+     * According to the type of the preceding strong character.
+     * @param context:The current effective context.
+     * Allowed values:
+     * '1': European context
+     * '2': Arabic context
+     */
+    function _shapeContextual(text, context) {
+        return text.replace(regex, function(match, latinDigit, arabicDigit, strongArabic, strongLatin){
+            if (latinDigit) {
+                return (context === 2) ? String.fromCharCode(parseInt(latinDigit) + 1632) : latinDigit;
+            } else if (arabicDigit) {
+                return (context === 1) ? arabicDigit.charCodeAt(0) - 1632 : arabicDigit;
+            } else if (strongArabic) {
+                context = 2;
+            } else if (strongLatin) {
+                context = 1;
+            }
+            return match;
+        });
+    }
+    return {
+        shape: _shape
+    }
+})();

editor/js/comms.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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) {
@@ -74,41 +64,27 @@ RED.comms = (function() {
             }
         }
         ws.onmessage = function(event) {
-            var message = JSON.parse(event.data);
-            if (message.auth) {
-                if (pendingAuth) {
-                    if (message.auth === "ok") {
-                        pendingAuth = false;
-                        completeConnection();
-                    } else if (message.auth === "fail") {
-                        // anything else is an error...
-                        active = false;
-                        RED.user.login({updateMenu:true},function() {
-                            connectWS();
-                        })
-                    }
-                } else if (message.auth === "fail") {
-                    // Our current session has expired
+            var msg = JSON.parse(event.data);
+            if (pendingAuth && msg.auth) {
+                if (msg.auth === "ok") {
+                    pendingAuth = false;
+                    completeConnection();
+                } else if (msg.auth === "fail") {
+                    // anything else is an error...
                     active = false;
                     RED.user.login({updateMenu:true},function() {
                         connectWS();
                     })
                 }
-            } else {
-                // Otherwise, 'message' is an array of actual comms messages
-                for (var m = 0; m < message.length; m++) {
-                    var msg = message[m];
-                    if (msg.topic) {
-                        for (var t in subscriptions) {
-                            if (subscriptions.hasOwnProperty(t)) {
-                                var re = new RegExp("^"+t.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
-                                if (re.test(msg.topic)) {
-                                    var subscribers = subscriptions[t];
-                                    if (subscribers) {
-                                        for (var i=0;i<subscribers.length;i++) {
-                                            subscribers[i](msg.topic,msg.data);
-                                        }
-                                    }
+            } else if (msg.topic) {
+                for (var t in subscriptions) {
+                    if (subscriptions.hasOwnProperty(t)) {
+                        var re = new RegExp("^"+t.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
+                        if (re.test(msg.topic)) {
+                            var subscribers = subscriptions[t];
+                            if (subscribers) {
+                                for (var i=0;i<subscribers.length;i++) {
+                                    subscribers[i](msg.topic,msg.data);
                                 }
                             }
                         }
@@ -142,10 +118,10 @@ RED.comms = (function() {
                         connectWS();
                     } else {
                         var msg = RED._("notification.errors.lostConnectionReconnect",{time: connectCountdown})+' <a href="#">'+ RED._("notification.errors.lostConnectionTry")+'</a>';
-                        errornotification.update(msg,{silent:true});
-                        $(errornotification).find("a").on("click", function(e) {
+                        errornotification.update(msg);
+                        $(errornotification).find("a").click(function(e) {
                             e.preventDefault();
-                            errornotification.update(RED._("notification.errors.lostConnection"),{silent:true});
+                            errornotification.update(RED._("notification.errors.lostConnection"));
                             clearInterval(connectCountdownTimer);
                             connectWS();
                         })

editor/js/events.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2015, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,19 +32,14 @@
              }
          }
      }
-     function emit() {
-         var evt = arguments[0]
-         var args = Array.prototype.slice.call(arguments,1);
-         if (RED.events.DEBUG) {
-             console.warn(evt,args);
-         }
+     function emit(evt,arg) {
          if (handlers[evt]) {
              for (var i=0;i<handlers[evt].length;i++) {
                  try {
-                     handlers[evt][i].apply(null, args);
+                     handlers[evt][i](arg);
                  } catch(err) {
-                     console.warn("RED.events.emit error: ["+evt+"] "+(err.toString()));
-                     console.warn(err);
+                     console.log("RED.events.emit error: ["+evt+"] "+(err.toString()));
+                     console.log(err);
                  }
              }
 

editor/js/history.js

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

editor/js/i18n.js

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2013, 2015 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.i18n = (function() {
+
+    return {
+        init: function(done) {
+            i18n.init({
+                resGetPath: 'locales/__ns__',
+                dynamicLoad: false,
+                load:'current',
+                ns: {
+                    namespaces: ["editor","node-red"],
+                    defaultNs: "editor"
+                },
+                fallbackLng: ['en-US'],
+                useCookie: false
+            },function() {
+                done();
+            });
+            RED["_"] = function() {
+                return i18n.t.apply(null,arguments);
+            }
+
+        },
+        loadCatalog: function(namespace,done) {
+            i18n.loadNamespace(namespace,done);
+        }
+    }
+})();

editor/js/main.js

@@ -0,0 +1,283 @@
+/**
+ * Copyright 2013, 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.
+ **/
+var RED = (function() {
+
+
+    function loadNodeList() {
+        $.ajax({
+            headers: {
+                "Accept":"application/json"
+            },
+            cache: false,
+            url: 'nodes',
+            success: function(data) {
+                RED.nodes.setNodeList(data);
+
+                var nsCount = 0;
+                for (var i=0;i<data.length;i++) {
+                    var ns = data[i];
+                    if (ns.module != "node-red") {
+                        nsCount++;
+                        RED.i18n.loadCatalog(ns.id, function() {
+                            nsCount--;
+                            if (nsCount === 0) {
+                                loadNodes();
+                            }
+                        });
+                    }
+                }
+                if (nsCount === 0) {
+                    loadNodes();
+                }
+            }
+        });
+    }
+
+    function loadNodes() {
+        $.ajax({
+            headers: {
+                "Accept":"text/html"
+            },
+            cache: false,
+            url: 'nodes',
+            success: function(data) {
+                $("body").append(data);
+                $("body").i18n();
+                $("#palette > .palette-spinner").hide();
+                $(".palette-scroll").removeClass("hide");
+                $("#palette-search").removeClass("hide");
+                loadFlows();
+            }
+        });
+    }
+
+    function loadFlows() {
+        $.ajax({
+            headers: {
+                "Accept":"application/json",
+            },
+            cache: false,
+            url: 'flows',
+            success: function(nodes) {
+                var currentHash = window.location.hash;
+                RED.nodes.version(nodes.rev);
+                RED.nodes.import(nodes.flows);
+                RED.nodes.dirty(false);
+                RED.view.redraw(true);
+                if (/^#flow\/.+$/.test(currentHash)) {
+                    RED.workspaces.show(currentHash.substring(6));
+                }
+                RED.comms.subscribe("status/#",function(topic,msg) {
+                    var parts = topic.split("/");
+                    var node = RED.nodes.node(parts[1]);
+                    if (node) {
+                        if (msg.hasOwnProperty("text")) {
+                            msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
+                        }
+                        node.status = msg;
+                        if (statusEnabled) {
+                            node.dirty = true;
+                            RED.view.redraw();
+                        }
+                    }
+                });
+                RED.comms.subscribe("node/#",function(topic,msg) {
+                    var i,m;
+                    var typeList;
+                    var info;
+
+                    if (topic == "node/added") {
+                        var addedTypes = [];
+                        for (i=0;i<msg.length;i++) {
+                            m = msg[i];
+                            var id = m.id;
+                            RED.nodes.addNodeSet(m);
+                            addedTypes = addedTypes.concat(m.types);
+                            RED.i18n.loadCatalog(id, function() {
+                                $.get('nodes/'+id, function(data) {
+                                    $("body").append(data);
+                                });
+                            });
+                        }
+                        if (addedTypes.length) {
+                            typeList = "<ul><li>"+addedTypes.join("</li><li>")+"</li></ul>";
+                            RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
+                        }
+                    } else if (topic == "node/removed") {
+                        for (i=0;i<msg.length;i++) {
+                            m = msg[i];
+                            info = RED.nodes.removeNodeSet(m.id);
+                            if (info.added) {
+                                typeList = "<ul><li>"+m.types.join("</li><li>")+"</li></ul>";
+                                RED.notify(RED._("palette.event.nodeRemoved", {count:m.types.length})+typeList,"success");
+                            }
+                        }
+                    } else if (topic == "node/enabled") {
+                        if (msg.types) {
+                            info = RED.nodes.getNodeSet(msg.id);
+                            if (info.added) {
+                                RED.nodes.enableNodeSet(msg.id);
+                                typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                                RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
+                            } else {
+                                $.get('nodes/'+msg.id, function(data) {
+                                    $("body").append(data);
+                                    typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                                    RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
+                                });
+                            }
+                        }
+                    } else if (topic == "node/disabled") {
+                        if (msg.types) {
+                            RED.nodes.disableNodeSet(msg.id);
+                            typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                            RED.notify(RED._("palette.event.nodeDisabled", {count:msg.types.length})+typeList,"success");
+                        }
+                    }
+                    // Refresh flow library to ensure any examples are updated
+                    RED.library.loadFlowLibrary();
+                });
+            }
+        });
+    }
+
+    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>';
+
+            RED.sidebar.info.set(aboutHeader+marked(data));
+            RED.sidebar.info.show();
+        });
+    }
+
+    var statusEnabled = false;
+    function toggleStatus(state) {
+        statusEnabled = state;
+        RED.view.status(statusEnabled);
+    }
+
+    function loadEditor() {
+
+        var menuOptions = [];
+        menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
+            {id:"menu-item-view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:RED.view.toggleShowGrid},
+            {id:"menu-item-view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:RED.view.toggleSnapGrid},
+            {id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:toggleStatus, selected: true},
+            null,
+            {id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
+                {id:"menu-item-bidi-default",toggle:"text-direction",label:RED._("menu.label.view.defaultDir"),selected: true, onselect:function(s) { if (s) {RED.bidi.setTextDirection("")}}},
+                {id:"menu-item-bidi-ltr",toggle:"text-direction",label:RED._("menu.label.view.ltr"), onselect:function(s) { if (s) {RED.bidi.setTextDirection("ltr")}}},
+                {id:"menu-item-bidi-rtl",toggle:"text-direction",label:RED._("menu.label.view.rtl"), onselect:function(s) { if (s) {RED.bidi.setTextDirection("rtl")}}},
+                {id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if (s) {RED.bidi.setTextDirection("auto")}}}
+            ]},
+            {id:"menu-item-numerals",label:RED._("menu.label.view.numericShaping"),options:[
+               {id:"menu-item-numerals-default",toggle:"numeral-type",label:RED._("menu.label.view.defaultNumeral"),selected: true, onselect:function(s) { if(s){RED.bidi.setNumericShapingType("defaultNumeral")}}},
+               {id:"menu-item-numerals-national",toggle:"numeral-type",label:RED._("menu.label.view.national"), onselect:function(s) { if (s) {RED.bidi.setNumericShapingType("national")}}},
+               {id:"menu-item-numerals-contextual",toggle:"numeral-type",label:RED._("menu.label.view.contextual"), onselect:function(s) { if (s){RED.bidi.setNumericShapingType("contextual")}}} 
+            ]},
+            {id:"menu-item-calendars",label:RED._("menu.label.view.calendar"),options:[
+               {id:"menu-item-calendars-default",toggle:"calendar-type",label:RED._("menu.label.view.defaultCalendar"),selected: true, onselect:function(s) { if(s) {RED.bidi.setCalendarType("gregorian")}}},
+               {id:"menu-item-calendars-hijri",toggle:"calendar-type",label:RED._("menu.label.view.hijri"), onselect:function(s) { if (s) {RED.bidi.setCalendarType("hijri")}}},
+               {id:"menu-item-calendars-hebrew",toggle:"calendar-type",label:RED._("menu.label.view.hebrew"), onselect:function(s) { if (s) {RED.bidi.setCalendarType("hebrew")}}}
+            ]},
+            null,
+            {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}
+        ]});
+        menuOptions.push(null);
+        menuOptions.push({id:"menu-item-import",label:RED._("menu.label.import"),options:[
+            {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:RED.clipboard.import},
+            {id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
+        ]});
+        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),disabled:true,options:[
+            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:RED.clipboard.export},
+            {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:RED.library.export}
+        ]});
+        menuOptions.push(null);
+        menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:RED.search.show});
+        menuOptions.push(null);
+        menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:function() {}});
+        menuOptions.push({id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
+            {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:RED.workspaces.add},
+            {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:RED.workspaces.edit},
+            {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:RED.workspaces.remove}
+        ]});
+        menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [
+            {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:RED.subflow.createSubflow},
+            {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:RED.subflow.convertToSubflow},
+        ]});
+        menuOptions.push(null);
+        if (RED.settings.theme('palette.editable') !== false) {
+            RED.palette.editor.init();
+            menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:RED.palette.editor.show});
+            menuOptions.push(null);
+        }
+
+        menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:RED.keyboard.showHelp});
+        menuOptions.push({id:"menu-item-help",
+            label: RED.settings.theme("menu.menu-item-help.label","Node-RED website"),
+            href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
+        });
+        menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: showAbout });
+
+        RED.menu.init({id:"btn-sidemenu",options: menuOptions});
+
+        //apply rtl direction on body tag in case of GUI mirroring is enabled
+        if (RED.bidi.isMirroringEnabled()) {
+            $("body").attr("dir","rtl");
+        }
+        
+        RED.user.init();
+
+        RED.library.init();
+        RED.palette.init();
+        RED.sidebar.init();
+        RED.subflow.init();
+        RED.workspaces.init();
+        RED.clipboard.init();
+        RED.search.init();
+        RED.view.init();
+        RED.editor.init();
+
+        RED.deploy.init(RED.settings.theme("deployButton",null));
+
+        RED.keyboard.add("workspace", /* ? */ 191,{shift:true},function() {RED.keyboard.showHelp();d3.event.preventDefault();});
+        RED.comms.connect();
+
+        $("#main-container").show();
+        $(".header-toolbar").show();
+
+        loadNodeList();
+    }
+
+    $(function() {
+
+        if ((window.location.hostname !== "localhost") && (window.location.hostname !== "127.0.0.1")) {
+            document.title = document.title+" : "+window.location.hostname;
+        }
+
+        ace.require("ace/ext/language_tools");
+
+        RED.i18n.init(function() {
+            RED.settings.init(loadEditor);
+        })
+    });
+
+
+    return {
+    };
+})();

editor/js/settings.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014 IBM, Antoine Aflalo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 RED.settings = (function () {
 
     var loadedSettings = {};
-    var userSettings = {};
-    var settingsDirty = false;
-    var pendingSave;
 
     var hasLocalStorage = function () {
         try {
@@ -34,50 +31,27 @@ RED.settings = (function () {
         if (!hasLocalStorage()) {
             return;
         }
-        if (key === "auth-tokens") {
-            localStorage.setItem(key, JSON.stringify(value));
-        } else {
-            RED.utils.setMessageProperty(userSettings,key,value);
-            saveUserSettings();
-        }
+        localStorage.setItem(key, JSON.stringify(value));
     };
 
     /**
      * If the key is not set in the localStorage it returns <i>undefined</i>
      * Else return the JSON parsed value
      * @param key
-     * @param defaultIfUndefined
      * @returns {*}
      */
-    var get = function (key,defaultIfUndefined) {
+    var get = function (key) {
         if (!hasLocalStorage()) {
             return undefined;
         }
-        if (key === "auth-tokens") {
-            return JSON.parse(localStorage.getItem(key));
-        } else {
-            var v;
-            try { v = RED.utils.getMessageProperty(userSettings,key); } catch(err) {}
-            if (v === undefined) {
-                try { v = RED.utils.getMessageProperty(RED.settings,key); } catch(err) {}
-            }
-            if (v === undefined) {
-                v = defaultIfUndefined;
-            }
-            return v;
-        }
+        return JSON.parse(localStorage.getItem(key));
     };
 
     var remove = function (key) {
         if (!hasLocalStorage()) {
             return;
         }
-        if (key === "auth-tokens") {
-            localStorage.removeItem(key);
-        } else {
-            delete userSettings[key];
-            saveUserSettings();
-        }
+        localStorage.removeItem(key);
     };
 
     var setProperties = function(data) {
@@ -94,26 +68,18 @@ RED.settings = (function () {
         loadedSettings = data;
     };
 
-    var setUserSettings = function(data) {
-        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);
@@ -136,17 +102,11 @@ RED.settings = (function () {
             url: 'settings',
             success: function (data) {
                 setProperties(data);
-                if (!RED.settings.user || RED.settings.user.anonymous) {
+                if (RED.settings.user && RED.settings.user.anonymous) {
                     RED.settings.remove("auth-tokens");
                 }
                 console.log("Node-RED: " + data.version);
-                console.groupCollapsed("Versions");
-                console.log("jQuery",$().jquery)
-                console.log("jQuery UI",$.ui.version);
-                console.log("ACE",ace.version);
-                console.log("D3",d3.version);
-                console.groupEnd();
-                loadUserSettings(done);
+                done();
             },
             error: function(jqXHR,textStatus,errorThrown) {
                 if (jqXHR.status === 401) {
@@ -155,52 +115,12 @@ RED.settings = (function () {
                     }
                     RED.user.login(function() { load(done); });
                 } else {
-                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
+                    console.log("Unexpected error:",jqXHR.status,textStatus);
                 }
             }
         });
     };
 
-    function loadUserSettings(done) {
-        $.ajax({
-            headers: {
-                "Accept": "application/json"
-            },
-            dataType: "json",
-            cache: false,
-            url: 'settings/user',
-            success: function (data) {
-                setUserSettings(data);
-                done();
-            },
-            error: function(jqXHR,textStatus,errorThrown) {
-                console.log("Unexpected error loading user settings:",jqXHR.status,textStatus);
-            }
-        });
-    }
-
-    function saveUserSettings() {
-        if (RED.user.hasPermission("settings.write")) {
-            if (pendingSave) {
-                clearTimeout(pendingSave);
-            }
-            pendingSave = setTimeout(function() {
-                pendingSave = null;
-                $.ajax({
-                    method: 'POST',
-                    contentType: 'application/json',
-                    url: 'settings/user',
-                    data: JSON.stringify(userSettings),
-                    success: function (data) {
-                    },
-                    error: function(jqXHR,textStatus,errorThrown) {
-                        console.log("Unexpected error saving user settings:",jqXHR.status,textStatus);
-                    }
-                });
-            },300);
-        }
-    }
-
     function theme(property,defaultValue) {
         if (!RED.settings.editorTheme) {
             return defaultValue;
@@ -223,10 +143,10 @@ RED.settings = (function () {
     return {
         init: init,
         load: load,
-        loadUserSettings: loadUserSettings,
         set: set,
         get: get,
         remove: remove,
         theme: theme
     }
-})();
+})
+();

editor/js/ui/clipboard.js

@@ -0,0 +1,307 @@
+/**
+ * Copyright 2015 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+
+RED.clipboard = (function() {
+
+    var dialog;
+    var dialogContainer;
+    var exportNodesDialog;
+    var importNodesDialog;
+
+    function setupDialogs() {
+        dialog = $('<div id="clipboard-dialog" class="hide node-red-dialog"><form class="dialog-form form-horizontal"></form></div>')
+            .appendTo("body")
+            .dialog({
+                modal: true,
+                autoOpen: false,
+                width: 500,
+                resizable: false,
+                buttons: [
+                    {
+                        id: "clipboard-dialog-cancel",
+                        text: RED._("common.label.cancel"),
+                        click: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-close",
+                        class: "primary",
+                        text: RED._("common.label.close"),
+                        click: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-copy",
+                        class: "primary",
+                        text: RED._("clipboard.export.copy"),
+                        click: function() {
+                            $("#clipboard-export").select();
+                            document.execCommand("copy");
+                            document.getSelection().removeAllRanges();
+                            RED.notify(RED._("clipboard.nodesExported"));
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-ok",
+                        class: "primary",
+                        text: RED._("common.label.import"),
+                        click: function() {
+                            RED.view.importNodes($("#clipboard-import").val(),$("#import-tab > a.selected").attr('id') === 'import-tab-new');
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                ],
+                open: function(e) {
+                    $(this).parent().find(".ui-dialog-titlebar-close").hide();
+                },
+                close: function(e) {
+                }
+            });
+
+        dialogContainer = dialog.children(".dialog-form");
+
+        exportNodesDialog =
+            '<div class="form-row">'+
+                '<label style="width:auto;margin-right: 10px;" data-i18n="clipboard.export.copy"></label>'+
+                '<span id="export-range-group" class="button-group">'+
+                    '<a id="export-range-selected" class="editor-button toggle" href="#" data-i18n="clipboard.export.selected"></a>'+
+                    '<a id="export-range-flow" class="editor-button toggle" href="#" data-i18n="clipboard.export.current"></a>'+
+                    '<a id="export-range-full" class="editor-button toggle" href="#" data-i18n="clipboard.export.all"></a>'+
+                '</span>'+
+                '</div>'+
+            '<div class="form-row">'+
+                '<textarea readonly style="resize: none; width: 100%; border-radius: 4px;font-family: monospace; font-size: 12px; background:#f3f3f3; padding-left: 0.5em; box-sizing:border-box;" id="clipboard-export" rows="5"></textarea>'+
+            '</div>'+
+            '<div class="form-row" style="text-align: right;">'+
+                '<span id="export-format-group" class="button-group">'+
+                    '<a id="export-format-mini" class="editor-button editor-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
+                    '<a id="export-format-full" class="editor-button editor-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
+                '</span>'+
+            '</div>';
+
+        importNodesDialog = '<div class="form-row">'+
+            '<textarea style="resize: none; width: 100%; border-radius: 0px;font-family: monospace; font-size: 12px; background:#eee; padding-left: 0.5em; box-sizing:border-box;" id="clipboard-import" rows="5" placeholder="'+
+            RED._("clipboard.pasteNodes")+
+            '"></textarea>'+
+            '</div>'+
+            '<div class="form-row">'+
+            '<label style="width:auto;margin-right: 10px;" data-i18n="clipboard.import.import"></label>'+
+            '<span id="import-tab" class="button-group">'+
+                '<a id="import-tab-current" class="editor-button toggle selected" href="#" data-i18n="clipboard.export.current"></a>'+
+                '<a id="import-tab-new" class="editor-button toggle" href="#" data-i18n="clipboard.import.newFlow"></a>'+
+            '</span>'+
+            '</div>';
+    }
+
+    function validateImport() {
+        var importInput = $("#clipboard-import");
+        var v = importInput.val();
+        v = v.substring(v.indexOf('['),v.lastIndexOf(']')+1);
+        try {
+            JSON.parse(v);
+            importInput.removeClass("input-error");
+            importInput.val(v);
+            $("#clipboard-dialog-ok").button("enable");
+        } catch(err) {
+            if (v !== "") {
+                importInput.addClass("input-error");
+            }
+            $("#clipboard-dialog-ok").button("disable");
+        }
+    }
+
+    function importNodes() {
+        dialogContainer.empty();
+        dialogContainer.append($(importNodesDialog));
+        dialogContainer.i18n();
+
+        $("#clipboard-dialog-ok").show();
+        $("#clipboard-dialog-cancel").show();
+        $("#clipboard-dialog-close").hide();
+        $("#clipboard-dialog-copy").hide();
+        $("#clipboard-dialog-ok").button("disable");
+        $("#clipboard-import").keyup(validateImport);
+        $("#clipboard-import").on('paste',function() { setTimeout(validateImport,10)});
+
+        $("#import-tab > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+        });
+
+        dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
+    }
+
+    function exportNodes() {
+        dialogContainer.empty();
+        dialogContainer.append($(exportNodesDialog));
+        dialogContainer.i18n();
+
+        $("#export-format-group > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+
+            var flow = $("#clipboard-export").val();
+            if (flow.length > 0) {
+                var nodes = JSON.parse(flow);
+
+                var format = $(this).attr('id');
+                if (format === 'export-format-full') {
+                    flow = JSON.stringify(nodes,null,4);
+                } else {
+                    flow = JSON.stringify(nodes);
+                }
+                $("#clipboard-export").val(flow);
+            }
+        });
+        $("#export-range-group > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+            var type = $(this).attr('id');
+            var flow = "";
+            var nodes = null;
+            if (type === 'export-range-selected') {
+                var selection = RED.view.selection();
+                nodes = RED.nodes.createExportableNodeSet(selection.nodes);
+            } else if (type === 'export-range-flow') {
+                var activeWorkspace = RED.workspaces.active();
+                nodes = RED.nodes.filterNodes({z:activeWorkspace});
+                var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
+                nodes.unshift(parentNode);
+                nodes = RED.nodes.createExportableNodeSet(nodes);
+            } else if (type === 'export-range-full') {
+                nodes = RED.nodes.createCompleteNodeSet(false);
+            }
+            if (nodes !== null) {
+                if (RED.settings.flowFilePretty) {
+                    flow = JSON.stringify(nodes,null,4);
+                } else {
+                    flow = JSON.stringify(nodes);
+                }
+            }
+            if (flow.length > 0) {
+                $("#export-copy").removeClass('disabled');
+            } else {
+                $("#export-copy").addClass('disabled');
+            }
+            $("#clipboard-export").val(flow);
+        })
+
+        $("#clipboard-dialog-ok").hide();
+        $("#clipboard-dialog-cancel").hide();
+        $("#clipboard-dialog-copy").hide();
+        $("#clipboard-dialog-close").hide();
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            $("#export-range-selected").click();
+        } else {
+            $("#export-range-selected").addClass('disabled').removeClass('selected');
+            $("#export-range-flow").click();
+        }
+        if (RED.settings.flowFilePretty) {
+            $("#export-format-full").click();
+        } else {
+            $("#export-format-mini").click();
+        }
+        $("#clipboard-export")
+            .focus(function() {
+                var textarea = $(this);
+                textarea.select();
+                textarea.mouseup(function() {
+                    textarea.unbind("mouseup");
+                    return false;
+                })
+            });
+        dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
+
+        setTimeout(function() {
+            $("#clipboard-export").focus();
+            if (!document.queryCommandEnabled("copy")) {
+                $("#clipboard-dialog-cancel").hide();
+                $("#clipboard-dialog-close").show();
+            } else {
+                $("#clipboard-dialog-cancel").show();
+                $("#clipboard-dialog-copy").show();
+            }
+
+        },0);
+    }
+
+    function hideDropTarget() {
+        $("#dropTarget").hide();
+        RED.keyboard.remove(/* ESCAPE */ 27);
+    }
+
+    return {
+        init: function() {
+            setupDialogs();
+            RED.events.on("view:selection-changed",function(selection) {
+                if (!selection.nodes) {
+                    RED.menu.setDisabled("menu-item-export",true);
+                    RED.menu.setDisabled("menu-item-export-clipboard",true);
+                    RED.menu.setDisabled("menu-item-export-library",true);
+                } else {
+                    RED.menu.setDisabled("menu-item-export",false);
+                    RED.menu.setDisabled("menu-item-export-clipboard",false);
+                    RED.menu.setDisabled("menu-item-export-library",false);
+                }
+            });
+            RED.keyboard.add("workspace", /* e */ 69,{ctrl:true},function(){exportNodes();d3.event.preventDefault();});
+            RED.keyboard.add("workspace", /* i */ 73,{ctrl:true},function(){importNodes();d3.event.preventDefault();});
+
+            $('#chart').on("dragenter",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
+                    $("#dropTarget").css({display:'table'});
+                    RED.keyboard.add("*", /* ESCAPE */ 27,hideDropTarget);
+                }
+            });
+
+            $('#dropTarget').on("dragover",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
+                    event.preventDefault();
+                }
+            })
+            .on("dragleave",function(event) {
+                hideDropTarget();
+            })
+            .on("drop",function(event) {
+                var data = event.originalEvent.dataTransfer.getData("text/plain");
+                hideDropTarget();
+                data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
+                RED.view.importNodes(data);
+                event.preventDefault();
+            });
+
+        },
+        import: importNodes,
+        export: exportNodes
+    }
+})();

editor/js/ui/common/editableList.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 /**
  * options:
  *   - addButton : boolean|string - text for add label, default 'add'
- *   - buttons : array - list of custom buttons (objects with fields 'label', 'icon', 'title', 'click')
  *   - height : number|'auto'
  *   - resize : function - called when list as a whole is resized
  *   - resizeItem : function(item) - called to resize individual item
@@ -28,22 +27,13 @@
  *   - removable : boolean - whether to display delete button on items
  *   - addItem : function(row,index,itemData) - when an item is added
  *   - removeItem : function(itemData) - called when an item is removed
- *   - filter : function(itemData) - called for each item to determine if it should be shown
- *   - sort : function(itemDataA,itemDataB) - called to sort items
- *   - scrollOnAdd : boolean - whether to scroll to newly added items
  * methods:
  *   - addItem(itemData)
- *   - insertItemAt : function(data,index) - add an item at the specified index
- *   - removeItem(itemData, detach) - remove the item. Optionally detach to preserve any event handlers on the item's label
- *   - getItemAt(index)
- *   - indexOf(itemData)
+ *   - removeItem(itemData)
  *   - width(width)
  *   - height(height)
  *   - items()
  *   - empty()
- *   - filter(filter)
- *   - sort(sort)
- *   - length()
  */
     $.widget( "nodered.editableList", {
         _create: function() {
@@ -54,75 +44,34 @@
             this.uiContainer = this.element
                 .wrap( "<div>" )
                 .parent();
+            this.topContainer = this.uiContainer.wrap("<div>").parent();
 
-            if (this.options.header) {
-                this.options.header.addClass("red-ui-editableList-header");
-                this.borderContainer = this.uiContainer.wrap("<div>").parent();
-                this.borderContainer.prepend(this.options.header);
-                this.topContainer = this.borderContainer.wrap("<div>").parent();
-            } else {
-                this.topContainer = this.uiContainer.wrap("<div>").parent();
-            }
             this.topContainer.addClass('red-ui-editableList');
-            if (this.options.class) {
-                this.topContainer.addClass(this.options.class);
-            }
-
-            var buttons = this.options.buttons || [];
 
             if (this.options.addButton !== false) {
-                var addLabel, addTittle;
+                var addLabel;
                 if (typeof this.options.addButton === 'string') {
                     addLabel = this.options.addButton
                 } else {
                     if (RED && RED._) {
                         addLabel = RED._("editableList.add");
-                        addTitle = RED._("editableList.addTitle");
                     } else {
                         addLabel = 'add';
-                        addTitle = 'add new item';
                     }
                 }
-                buttons.unshift({
-                    label: addLabel,
-                    icon: "fa fa-plus",
-                    click: function(evt) {
-                        that.addItem({});
-                    },
-                    title: addTitle
-                });
-            }
-
-            buttons.forEach(function(button) {
-                var element = $('<a href="#" class="red-ui-button red-ui-button-small red-ui-editableList-addButton" style="margin-top: 4px; margin-right: 5px;"></a>')
-                    .appendTo(that.topContainer)
-                    .on("click", function(evt) {
+                $('<a href="#" class="editor-button editor-button-small" style="margin-top: 4px;"><i class="fa fa-plus"></i> '+addLabel+'</a>')
+                    .appendTo(this.topContainer)
+                    .click(function(evt) {
                         evt.preventDefault();
-                        if (button.click !== undefined) {
-                            button.click(evt);
-                        }
+                        that.addItem({});
                     });
-                    
-                if (button.title) {
-                    element.attr("title", button.title);
-                }
-                if (button.icon) {
-                    element.append($("<i></i>").attr("class", button.icon));
-                }
-                if (button.label) {
-                    element.append($("<span></span>").text(" " + button.label));
-                }
-            });
- 
+            }
             if (this.element.css("position") === "absolute") {
                 ["top","left","bottom","right"].forEach(function(s) {
                     var v = that.element.css(s);
-                    if (v!=="auto" && v!=="") {
+                    if (s!=="auto" && s!=="") {
                         that.topContainer.css(s,v);
                         that.uiContainer.css(s,"0");
-                        if (s === "top" && that.options.header) {
-                            that.uiContainer.css(s,"20px")
-                        }
                         that.element.css(s,'auto');
                     }
                 })
@@ -131,11 +80,6 @@
                 this.uiContainer.css("position","absolute");
 
             }
-            if (this.options.header) {
-                this.borderContainer.addClass("red-ui-editableList-border");
-            } else {
-                this.uiContainer.addClass("red-ui-editableList-border");
-            }
             this.uiContainer.addClass("red-ui-editableList-container");
 
             this.uiHeight = this.element.height();
@@ -151,11 +95,6 @@
                 this.uiContainer.css("minHeight",minHeight);
                 this.element.css("minHeight",0);
             }
-            var maxHeight = this.element.css("maxHeight");
-            if (maxHeight !== '0px') {
-                this.uiContainer.css("maxHeight",maxHeight);
-                this.element.css("maxHeight",null);
-            }
             if (this.options.height !== 'auto') {
                 this.uiContainer.css("overflow-y","scroll");
                 if (!isNaN(this.options.height)) {
@@ -215,22 +154,17 @@
             if (this.options.resizeItem) {
                 var that = this;
                 this.element.children().each(function(i) {
-                    that.options.resizeItem($(this).children(".red-ui-editableList-item-content"),i);
+                    that.options.resizeItem($(this).find(".red-ui-editableList-item-content"),i);
                 });
             }
         },
         _destroy: function() {
-            if (this.topContainer) {
-                var tc = this.topContainer;
-                delete this.topContainer;
-                tc.remove();
-            }
         },
         _refreshFilter: function() {
             var that = this;
             var count = 0;
             if (!this.activeFilter) {
-                return this.element.children().show();
+                this.element.children().show();
             }
             var items = this.items();
             items.each(function (i,el) {
@@ -255,7 +189,7 @@
                 var items = this.element.children();
                 var that = this;
                 items.sort(function(A,B) {
-                    return that.activeSort($(A).children(".red-ui-editableList-item-content").data('data'),$(B).children(".red-ui-editableList-item-content").data('data'));
+                    return that.activeSort($(A).find(".red-ui-editableList-item-content").data('data'),$(B).find(".red-ui-editableList-item-content").data('data'));
                 });
                 $.each(items,function(idx,li) {
                     that.element.append(li);
@@ -270,49 +204,10 @@
             this.uiHeight = desiredHeight;
             this._resize();
         },
-        getItemAt: function(index) {
-            var items = this.items();
-            if (index >= 0 && index < items.length) {
-                return $(items[index]).data('data');
-            } else {
-                return;
-            }
-        },
-        indexOf: function(data) {
-            var items = this.items();
-            for (var i=0;i<items.length;i++) {
-                if ($(items[i]).data('data') === data) {
-                    return i
-                }
-            }
-            return -1
-        },
-        insertItemAt: function(data,index) {
+        addItem: function(data) {
             var that = this;
             data = data || {};
             var li = $('<li>');
-            var row = $('<div/>').addClass("red-ui-editableList-item-content").appendTo(li);
-            row.data('data',data);
-            if (this.options.sortable === true) {
-                $('<i class="red-ui-editableList-item-handle fa fa-bars"></i>').appendTo(li);
-                li.addClass("red-ui-editableList-item-sortable");
-            }
-            if (this.options.removable) {
-                var deleteButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(li);
-                $('<i/>',{class:"fa fa-remove"}).appendTo(deleteButton);
-                li.addClass("red-ui-editableList-item-removable");
-                deleteButton.on("click", function(evt) {
-                    evt.preventDefault();
-                    var data = row.data('data');
-                    li.addClass("red-ui-editableList-item-deleting")
-                    li.fadeOut(300, function() {
-                        $(this).remove();
-                        if (that.options.removeItem) {
-                            that.options.removeItem(data);
-                        }
-                    });
-                });
-            }
             var added = false;
             if (this.activeSort) {
                 var items = this.items();
@@ -327,17 +222,32 @@
                 });
             }
             if (!added) {
-                if (index <= 0) {
-                    li.prependTo(this.element);
-                } else if (index > that.element.children().length-1) {
-                    li.appendTo(this.element);
-                } else {
-                    li.insertBefore(this.element.children().eq(index));
-                }
+                li.appendTo(this.element);
+            }
+            var row = $('<div/>').addClass("red-ui-editableList-item-content").appendTo(li);
+            row.data('data',data);
+            if (this.options.sortable === true) {
+                $('<i class="red-ui-editableList-item-handle fa fa-bars"></i>').appendTo(li);
+                li.addClass("red-ui-editableList-item-sortable");
+            }
+            if (this.options.removable) {
+                var deleteButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove editor-button editor-button-small"}).appendTo(li);
+                $('<i/>',{class:"fa fa-remove"}).appendTo(deleteButton);
+                li.addClass("red-ui-editableList-item-removable");
+                deleteButton.click(function() {
+                    var data = row.data('data');
+                    li.addClass("red-ui-editableList-item-deleting")
+                    li.fadeOut(300, function() {
+                        $(this).remove();
+                        if (that.options.removeItem) {
+                            that.options.removeItem(data);
+                        }
+                    });
+                });
             }
             if (this.options.addItem) {
                 var index = that.element.children().length-1;
-                // setTimeout(function() {
+                setTimeout(function() {
                     that.options.addItem(row,index,data);
                     if (that.activeFilter) {
                         try {
@@ -353,36 +263,23 @@
                             that.uiContainer.scrollTop(that.element.height());
                         },0);
                     }
-                // },0);
+                },0);
             }
         },
-        addItem: function(data) {
-            this.insertItemAt(data,this.element.children().length)
-        },
-        addItems: function(items) {
-            for (var i=0; i<items.length;i++) {
-                this.addItem(items[i]);
-            }
-        },
-        removeItem: function(data,detach) {
+        removeItem: function(data) {
             var items = this.element.children().filter(function(f) {
-                return data === $(this).children(".red-ui-editableList-item-content").data('data');
+                return data === $(this).find(".red-ui-editableList-item-content").data('data');
             });
-            if (detach) {
-                items.detach();
-            } else {
-                items.remove();
-            }
+            items.remove();
             if (this.options.removeItem) {
                 this.options.removeItem(data);
             }
         },
         items: function() {
-            return this.element.children().map(function(i) { return $(this).children(".red-ui-editableList-item-content"); });
+            return this.element.children().map(function(i) { return $(this).find(".red-ui-editableList-item-content"); });
         },
         empty: function() {
             this.element.empty();
-            this.uiContainer.scrollTop(0);
         },
         filter: function(filter) {
             if (filter !== undefined) {
@@ -398,22 +295,6 @@
         },
         length: function() {
             return this.element.children().length;
-        },
-        show: function(item) {
-            var items = this.element.children().filter(function(f) {
-                return item === $(this).children(".red-ui-editableList-item-content").data('data');
-            });
-            if (items.length > 0) {
-                this.uiContainer.scrollTop(this.uiContainer.scrollTop()+items.position().top)
-            }
-        },
-        getItem: function(li) {
-            var el = li.children(".red-ui-editableList-item-content");
-            if (el.length) {
-                return el.data('data');
-            } else {
-                return null;
-            }
         }
     });
 })(jQuery);

editor/js/ui/common/menu.js

@@ -1,5 +1,5 @@
 /**
- * Copyright JS Foundation and other contributors, http://js.foundation
+ * Copyright 2014, 2016 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+
+
 RED.menu = (function() {
 
     var menuItems = {};
@@ -28,40 +31,30 @@ RED.menu = (function() {
         }
 
         function setInitialState() {
-            var savedStateActive = RED.settings.get("menu-" + opt.id);
-            if (opt.setting) {
-                // May need to migrate pre-0.17 setting
-
-                if (savedStateActive !== null) {
-                    RED.settings.set(opt.setting,savedStateActive);
-                    RED.settings.remove("menu-" + opt.id);
-                } else {
-                    savedStateActive = RED.settings.get(opt.setting);
-                }
-            }
+            var savedStateActive = isSavedStateActive(opt.id);
             if (savedStateActive) {
                 link.addClass("active");
-                triggerAction(opt.id,true);
+                opt.onselect.call(opt, true);
             } else if (savedStateActive === false) {
                 link.removeClass("active");
-                triggerAction(opt.id,false);
+                opt.onselect.call(opt, false);
             } else if (opt.hasOwnProperty("selected")) {
                 if (opt.selected) {
                     link.addClass("active");
                 } else {
                     link.removeClass("active");
                 }
-                triggerAction(opt.id,opt.selected);
+                opt.onselect.call(opt, opt.selected);
             }
         }
 
         if (opt === null) {
-            item = $('<li class="red-ui-menu-divider"></li>');
+            item = $('<li class="divider"></li>');
         } else {
             item = $('<li></li>');
 
             if (opt.group) {
-                item.addClass("red-ui-menu-group-"+opt.group);
+                item.addClass("menu-group-"+opt.group);
 
             }
             var linkContent = '<a '+(opt.id?'id="'+opt.id+'" ':'')+'tabindex="-1" href="#">';
@@ -71,7 +64,7 @@ RED.menu = (function() {
 
             }
             if (opt.icon !== undefined) {
-                if (/\.(png|svg)/.test(opt.icon)) {
+                if (/\.png/.test(opt.icon)) {
                     linkContent += '<img src="'+opt.icon+'"/> ';
                 } else {
                     linkContent += '<i class="'+(opt.icon?opt.icon:'" style="display: inline-block;"')+'"></i> ';
@@ -79,10 +72,10 @@ RED.menu = (function() {
             }
 
             if (opt.sublabel) {
-                linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+opt.label+'</span>'+
-                               '<span class="red-ui-menu-sublabel">'+opt.sublabel+'</span></span>'
+                linkContent += '<span class="menu-label-container"><span class="menu-label">'+opt.label+'</span>'+
+                               '<span class="menu-sublabel">'+opt.sublabel+'</span></span>'
             } else {
-                linkContent += '<span class="red-ui-menu-label">'+opt.label+'</span>'
+                linkContent += '<span class="menu-label">'+RED.bidi.applyBidiSupport(opt.label, RED.bidi.flags.NS)+'</span>'
             }
 
             linkContent += '</a>';
@@ -92,35 +85,43 @@ RED.menu = (function() {
             menuItems[opt.id] = opt;
 
             if (opt.onselect) {
-                link.on("click", function(e) {
-                    e.preventDefault();
+                link.click(function() {
                     if ($(this).parent().hasClass("disabled")) {
                         return;
                     }
                     if (opt.toggle) {
-                        if (opt.toggle === true) {
-                            setSelected(opt.id, !isSelected(opt.id));
+                        var selected = isSelected(opt.id);
+                        if (typeof opt.toggle === "string") {
+                            if (!selected) {
+                                for (var m in menuItems) {
+                                    if (menuItems.hasOwnProperty(m)) {
+                                        var mi = menuItems[m];
+                                        if (mi.id != opt.id && opt.toggle == mi.toggle) {
+                                            setSelected(mi.id,false);
+                                        }
+                                    }
+                                }
+                                setSelected(opt.id,true);
+                            }
                         } else {
-                            setSelected(opt.id, true);
+                            setSelected(opt.id, !selected);
                         }
                     } else {
-                        triggerAction(opt.id);
+                        opt.onselect.call(opt);
                     }
                 });
-                if (opt.toggle) {
-                    setInitialState();
-                }
+                setInitialState();
             } else if (opt.href) {
                 link.attr("target","_blank").attr("href",opt.href);
             } else if (!opt.options) {
                 item.addClass("disabled");
-                link.on("click", function(event) {
+                link.click(function(event) {
                     event.preventDefault();
                 });
             }
             if (opt.options) {
-                item.addClass("red-ui-menu-dropdown-submenu pull-left");
-                var submenu = $('<ul id="'+opt.id+'-submenu" class="red-ui-menu-dropdown"></ul>').appendTo(item);
+                item.addClass("dropdown-submenu pull-left");
+                var submenu = $('<ul id="'+opt.id+'-submenu" class="dropdown-menu"></ul>').appendTo(item);
 
                 for (var i=0;i<opt.options.length;i++) {
                     var li = createMenuItem(opt.options[i]);
@@ -139,31 +140,16 @@ RED.menu = (function() {
 
     }
     function createMenu(options) {
-        var topMenu = $("<ul/>",{class:"red-ui-menu red-ui-menu-dropdown pull-right"});
 
-        if (options.id) {
-            topMenu.attr({id:options.id+"-submenu"});
-            var menuParent = $("#"+options.id);
-            if (menuParent.length === 1) {
-                topMenu.insertAfter(menuParent);
-                menuParent.on("click", function(evt) {
-                    evt.stopPropagation();
-                    evt.preventDefault();
-                    if (topMenu.is(":visible")) {
-                        $(document).off("click.red-ui-menu");
-                        topMenu.hide();
-                    } else {
-                        $(document).on("click.red-ui-menu", function(evt) {
-                            $(document).off("click.red-ui-menu");
-                            activeMenu = null;
-                            topMenu.hide();
-                        });
-                        $(".red-ui-menu.red-ui-menu-dropdown").hide();
-                        topMenu.show();
-                    }
-                })
-            }
-        }
+        var button = $("#"+options.id);
+
+        //button.click(function(event) {
+        //    $("#"+options.id+"-submenu").show();
+        //    event.preventDefault();
+        //});
+
+
+        var topMenu = $("<ul/>",{id:options.id+"-submenu", class:"dropdown-menu pull-right"}).insertAfter(button);
 
         var lastAddedSeparator = false;
         for (var i=0;i<options.options.length;i++) {
@@ -176,31 +162,23 @@ RED.menu = (function() {
                 }
             }
         }
-
-        return topMenu;
     }
 
-    function triggerAction(id, args) {
-        var opt = menuItems[id];
-        var callback = opt.onselect;
-        if (typeof opt.onselect === 'string') {
-            callback = RED.actions.get(opt.onselect);
-        }
-        if (callback) {
-            callback.call(opt,args);
-        } else {
-            console.log("No callback for",id,opt.onselect);
-        }
+    function isSavedStateActive(id) {
+        return RED.settings.get("menu-" + id);
     }
 
     function isSelected(id) {
         return $("#" + id).hasClass("active");
     }
 
+    function setSavedState(id, state) {
+        RED.settings.set("menu-" + id, state);
+    }
+
     function setSelected(id,state) {
-        var alreadySet = false;
         if (isSelected(id) == state) {
-            alreadySet = true;
+            return;
         }
         var opt = menuItems[id];
         if (state) {
@@ -208,30 +186,10 @@ RED.menu = (function() {
         } else {
             $("#"+id).removeClass("active");
         }
-        if (opt) {
-            if (opt.toggle && typeof opt.toggle === "string") {
-                if (state) {
-                    for (var m in menuItems) {
-                        if (menuItems.hasOwnProperty(m)) {
-                            var mi = menuItems[m];
-                            if (mi.id != opt.id && opt.toggle == mi.toggle) {
-                                setSelected(mi.id,false);
-                            }
-                        }
-                    }
-                }
-            }
-            if (!alreadySet && opt.onselect) {
-                triggerAction(opt.id,state);
-            }
-            if (!opt.local && !alreadySet) {
-                RED.settings.set(opt.setting||("menu-"+opt.id), state);
-            }
+        if (opt && opt.onselect) {
+            opt.onselect.call(opt,state);
         }
-    }
-
-    function toggleSelected(id) {
-        setSelected(id,!isSelected(id));
+        setSavedState(id, state);
     }
 
     function setDisabled(id,state) {
@@ -244,14 +202,14 @@ RED.menu = (function() {
 
     function addItem(id,opt) {
         var item = createMenuItem(opt);
-        if (opt !== null && opt.group) {
-            var groupItems = $("#"+id+"-submenu").children(".red-ui-menu-group-"+opt.group);
+        if (opt.group) {
+            var groupItems = $("#"+id+"-submenu").children(".menu-group-"+opt.group);
             if (groupItems.length === 0) {
                 item.appendTo("#"+id+"-submenu");
             } else {
                 for (var i=0;i<groupItems.length;i++) {
                     var groupItem = groupItems[i];
-                    var label = $(groupItem).find(".red-ui-menu-label").html();
+                    var label = $(groupItem).find(".menu-label").html();
                     if (opt.label < label) {
                         $(groupItem).before(item);
                         break;
@@ -273,6 +231,16 @@ RED.menu = (function() {
         var opt = menuItems[id];
         if (opt) {
             opt.onselect = action;
+            // $("#"+id).click(function() {
+            //     if ($(this).parent().hasClass("disabled")) {
+            //         return;
+            //     }
+            //     if (menuItems[id].toggle) {
+            //         setSelected(id,!isSelected(id));
+            //     } else {
+            //         menuItems[id].onselect.call(menuItems[id]);
+            //     }
+            // });
         }
     }
 
@@ -280,10 +248,10 @@ RED.menu = (function() {
         init: createMenu,
         setSelected: setSelected,
         isSelected: isSelected,
-        toggleSelected: toggleSelected,
         setDisabled: setDisabled,
         addItem: addItem,
         removeItem: removeItem,
         setAction: setAction
+        //TODO: add an api for replacing a submenu - see library.js:loadFlowLibrary
     }
 })();

editor/js/ui/common/popover.js

@@ -0,0 +1,79 @@
+/**
+ * Copyright 2015 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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() {
+
+
+    function createPopover(options) {
+        var target = options.target;
+
+        var content = options.content;
+        var delay = options.delay;
+        var timer = null;
+        var active;
+        var div;
+
+        var openPopup = function() {
+            if (active) {
+                div = $('<div class="red-ui-popover"></div>').html(content).appendTo("body");
+                var targetPos = target.offset();
+                var targetWidth = target.width();
+                var targetHeight = target.height();
+
+                var divHeight = div.height();
+                var popoverPos = ((RED.bidi.isMirroringEnabled()) ? targetPos.left-targetWidth-210 : targetPos.left+targetWidth+17);
+                div.css({top: targetPos.top+targetHeight/2-divHeight/2-10,left:popoverPos});
+                div.fadeIn("fast");
+            }
+        }
+        var closePopup = function() {
+            if (!active) {
+                if (div) {
+                    div.fadeOut("fast",function() {
+                        $(this).remove();
+                    });
+                    div = null;
+                }
+            }
+        }
+
+        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);
+        });
+        var res = {
+            setContent: function(_content) {
+                content = _content;
+            }
+        }
+        target.data('popover',res);
+        return res;
+
+    }
+
+    return {
+        create: createPopover
+    }
+
+})();

editor/js/ui/common/searchBox.js

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+(function($) {
+
+    $.widget( "nodered.searchBox", {
+        _create: function() {
+            var that = this;
+
+            this.currentTimeout = null;
+            this.lastSent = "";
+            this.element.val("");
+            this.uiContainer = this.element.wrap("<div>").parent();
+            this.uiContainer.addClass("red-ui-searchBox-container");
+
+            $('<i class="fa fa-search"></i>').prependTo(this.uiContainer);
+            this.clearButton = $('<a href="#"><i class="fa fa-times"></i></a>').appendTo(this.uiContainer);
+            this.clearButton.on("click",function(e) {
+                e.preventDefault();
+                that.element.val("");
+                that._change("",true);
+                that.element.focus();
+            });
+
+            this.resultCount = $('<span>',{class:"red-ui-searchBox-resultCount hide"}).appendTo(this.uiContainer);
+
+            this.element.val("");
+            this.element.on("keydown",function(evt) {
+                if (evt.keyCode === 27) {
+                    that.element.val("");
+                }
+            })
+            this.element.on("keyup",function(evt) {
+                that._change($(this).val());
+            });
+
+            this.element.on("focus",function() {
+                $("body").one("mousedown",function() {
+                    that.element.blur();
+                });
+            });
+
+        },
+        _change: function(val,instant) {
+            var fireEvent = false;
+            if (val === "") {
+                this.clearButton.hide();
+                fireEvent = true;
+            } else {
+                this.clearButton.show();
+                fireEvent = (val.length >= (this.options.minimumLength||0));
+            }
+            var current = this.element.val();
+            fireEvent = fireEvent && current !== this.lastSent;
+            if (fireEvent) {
+                if (!instant && this.options.delay > 0) {
+                    clearTimeout(this.currentTimeout);
+                    var that = this;
+                    this.currentTimeout = setTimeout(function() {
+                        that.lastSent = that.element.val();
+                        that._trigger("change");
+                    },this.options.delay);
+                } else {
+                    this._trigger("change");
+                }
+            }
+        },
+        value: function(val) {
+            if (val === undefined) {
+                return this.element.val();
+            } else {
+                this.element.val(val);
+                this._change(val);
+            }
+        },
+        count: function(val) {
+            if (val === undefined || val === null || val === "") {
+                this.resultCount.text("").hide();
+            } else {
+            	val = RED.bidi.applyBidiSupport(val,RED.bidi.flags.NS);
+                this.resultCount.text(val).show();
+            }
+        }
+    });
+})(jQuery);

editor/js/ui/common/tabs.js

@@ -0,0 +1,350 @@
+/**
+ * Copyright 2013, 2016 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.tabs = (function() {
+    function createTabs(options) {
+        var tabs = {};
+        var currentTabWidth;
+        var currentActiveTabWidth = 0;
+
+        var ul = $("#"+options.id);
+        var wrapper = ul.wrap( "<div>" ).parent();
+        var scrollContainer = ul.wrap( "<div>" ).parent();
+        wrapper.addClass("red-ui-tabs");
+        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();
+                options.addButton();
+            })
+
+        }
+        var scrollLeft;
+        var scrollRight;
+
+        if (options.scrollable) {
+            wrapper.addClass("red-ui-tabs-scrollable");
+            scrollContainer.addClass("red-ui-tabs-scroll-container");
+            scrollContainer.scroll(updateScroll);
+            scrollLeft = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-left"><a href="#" style="display:none;"><i class="fa fa-caret-left"></i></a></div>').appendTo(wrapper).find("a");
+            scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=150') }).on('click',function(evt){ evt.preventDefault();});
+            scrollRight = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-right"><a href="#" style="display:none;"><i class="fa fa-caret-right"></i></a></div>').appendTo(wrapper).find("a");
+            scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }).on('click',function(evt){ evt.preventDefault();});
+        }
+        function scrollEventHandler(evt,dir) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled')) {
+                return;
+            }
+            var currentScrollLeft = scrollContainer.scrollLeft();
+            scrollContainer.animate( { scrollLeft: dir }, 100);
+            var interval = setInterval(function() {
+                var newScrollLeft = scrollContainer.scrollLeft()
+                if (newScrollLeft === currentScrollLeft) {
+                    clearInterval(interval);
+                    return;
+                }
+                currentScrollLeft = newScrollLeft;
+                scrollContainer.animate( { scrollLeft: dir }, 100);
+            },100);
+            $(this).one('mouseup',function() {
+                clearInterval(interval);
+            })
+        }
+
+
+        ul.children().first().addClass("active");
+        ul.children().addClass("red-ui-tab");
+
+        function onTabClick() {
+            activateTab($(this));
+            return false;
+        }
+
+        function updateScroll() {
+            if (ul.children().length !== 0) {
+                var sl = scrollContainer.scrollLeft();
+                var scWidth = scrollContainer.width();
+                var ulWidth = ul.width();
+                if (sl === 0) {
+                    scrollLeft.hide();
+                } else {
+                    scrollLeft.show();
+                }
+                if (sl === ulWidth-scWidth) {
+                    scrollRight.hide();
+                } else {
+                    scrollRight.show();
+                }
+            }
+        }
+        function onTabDblClick() {
+            if (options.ondblclick) {
+                options.ondblclick(tabs[$(this).attr('href').slice(1)]);
+            }
+            return false;
+        }
+
+        function activateTab(link) {
+            if (typeof link === "string") {
+                link = ul.find("a[href='#"+link+"']");
+            }
+            if (!link.parent().hasClass("active")) {
+                ul.children().removeClass("active");
+                ul.children().css({"transition": "width 100ms"});
+                link.parent().addClass("active");
+                if (options.scrollable) {
+                    var pos = link.parent().position().left;
+                    if (pos-21 < 0) {
+                        scrollContainer.animate( { scrollLeft: '+='+(pos-50) }, 300);
+                    } else if (pos + 120 > scrollContainer.width()) {
+                        scrollContainer.animate( { scrollLeft: '+='+(pos + 140-scrollContainer.width()) }, 300);
+                    }
+                }
+                if (options.onchange) {
+                    options.onchange(tabs[link.attr('href').slice(1)]);
+                }
+                updateTabWidths();
+                setTimeout(function() {
+                    ul.children().css({"transition": ""});
+                },100);
+            }
+        }
+
+        function updateTabWidths() {
+            var tabs = ul.find("li.red-ui-tab");
+            var width = wrapper.width();
+            var tabCount = tabs.size();
+            var tabWidth = (width-12-(tabCount*6))/tabCount;
+            currentTabWidth = (100*tabWidth/width)+"%";
+            currentActiveTabWidth = currentTabWidth+"%";
+            if (options.scrollable) {
+                tabWidth = Math.max(tabWidth,140);
+                currentTabWidth = tabWidth+"px";
+                currentActiveTabWidth = 0;
+                var listWidth = Math.max(wrapper.width(),12+(tabWidth+6)*tabCount);
+                ul.width(listWidth);
+                updateScroll();
+            } else if (options.hasOwnProperty("minimumActiveTabWidth")) {
+                if (tabWidth < options.minimumActiveTabWidth) {
+                    tabCount -= 1;
+                    tabWidth = (width-12-options.minimumActiveTabWidth-(tabCount*6))/tabCount;
+                    currentTabWidth = (100*tabWidth/width)+"%";
+                    currentActiveTabWidth = options.minimumActiveTabWidth+"px";
+                } else {
+                    currentActiveTabWidth = 0;
+                }
+            }
+            tabs.css({width:currentTabWidth});
+            if (tabWidth < 50) {
+                ul.find(".red-ui-tab-close").hide();
+                ul.find(".red-ui-tab-icon").hide();
+                ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
+            } else {
+                ul.find(".red-ui-tab-close").show();
+                ul.find(".red-ui-tab-icon").show();
+                ul.find(".red-ui-tab-label").css({paddingLeft:""})
+            }
+            if (currentActiveTabWidth !== 0) {
+                ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
+                ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
+                ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
+                ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
+            }
+
+        }
+
+        ul.find("li.red-ui-tab a").on("click",onTabClick).on("dblclick",onTabDblClick);
+        setTimeout(function() {
+            updateTabWidths();
+        },0);
+
+
+        function removeTab(id) {
+            var li = ul.find("a[href='#"+id+"']").parent();
+            if (li.hasClass("active")) {
+                var tab = li.prev();
+                if (tab.size() === 0) {
+                    tab = li.next();
+                }
+                activateTab(tab.find("a"));
+            }
+            li.remove();
+            if (options.onremove) {
+                options.onremove(tabs[id]);
+            }
+            delete tabs[id];
+            updateTabWidths();
+        }
+
+        return {
+            addTab: function(tab) {
+                tabs[tab.id] = tab;
+                var li = $("<li/>",{class:"red-ui-tab"}).appendTo(ul);
+                li.data("tabId",tab.id);
+                var link = $("<a/>",{href:"#"+tab.id, class:"red-ui-tab-label"}).appendTo(li);
+                if (tab.icon) {
+                    $('<img src="'+tab.icon+'" class="red-ui-tab-icon"/>').appendTo(link);
+                }
+                var span = $('<span/>',{class:"bidiAware"});
+                span.attr('dir', RED.bidi.resolveBaseTextDir(tab.label)).text(RED.bidi.applyBidiSupport(tab.label,RED.bidi.flags.NS)).appendTo(link);
+                link.on("click",onTabClick);
+                link.on("dblclick",onTabDblClick);
+                if (tab.closeable) {
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-times" />');
+
+                    closeLink.on("click",function(event) {
+                        removeTab(tab.id);
+                    });
+                }
+                updateTabWidths();
+                if (options.onadd) {
+                    options.onadd(tab);
+                }
+                link.attr("title",tab.label);
+                if (ul.find("li.red-ui-tab").size() == 1) {
+                    activateTab(link);
+                }
+                if (options.onreorder) {
+                    var originalTabOrder;
+                    var tabDragIndex;
+                    var tabElements = [];
+                    var startDragIndex;
+
+                    li.draggable({
+                        axis:"x",
+                        distance: 20,
+                        start: function(event,ui) {
+                            originalTabOrder = [];
+                            tabElements = [];
+                            ul.children().each(function(i) {
+                                tabElements[i] = {
+                                    el:$(this),
+                                    text: $(this).text(),
+                                    left: $(this).position().left,
+                                    width: $(this).width()
+                                };
+                                if ($(this).is(li)) {
+                                    tabDragIndex = i;
+                                    startDragIndex = i;
+                                }
+                                originalTabOrder.push($(this).data("tabId"));
+                            });
+                            ul.children().each(function(i) {
+                                if (i!==tabDragIndex) {
+                                    $(this).css({
+                                        position: 'absolute',
+                                        left: tabElements[i].left+"px",
+                                        width: tabElements[i].width+2,
+                                        transition: "left 0.3s"
+                                    });
+                                }
+
+                            })
+                            if (!li.hasClass('active')) {
+                                li.css({'zIndex':1});
+                            }
+                        },
+                        drag: function(event,ui) {
+                            ui.position.left += tabElements[tabDragIndex].left+scrollContainer.scrollLeft();
+                            var tabCenter = ui.position.left + tabElements[tabDragIndex].width/2 - scrollContainer.scrollLeft();
+                            for (var i=0;i<tabElements.length;i++) {
+                                if (i === tabDragIndex) {
+                                    continue;
+                                }
+                                if (tabCenter > tabElements[i].left && tabCenter < tabElements[i].left+tabElements[i].width) {
+                                    if (i < tabDragIndex) {
+                                        tabElements[i].left += tabElements[tabDragIndex].width+8;
+                                        tabElements[tabDragIndex].el.detach().insertBefore(tabElements[i].el);
+                                    } else {
+                                        tabElements[i].left -= tabElements[tabDragIndex].width+8;
+                                        tabElements[tabDragIndex].el.detach().insertAfter(tabElements[i].el);
+                                    }
+                                    tabElements[i].el.css({left:tabElements[i].left+"px"});
+
+                                    tabElements.splice(i, 0, tabElements.splice(tabDragIndex, 1)[0]);
+
+                                    tabDragIndex = i;
+                                    break;
+                                }
+                            }
+                        },
+                        stop: function(event,ui) {
+                            ul.children().css({position:"relative",left:"",transition:""});
+                            if (!li.hasClass('active')) {
+                                li.css({zIndex:""});
+                            }
+                            updateTabWidths();
+                            if (startDragIndex !== tabDragIndex) {
+                                options.onreorder(originalTabOrder, $.makeArray(ul.children().map(function() { return $(this).data('tabId');})));
+                            }
+                            activateTab(tabElements[tabDragIndex].el.data('tabId'));
+                        }
+                    })
+                }
+            },
+            removeTab: removeTab,
+            activateTab: activateTab,
+            resize: updateTabWidths,
+            count: function() {
+                return ul.find("li.red-ui-tab").size();
+            },
+            contains: function(id) {
+                return ul.find("a[href='#"+id+"']").length > 0;
+            },
+            renameTab: function(id,label) {
+                tabs[id].label = label;
+                var tab = ul.find("a[href='#"+id+"']");
+                tab.attr("title",label);
+                tab.find("span").attr('dir', RED.bidi.resolveBaseTextDir(label)).text(RED.bidi.applyBidiSupport(label,RED.bidi.flags.NS));
+                updateTabWidths();
+            },
+            order: function(order) {
+                var existingTabOrder = $.makeArray(ul.children().map(function() { return $(this).data('tabId');}));
+                if (existingTabOrder.length !== order.length) {
+                    return
+                }
+                var i;
+                var match = true;
+                for (i=0;i<order.length;i++) {
+                    if (order[i] !== existingTabOrder[i]) {
+                        match = false;
+                        break;
+                    }
+                }
+                if (match) {
+                    return;
+                }
+                var existingTabMap = {};
+                var existingTabs = ul.children().detach().each(function() {
+                    existingTabMap[$(this).data("tabId")] = $(this);
+                });
+                for (i=0;i<order.length;i++) {
+                    existingTabMap[order[i]].appendTo(ul);
+                }
+            }
+
+        }
+    }
+
+    return {
+        create: createTabs
+    }
+})();