Merge remote-tracking branch 'adobe/master'

.eslintrc.js

@@ -0,0 +1,83 @@
+module.exports = {
+    "rules": {
+        // the rules below should be sorted in a same way they are sorted on http://eslint.org/docs/rules page
+        // http://eslint.org/docs/rules/#possible-errors
+        "no-caller": 2,
+        "no-control-regex": 2,
+        "no-empty": 1,
+        "no-invalid-regexp": 2,
+        "no-regex-spaces": 2,
+        "no-unsafe-negation": 1,
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+        // http://eslint.org/docs/rules/#best-practices
+        "curly": 2,
+        "eqeqeq": [2, "smart"],
+        "guard-for-in": 0,
+        "no-else-return": 1,
+        "no-fallthrough": 2,
+        "no-invalid-this": 1,
+        "no-iterator": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-new-func": 2,
+        "no-new-wrappers": 2,
+        "no-new": 2,
+        "no-proto": 2,
+        "no-script-url": 2,
+        "wrap-iife": [2, "outside"],
+        // http://eslint.org/docs/rules/#strict-mode
+        "strict": 2,
+        // http://eslint.org/docs/rules/#variables
+        "no-shadow-restricted-names": 2,
+        "no-shadow": 1,
+        "no-undef": 2,
+        "no-unused-vars": [1, {"vars": "all", "args": "none"}],
+        "no-use-before-define": 0,
+        // http://eslint.org/docs/rules/#nodejs-and-commonjs
+        "no-new-require": 2,
+        // http://eslint.org/docs/rules/#stylistic-issues
+        "block-spacing": 1,
+        "brace-style": [1, "1tbs", { allowSingleLine: true }],
+        "camelcase": 1,
+        "comma-dangle": 2,
+        "comma-spacing": 1,
+        "comma-style": [1, "last"],
+        "computed-property-spacing": 1,
+        "eol-last": 1,
+        "func-call-spacing": 1,
+        "indent": [1, 4],
+        "key-spacing": [1, { beforeColon: false, afterColon: true }],
+        "max-len": [1, 120],
+        "new-cap": [0, {
+            "capIsNewExceptions": [
+                "$.Deferred",
+                "$.Event",
+                "CodeMirror.Pos",
+                "Immutable.Map",
+                "Immutable.List",
+                "JSLINT"
+            ]
+        }],
+        "new-parens": 2,
+        "no-bitwise": 2,
+        "no-new-object": 2,
+        "no-trailing-spaces": 1,
+        "semi-spacing": 1,
+        "semi": 2
+    },
+    "globals": {
+        "$": false,
+        "brackets": false,
+        "clearTimeout": false,
+        "console": false,
+        "define": false,
+        "require": false,
+        "setTimeout": false,
+        "window": false,
+        "ArrayBuffer": false,
+        "Uint32Array": false,
+        "WebSocket": false,
+        "XMLHttpRequest": false
+    }
+};

.gitignore

@@ -31,6 +31,9 @@ Thumbs.db
 # ignore .disabled file for default extensions
 /src/extensions/default/*/.disabled
 
+# generate through grunt
+/src/config.json
+
 #OSX .DS_Store files
 .DS_Store
 
@@ -46,4 +49,6 @@ Thumbs.db
 
 # Files that can be automatically downloaded that we don't want to ship with our builds
 /src/extensibility/node/node_modules/request/tests/
-/src/config.json
+
+# Files build by scripts
+/src/thirdparty/semver.browser.js

Gruntfile.js

@@ -127,7 +127,7 @@ module.exports = function (grunt) {
                             'keymap/{,*/}*',
                             'lib/{,*/}*',
                             'mode/{,*/}*',
-                            'theme/{,*/}*',
+                            'theme/{,*/}*'
                         ]
                     },
                     {
@@ -147,7 +147,7 @@ module.exports = function (grunt) {
                 force: true,
                 files: false
             },
-            src: ['dist/**/*'],
+            src: ['dist/**/*']
         },
         less: {
             dist: {
@@ -338,14 +338,14 @@ module.exports = function (grunt) {
     });
 
     // task: install
-    grunt.registerTask('install', ['write-config', 'sync-tsconfigs', 'less', /*"npm-install-src", "npm-install-extensions-src"*/]);
+    grunt.registerTask('install', ['write-config:dist', 'sync-tsconfigs', 'less', /*'npm-install-source', 'pack-web-dependencies'*/]);
 
     // task: test
     grunt.registerTask('test', ['eslint', 'jasmine', 'nls-check']);
 
     // task: set-release
     // Update version number in package.json and rewrite src/config.json
-    grunt.registerTask('set-release', ['update-release-number', 'write-config']);
+    grunt.registerTask('set-release', ['update-release-number', 'write-config:dev']);
 
     // task: dep-change - run when you modify dependencies in package.json
     grunt.registerTask('dep-change', [
@@ -373,7 +373,7 @@ module.exports = function (grunt) {
         // 'concat',
         // 'cssmin',
         // 'uglify',
-        // 'copy',
+        // 'copy:dist',
         // 'cleanempty',
         // 'usemin',
         'build-config'

build.json

@@ -1,5 +1,6 @@
 {
-    "version": "1.9.0-0",
-    "title" : "Brackets 1.9 <Pre-release>",
-    "desciption" : "This is a Brackets pre-release build"
-}
+    "version": "release-1.9-prerelease-2",
+    "title" : "Brackets 1.9 Stable Pre-release for community testing",
+    "description" : "This is a Brackets 1.9 pre-release build.",
+    "prerelease": true
+}

package.json

@@ -5,8 +5,8 @@
     "author": "Brackets Team <[email protected]>",
     "license": "MIT",
     "homepage": "http://brackets.io",
-    "version": "1.9.5",
-    "apiVersion": "1.9.0",
+    "version": "1.10.0",
+    "apiVersion": "1.10.0",
     "issues": {
         "url": "https://github.com/zaggino/brackets-electron/issues"
     },
@@ -46,8 +46,9 @@
         }
     },
     "scripts": {
+        "prepush": "npm run test",
         "dep-change": "grunt dep-change",
-        "install": "grunt install && npm run build",
+        "postinstall": "grunt install && npm run build",
         "build": "rimraf ./dist && gulp copy-src-dist && grunt build && tsc --project app && tsc --project src",
         "build-optimized": "npm run build && grunt optimize",
         "test": "npm run tslint",
@@ -62,13 +63,15 @@
     },
     "dependencies": {
         "anymatch": "1.3.0",
+        "async": "2.1.4",
         "chokidar": "1.6.1",
         "decompress-zip": "0.3.0",
         "electron-localshortcut": "1.1.0",
         "fs-extra": "2.0.0",
         "isbinaryfile": "3.0.2",
         "lodash": "4.17.4",
         "npm": "3.10.9",
+        "opn": "4.0.2",
         "request": "2.79.0",
         "requirejs": "2.3.3",
         "semver": "5.3.0",
@@ -113,9 +116,11 @@
         "grunt-usemin": "0.1.11",
         "gulp": "3.9.1",
         "gulp-watch": "4.3.11",
+        "husky": "0.13.2",
         "jasmine-node": "1.11.0",
         "load-grunt-tasks": "3.5.2",
         "q": "1.4.1",
+        "rewire": "1.1.2",
         "rimraf": "2.6.0",
         "tslint": "4.5.1",
         "typescript": "2.2.0",

src/LiveDevelopment/Agents/RemoteFunctions.js

@@ -22,7 +22,7 @@
  */
 
 /*jslint forin: true */
-/*global Node */
+/*global Node, MessageEvent */
 /*theseus instrument: false */
 
 /**
@@ -337,7 +337,7 @@ function RemoteFunctions(experimental, remoteWSPort) {
                 _trigger(element, "highlight", 1);
             }
 
-            if (!window.event && !isInViewport(element)) {
+            if ((!window.event || window.event instanceof MessageEvent) && !isInViewport(element)) {
                 var top = getDocumentOffsetTop(element);
                 if (top) {
                     top -= (window.innerHeight / 2);