Merge remote-tracking branch 'origin/master' into pflynn/better-quicksearch-field

Reimplements the fixes from PR #9624 & #9153 in a simpler way: instead of
trying to selectively suppress ModalBar's scroll pos adjustments, in cases
where we need to revert scroll pos in one file, just wait until ModalBar is
done adjusting scroll pos and *then* reset the one we care about. Made
possible by the fact that we now listen for ModalBar's "close" event and
the event passes info on the reason for closing.

Removes delay before results list opens: in CEF 2171 it seems both unneeded
(animation is smooth without it) and it triggers an apparent Chrome bug where
the post-animation state is displayed during the delay period even though
the computed style reflects the pre-animation state.

Conflicts:
    src/search/QuickOpen.js
    src/styles/brackets.less
    src/styles/brackets_colors.less
    src/widgets/ModalBar.js

Author: peterflynn

.brackets.json

@@ -4,15 +4,26 @@
         "plusplus": true,
         "devel": true,
         "nomen": true,
-        "maxerr": 50
+        "maxerr": 50,
+        "es5": true
     },
     "defaultExtension": "js",
+    "language": {
+        "javascript": {
+            "linting.prefer": ["JSLint", "JSHint"],
+            "linting.usePreferredOnly": true
+        }
+    },
     "path": {
         "src/thirdparty/CodeMirror2/**/*.js": {
             "spaceUnits": 2,
             "linting.enabled": false
+        },
+        "src/thirdparty/globmatch.js": {
+            "spaceUnits": 2,
+            "linting.enabled": false
         }
     },
     "spaceUnits": 4,
     "useTabChar": false
-}
+}

.gitmodules

@@ -24,4 +24,4 @@
 	url = https://github.com/requirejs/i18n.git
 [submodule "src/extensions/default/JSLint/thirdparty/jslint"]
 	path = src/extensions/default/JSLint/thirdparty/jslint
-	url = https://github.com/douglascrockford/JSLint.git
+	url = https://github.com/peterflynn/JSLint.git

.jshintrc

@@ -13,7 +13,7 @@
     "regexp"        : true,
     "undef"         : true,
     "strict"        : true,
-    "trailing"      : false,
+    "unused"        : "vars",
 
     "asi"           : false,
     "boss"          : false,
@@ -35,15 +35,14 @@
     "proto"         : false,
     "regexdash"     : false,
     "scripturl"     : false,
-    "smarttabs"     : false,
     "shadow"        : false,
     "sub"           : false,
     "supernew"      : false,
     "validthis"     : false,
 
-    "browser"       : true,
+    "browser"       : false,
     "couch"         : false,
-    "devel"         : false,
+    "devel"         : true,
     "dojo"          : false,
     "jquery"        : false,
     "mootools"      : false,
@@ -52,24 +51,20 @@
     "prototypejs"   : false,
     "rhino"         : false,
     "wsh"           : false,
-    
-    "nomen"         : false,
-    "onevar"        : false,
-    "passfail"      : false,
-    "white"         : false,
 
     "maxerr"        : 100,
-    "predef"        : [
-    ],
     "indent"        : 4,
-    "globals"       : [
-        "require",
-        "define",
-        "brackets",
-        "$",
-        "PathUtils",
-        "window",
-        "navigator",
-        "Mustache"
-    ]
-}
+    "globals"       : {
+        "window": false,
+        "document": false,
+        "setTimeout": false,
+        "require": false,
+        "define": false,
+        "brackets": false,
+        "$": false,
+        "PathUtils": false,
+        "window": false,
+        "navigator": false,
+        "Mustache": false
+    }
+}

.travis.yml

@@ -1,11 +1,10 @@
 language: node_js
 node_js:
-  - 0.10
+  - "0.10"
 before_script:
   - npm install -g grunt-cli
   - npm install -g jasmine-node
 notifications:
-  irc: "chat.freenode.net#brackets"
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/9c767842144fd24d26a5

CONTRIBUTING.md

@@ -54,7 +54,7 @@ Here are some ideas:
 
 * [Starter bugs](https://github.com/adobe/brackets/issues?labels=starter+bug&state=open) can
   provide a good intro to the Brackets code.
-* [Extension ideas](https://github.com/adobe/brackets/issues?labels=Extension+Idea&state=closed)
+* [Extension ideas](https://github.com/adobe/brackets/issues?q=label%3A%22Extension+Idea%22)
   are feature requests that we think would be best implemented as an add-on; it's up to the
   Brackets community to write them!
 * [Starter features](http://bit.ly/BracketsBacklog) are a bit larger in scope. Be sure to discuss

Gruntfile.js

@@ -1,35 +1,33 @@
 /*
  * Copyright (c) 2013 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"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 /*global module, require*/
 module.exports = function (grunt) {
     'use strict';
 
     // load dependencies
-    require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin']});
+    require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin', 'grunt-cleanempty']});
     grunt.loadTasks('tasks');
 
-    var common = require("./tasks/lib/common")(grunt);
-    
     // Project configuration.
     grunt.initConfig({
         pkg  : grunt.file.readJSON("package.json"),
@@ -61,7 +59,9 @@ module.exports = function (grunt) {
                             'xorigin.js',
                             'dependencies.js',
                             'thirdparty/requirejs/require.js',
-                            'LiveDevelopment/launch.html'
+                            'LiveDevelopment/launch.html',
+                            'LiveDevelopment/MultiBrowserImpl/transports/**',
+                            'LiveDevelopment/MultiBrowserImpl/launchers/**'
                         ]
                     },
                     /* node domains are not minified and must be copied to dist */
@@ -72,6 +72,8 @@ module.exports = function (grunt) {
                         src: [
                             'extensibility/node/**',
                             '!extensibility/node/spec/**',
+                            '!extensibility/node/node_modules/**/{test,tst}/**/*',
+                            '!extensibility/node/node_modules/**/examples/**/*',
                             'filesystem/impls/appshell/node/**',
                             '!filesystem/impls/appshell/node/spec/**'
                         ]
@@ -82,15 +84,21 @@ module.exports = function (grunt) {
                         dest: 'dist/',
                         cwd: 'src/',
                         src: [
+                            'extensions/default/**/*',
                             '!extensions/default/*/unittest-files/**/*',
                             '!extensions/default/*/unittests.js',
-                            'extensions/default/*/**/*',
+                            '!extensions/default/{*/thirdparty,**/node_modules}/**/test/**/*',
+                            '!extensions/default/{*/thirdparty,**/node_modules}/**/doc/**/*',
+                            '!extensions/default/{*/thirdparty,**/node_modules}/**/examples/**/*',
+                            '!extensions/default/*/thirdparty/**/*.htm{,l}',
                             'extensions/dev/*',
                             'extensions/samples/**/*',
                             'thirdparty/CodeMirror2/addon/{,*/}*',
                             'thirdparty/CodeMirror2/keymap/{,*/}*',
                             'thirdparty/CodeMirror2/lib/{,*/}*',
                             'thirdparty/CodeMirror2/mode/{,*/}*',
+                            '!thirdparty/CodeMirror2/mode/**/*.html',
+                            '!thirdparty/CodeMirror2/**/*test.js',
                             'thirdparty/CodeMirror2/theme/{,*/}*',
                             'thirdparty/i18n/*.js',
                             'thirdparty/text/*.js'
@@ -106,6 +114,13 @@ module.exports = function (grunt) {
                 ]
             }
         },
+        cleanempty: {
+            options: {
+                force: true,
+                files: false
+            },
+            src: ['dist/**/*'],
+        },
         less: {
             dist: {
                 files: {
@@ -128,6 +143,9 @@ module.exports = function (grunt) {
                     // `name` and `out` is set by grunt-usemin
                     baseUrl: 'src',
                     optimize: 'uglify2',
+                    // brackets.js should not be loaded until after polyfills defined in "utils/Compatibility"
+                    // so explicitly include it in main.js
+                    include: ["utils/Compatibility", "brackets"],
                     // TODO: Figure out how to make sourcemaps work with grunt-usemin
                     // https://github.com/yeoman/grunt-usemin/issues/30
                     generateSourceMaps: true,
@@ -200,6 +218,8 @@ module.exports = function (grunt) {
                 'test/**/*.js',
                 '!test/perf/*-files/**/*.js',
                 '!test/spec/*-files/**/*.js',
+                '!test/spec/*-known-goods/**/*.js',
+                '!test/spec/FindReplace-test-files-*/**/*.js',
                 '!test/smokes/**',
                 '!test/temp/**',
                 '!test/thirdparty/**',
@@ -246,15 +266,16 @@ module.exports = function (grunt) {
                 specs : '<%= meta.specs %>',
                 /* Keep in sync with test/SpecRunner.html dependencies */
                 vendor : [
-                    'src/thirdparty/jquery-2.1.0.min.js',
+                    'test/polyfills.js', /* For reference to why this polyfill is needed see Issue #7951. The need for this should go away once the version of phantomjs gets upgraded to 2.0 */
+                    'src/thirdparty/jquery-2.1.3.min.js',
                     'src/thirdparty/CodeMirror2/lib/codemirror.js',
                     'src/thirdparty/CodeMirror2/lib/util/dialog.js',
                     'src/thirdparty/CodeMirror2/lib/util/searchcursor.js',
                     'src/thirdparty/CodeMirror2/addon/edit/closetag.js',
                     'src/thirdparty/CodeMirror2/addon/selection/active-line.js',
                     'src/thirdparty/mustache/mustache.js',
                     'src/thirdparty/path-utils/path-utils.min',
-                    'src/thirdparty/less-1.4.2.min.js'
+                    'src/thirdparty/less-1.7.5.min.js'
                 ],
                 helpers : [
                     'test/spec/PhantomHelper.js'
@@ -298,17 +319,17 @@ module.exports = function (grunt) {
             linux: "<%= shell.repo %>/installer/linux/debian/package-root/opt/brackets/brackets"
         }
     });
-    
+
     // task: install
     grunt.registerTask('install', ['write-config', 'less']);
 
     // task: test
     grunt.registerTask('test', ['jshint:all', 'jasmine']);
 //    grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine_node']);
 
-    // task: set-sprint
-    // Update sprint number in package.json and rewrite src/config.json
-    grunt.registerTask('set-sprint', ['update-sprint-number', 'write-config']);
+    // 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', [
@@ -324,6 +345,7 @@ module.exports = function (grunt) {
         /*'cssmin',*/
         /*'uglify',*/
         'copy',
+        'cleanempty',
         'usemin',
         'build-config'
     ]);

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Adobe Systems Incorporated. All rights reserved.
+Copyright (c) 2012-2015 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"), 

NOTICE

@@ -458,6 +458,51 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
 OTHER DEALINGS IN THE SOFTWARE.
 
+Copyright 2013-2014 Facebook, Inc.
+This product includes software licensed under the Apache License, Version 2.0 
+http://www.apache.org/licenses/LICENSE-2.0.
+
+BSD License
+For Immutable JS software
+Copyright (c) 2014, Facebook, Inc. All rights reserved.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+* Neither the name Facebook nor the names of its contributors may be used to
+endorse or promote products derived from this software without specific
+prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 2014, Facebook, Inc. All rights reserved.
+
+React JavaScript library
+
+Licensed under the Apache License, Version 2.0
+
+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.
+
+See also: https://github.com/facebook/react/blob/master/LICENSE
+
+
 Timothy Farrell
 Copyright (c) 2010 Timothy Farrell
 Permission is hereby granted, free of charge, to any person obtaining a copy of this