Merge remote-tracking branch 'upstream/master' into update-tern-acorn

adobe · Dec 12, 2015 · 1f89f7b · 1f89f7b
2 parents 9a51fd9 + dac3d29
commit 1f89f7b
Show file tree

Hide file tree

Showing 134 changed files with 3,371 additions and 1,428 deletions.
diff --git a/.brackets.json b/.brackets.json
@@ -10,7 +10,7 @@
     "defaultExtension": "js",
     "language": {
         "javascript": {
-            "linting.prefer": ["JSLint", "JSHint"],
+            "linting.prefer": ["ESLint"],
             "linting.usePreferredOnly": true
         }
     },

diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,71 @@
+{
+    "env": {
+        "node": true
+    },
+    "rules": {
+        "no-bitwise": 0,
+        "curly": 2,
+        "eqeqeq": 2,
+        "guard-for-in": 0,
+        "wrap-iife": [2, "outside"],
+        "no-use-before-define": 0,
+        "new-cap": [0, {
+            "capIsNewExceptions": [
+                "$.Deferred",
+                "$.Event",
+                "CodeMirror.Pos",
+                "Immutable.Map",
+                "Immutable.List",
+                "JSLINT"
+            ]}],
+        "no-caller": 2,
+        "no-empty": 0,
+        "no-new": 2,
+        "no-invalid-regexp": 2,
+        "no-control-regex": 2,
+        "no-regex-spaces": 2,
+        "no-undef": 2,
+        "strict": 0,
+        "no-unused-vars": [0, {"vars": "all", "args": "none"}],
+        "semi": 2,
+
+        "no-iterator": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-fallthrough": 2,
+        "no-proto": 2,
+        "no-script-url": 2,
+        "no-shadow": 0,
+        "no-shadow-restricted-names": 2,
+        "no-new-func": 2,
+        "no-new-wrappers": 2,
+        "no-new-require": 2,
+        "new-parens": 2,
+        "no-new-object": 2,
+        "no-invalid-this": 0,
+        indent: [0, 4],
+
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+
+        "no-trailing-spaces": 0,
+        "eol-last": 0
+    },
+    "globals": {
+        "brackets": false,
+
+        "window": false,
+        // Resemble a browser environment.
+        "alert": false,
+        "document": false,
+        "localStorage": false,
+        "navigator": false,
+        "setTimeout": false,
+
+        "require": false,
+        "define": false,
+        "$": false,
+        "PathUtils": false,
+        "Mustache": false
+    }
+}
diff --git a/.gitmodules b/.gitmodules
@@ -9,7 +9,7 @@
 	url = https://github.com/janl/mustache.js.git
 [submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/tern"]
 	path = src/extensions/default/JavaScriptCodeHints/thirdparty/tern
-	url = https://github.com/marijnh/tern.git
+	url = https://github.com/ternjs/tern.git
 [submodule "src/thirdparty/requirejs"]
 	path = src/thirdparty/requirejs
 	url = https://github.com/jrburke/requirejs.git

diff --git a/.jshintrc b/.jshintrc
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,7 +25,7 @@ module.exports = function (grunt) {
     'use strict';
 
     // load dependencies
-    require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin', 'grunt-cleanempty']});
+    require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin', 'grunt-cleanempty', 'grunt-eslint']});
     grunt.loadTasks('tasks');
 
     // Project configuration.
@@ -241,19 +241,19 @@ module.exports = function (grunt) {
         watch: {
             all : {
                 files: ['**/*', '!**/node_modules/**'],
-                tasks: ['jshint']
+                tasks: ['eslint']
             },
             grunt : {
                 files: ['<%= meta.grunt %>', 'tasks/**/*'],
-                tasks: ['jshint:grunt']
+                tasks: ['eslint:grunt']
             },
             src : {
                 files: ['<%= meta.src %>', 'src/**/*'],
-                tasks: ['jshint:src']
+                tasks: ['eslint:src']
             },
             test : {
                 files: ['<%= meta.test %>', 'test/**/*'],
-                tasks: ['jshint:test']
+                tasks: ['eslint:test']
             }
         },
         /* FIXME (jasonsanjose): how to handle extension tests */
@@ -276,7 +276,7 @@ module.exports = function (grunt) {
                     'src/thirdparty/CodeMirror/addon/selection/active-line.js',
                     'src/thirdparty/mustache/mustache.js',
                     'src/thirdparty/path-utils/path-utils.min',
-                    'src/thirdparty/less-1.7.5.min.js'
+                    'src/thirdparty/less-2.5.1.min.js'
                 ],
                 helpers : [
                     'test/spec/PhantomHelper.js'
@@ -299,18 +299,12 @@ module.exports = function (grunt) {
         'jasmine_node': {
             projectRoot: 'src/extensibility/node/spec/'
         },
-        jshint: {
-            all: [
-                '<%= meta.grunt %>',
-                '<%= meta.src %>',
-                '<%= meta.test %>'
-            ],
+        eslint: {
             grunt:  '<%= meta.grunt %>',
             src:    '<%= meta.src %>',
             test:   '<%= meta.test %>',
-            /* use strict options to mimic JSLINT until we migrate to JSHINT in Brackets */
             options: {
-                jshintrc: '.jshintrc'
+                configFile: '.eslintrc'
             }
         },
         shell: {
@@ -325,16 +319,16 @@ module.exports = function (grunt) {
     grunt.registerTask('install', ['write-config', 'less']);
 
     // task: test
-    grunt.registerTask('test', ['jshint:all', 'jasmine']);
-//    grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine_node']);
+    grunt.registerTask('test', ['eslint', 'jasmine', 'nls-check']);
+//    grunt.registerTask('test', ['eslint', 'jasmine', 'jasmine_node', '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']);
 
     // task: build
     grunt.registerTask('build', [
-        'jshint:src',
+        'eslint:src',
         'jasmine',
         'clean',
         'less',

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "Brackets",
-    "version": "1.5.0-0",
-    "apiVersion": "1.5.0",
+    "version": "1.6.0-0",
+    "apiVersion": "1.6.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"
@@ -13,21 +13,21 @@
         "SHA": ""
     },
     "devDependencies": {
-        "grunt": "0.4.1",
+        "grunt": "0.4.5",
         "jasmine-node": "1.11.0",
         "grunt-jasmine-node": "0.1.0",
         "grunt-cli": "0.1.9",
-        "phantomjs": "1.9.13",
+        "phantomjs": "1.9.18",
         "grunt-lib-phantomjs": "0.3.0",
-        "grunt-contrib-jshint": "0.6.0",
+        "grunt-eslint": "17.1.0",
         "grunt-contrib-watch": "0.4.3",
         "grunt-contrib-jasmine": "0.4.2",
         "grunt-template-jasmine-requirejs": "0.1.0",
         "grunt-contrib-cssmin": "0.6.0",
         "grunt-contrib-clean": "0.4.1",
         "grunt-contrib-copy": "0.4.1",
         "grunt-contrib-htmlmin": "0.1.3",
-        "grunt-contrib-less": "0.8.2",
+        "grunt-contrib-less": "1.0.1",
         "grunt-contrib-requirejs": "0.4.1",
         "grunt-contrib-uglify": "0.2.0",
         "grunt-contrib-concat": "0.3.0",
@@ -36,7 +36,6 @@
         "load-grunt-tasks": "0.2.0",
         "q": "0.9.2",
         "semver": "^4.1.0",
-        "jshint": "2.1.4",
         "xmldoc": "^0.1.2",
         "grunt-cleanempty": "1.0.3"
     },
@@ -50,4 +49,4 @@
             "url": "https://github.com/adobe/brackets/blob/master/LICENSE"
         }
     ]
-}
+}
diff --git a/samples/cs/Getting Started/index.html b/samples/cs/Getting Started/index.html
@@ -67,7 +67,7 @@ <h3>Rychlá úprava pro CSS a JavaScript</h3>
             <kbd>ESC</kbd> mimo rychle vložený editor, skryjí se tyto editory všechny. Rychlá úprava najde také
             předpisy definované v LESS a SCSS souborech, včetně těch vnořených.
         </p>
-
+        
         <samp>
             Chcete to vidět v akci? Umístěte kurzor na značku <!-- <samp> --> výše a stiskněte
             <kbd>Cmd/Ctrl + E</kbd>. Pod danou značkou by se měla objevit rychlá úprava CSS, zobrazující související
@@ -206,4 +206,4 @@ <h2>Zapojte se</h2>
 
 -->
 
-<!-- Last translated for e3ecc9e7ac7b94f1107a8e3ca7064ac39b345280 -->
+<!-- Last translated for 12ee7cd7c2c0eefb3fdee209eea92a82b66f1693 -->
diff --git a/samples/root/Getting Started/index.html b/samples/root/Getting Started/index.html
@@ -66,7 +66,7 @@ <h3>Quick Edit for CSS and JavaScript</h3>
             a quick inline editor, they'll all collapse. Quick Edit will also find rules defined in LESS and
             SCSS files, including nested rules.
         </p>
-
+        
         <samp>
             Want to see it in action? Place your cursor on the <!-- <samp> --> tag above and press
             <kbd>Cmd/Ctrl + E</kbd>. You should see a CSS quick editor appear above, showing the CSS rule that

diff --git a/samples/sv/Kom igang/index.html b/samples/sv/Kom igang/index.html
@@ -64,7 +64,7 @@ <h3>Quick Edit för CSS och JavaScript</h3>
         </a>
 
         <p>
-            Samma kortkommande kan användas även på andra saker, till exempel funktioner i JavaScript för att<br>
+            Samma kortkommandon kan användas även på andra saker, till exempel funktioner i JavaScript för att ändra<br>
             färger, tidsfunktioner för animering och nya saker läggs till hela tiden!
             Just nu kan inte inline-editorer nästlas så du kan bara använda Quick Edit från den "fullstora" editorn.
         </p>
@@ -182,4 +182,4 @@ <h2>ENGAGERA DIG</h2>
     [::::::::::::::      ::::::::::::::]
     [[[[[[[[[[[[[[[      ]]]]]]]]]]]]]]]
 
--->
+-->