Merge remote-tracking branch 'upstream/master' into pref-linewise-copy

adobe · May 2, 2016 · 11dd63f · 11dd63f
2 parents 07ef623 + 81375bb
commit 11dd63f
Show file tree

Hide file tree

Showing 536 changed files with 33,348 additions and 31,640 deletions.
diff --git a/.brackets.json b/.brackets.json
@@ -10,7 +10,7 @@
     "defaultExtension": "js",
     "language": {
         "javascript": {
-            "linting.prefer": ["JSLint", "JSHint"],
+            "linting.prefer": ["ESLint", "JSLint"],
             "linting.usePreferredOnly": true
         }
     },

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,68 @@
+{
+    "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,
+        "alert": false,
+        "document": false,
+        "localStorage": false,
+        "navigator": false,
+        "setTimeout": false,
+
+        "require": false,
+        "define": false,
+        "$": 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/extensions/default/JavaScriptCodeHints/thirdparty/acorn"]
 	path = src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
 	url = https://github.com/marijnh/acorn.git

diff --git a/.jshintrc b/.jshintrc
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
+ * Copyright (c) 2013 - present Adobe Systems Incorporated. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -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 */
@@ -274,8 +274,6 @@ module.exports = function (grunt) {
                     'src/thirdparty/CodeMirror/lib/util/searchcursor.js',
                     'src/thirdparty/CodeMirror/addon/edit/closetag.js',
                     'src/thirdparty/CodeMirror/addon/selection/active-line.js',
-                    'src/thirdparty/mustache/mustache.js',
-                    'src/thirdparty/path-utils/path-utils.min',
                     'src/thirdparty/less-2.5.1.min.js'
                 ],
                 helpers : [
@@ -299,13 +297,12 @@ module.exports = function (grunt) {
         'jasmine_node': {
             projectRoot: 'src/extensibility/node/spec/'
         },
-        jshint: {
+        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'
+                quiet: true
             }
         },
         shell: {
@@ -320,16 +317,16 @@ module.exports = function (grunt) {
     grunt.registerTask('install', ['write-config', 'less']);
 
     // task: test
-    grunt.registerTask('test', ['jshint', 'jasmine']);
-//    grunt.registerTask('test', ['jshint', '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/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Adobe Systems Incorporated. All rights reserved.
+Copyright (c) 2012 - present Adobe Systems Incorporated. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"), 

diff --git a/README.md b/README.md
@@ -111,7 +111,8 @@ Not sure you needed the exclamation point there, but we like your enthusiasm.
 
 #### Contact info
 
-* **Slack:** [Brackets on Slack](https://brackets.slack.com) (You can join by [requesting an invite](https://brackets-slack.herokuapp.com/))
+* **E-mail:** [admin@brackets.io](mailto:admin@brackets.io)
+* **Slack:** [Brackets on Slack](https://brackets.slack.com) (You can join by sending a mail to [admin@brackets.io](mailto:admin@brackets.io) with the subject line `slack registration request` specifying the email addresses you would like to register).
 * **Developers mailing list:** http://groups.google.com/group/brackets-dev
 * **Twitter:** [@brackets](https://twitter.com/brackets)
 * **Blog:** http://blog.brackets.io/

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.7.0-0",
+    "apiVersion": "1.7.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"
@@ -19,7 +19,7 @@
         "grunt-cli": "0.1.9",
         "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",
@@ -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/cs/Getting Started/main.css b/samples/cs/Getting Started/main.css
@@ -1,26 +1,25 @@
 html {
-    background-color: #e6e9e9;
-    background-image: -webkit-linear-gradient(270deg,rgb(230,233,233) 0%,rgb(216,221,221) 100%);
-    background-image: linear-gradient(270deg,rgb(230,233,233) 0%,rgb(216,221,221) 100%);
+    background: #e6e9e9;
+    background-image: linear-gradient(270deg, rgb(230, 233, 233) 0%, rgb(216, 221, 221) 100%);
     -webkit-font-smoothing: antialiased;
 }
 
 body {
-    margin: 0 auto;
-    padding: 2em 2em 4em;
-    max-width: 800px;
+    background: #fff;
+    box-shadow: 0 0 2px rgba(0, 0, 0, 0.06);
+    color: #545454;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 16px;
-    line-height: 1.5em;
-    color: #545454;
-    background-color: #ffffff;
-    box-shadow: 0 0 2px rgba(0, 0, 0, 0.06);
+    line-height: 1.5;
+    margin: 0 auto;
+    max-width: 800px;
+    padding: 2em 2em 4em;
 }
 
 h1, h2, h3, h4, h5, h6 {
     color: #222;
     font-weight: 600;
-    line-height: 1.3em;
+    line-height: 1.3;
 }
 
 h2 {
@@ -41,7 +40,7 @@ samp {
 
 img {
     -webkit-animation: colorize 2s cubic-bezier(0, 0, .78, .36) 1;
-    animation: colorize 2s cubic-bezier(0, 0, .78, .36) 1;
+            animation: colorize 2s cubic-bezier(0, 0, .78, .36) 1;
     background: transparent;
     border: 10px solid rgba(0, 0, 0, 0.12);
     border-radius: 4px;