Merge remote-tracking branch 'origin/master' into jasonsanjose/prototcol-M31-branch-1650

Author: redmunds

.brackets.json

@@ -4,13 +4,18 @@
         "plusplus": true,
         "devel": true,
         "nomen": true,
-        "maxerr": 50
+        "maxerr": 50,
+        "es5": true
     },
     "defaultExtension": "js",
     "path": {
         "src/thirdparty/CodeMirror2/**/*.js": {
             "spaceUnits": 2,
             "linting.enabled": false
+        },
+        "src/thirdparty/globmatch.js": {
+            "spaceUnits": 2,
+            "linting.enabled": false
         }
     },
     "spaceUnits": 4,

.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

@@ -27,8 +27,6 @@ module.exports = function (grunt) {
     // load dependencies
     require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin']});
     grunt.loadTasks('tasks');
-
-    var common = require("./tasks/lib/common")(grunt);
 
     // Project configuration.
     grunt.initConfig({
@@ -128,6 +126,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 +201,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,6 +249,7 @@ module.exports = function (grunt) {
                 specs : '<%= meta.specs %>',
                 /* Keep in sync with test/SpecRunner.html dependencies */
                 vendor : [
+                    '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.0.min.js',
                     'src/thirdparty/CodeMirror2/lib/codemirror.js',
                     'src/thirdparty/CodeMirror2/lib/util/dialog.js',
@@ -254,7 +258,7 @@ module.exports = function (grunt) {
                     '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.0.min.js'
                 ],
                 helpers : [
                     'test/spec/PhantomHelper.js'
@@ -306,9 +310,9 @@ module.exports = function (grunt) {
     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', [

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 

README.md

@@ -1,7 +1,7 @@
-Welcome to Brackets! [![Build Status](https://travis-ci.org/adobe/brackets.png?branch=master)](https://travis-ci.org/adobe/brackets)
+Welcome to Brackets! [![Build Status](https://travis-ci.org/adobe/brackets.svg?branch=master)](https://travis-ci.org/adobe/brackets)
 -------------------
 
-This is an early version of Brackets, a code editor for HTML, CSS
+Brackets is a modern open-source code editor for HTML, CSS
 and JavaScript that's *built* in HTML, CSS and JavaScript. 
 
 What makes Brackets different from other web code editors?
@@ -15,22 +15,20 @@ back and forth between your real source code and the browser view.
 * **Do it yourself.** Because Brackets is open source, and built with HTML, CSS
 and JavaScript, you can [help build](https://github.com/adobe/brackets/blob/master/CONTRIBUTING.md) the best code editor for the web.
 
+Brackets is at 1.0 and we're not stopping there. We have many feature ideas on our
+[trello board](http://bit.ly/BracketsTrelloBoard) that we're anxious to add and other
+innovative web development workflows that we're planning to build into Brackets. 
+So take Brackets out for a spin and let us know how we can make it your favorite editor. 
+
 You can see some 
 [screenshots of Brackets](https://github.com/adobe/brackets/wiki/Brackets-Screenshots)
 on the wiki, [intro videos](http://www.youtube.com/user/CodeBrackets) on YouTube, and news on the [Brackets blog](http://blog.brackets.io/).
 
-
 How to install and run Brackets
 -------------------------------
-
-
-#### Brackets is getting close to 1.0
-
-Together with your contributions, we're getting close to our first release candidate.  What's there is reasonably stable, and the Brackets team even uses Brackets to develop Brackets full time. So feel free to give it a spin and let us know what's missing! Being built on JavaScript, it's easy to make your own changes, and we give priority to integrating your pull requests back into Brackets!
-
 #### Download
 
-Installers for the latest stable build for Mac, Windows and Linux (Debian/Ubuntu) can be [downloaded here](http://download.brackets.io/).
+Installers for the latest stable build for Mac, Windows and Linux (Debian/Ubuntu) can be [downloaded here](http://brackets.io/).
 
 The Linux version has most of the features of the Mac and Windows versions, but
 is still missing a few things. See the [Linux wiki page](https://github.com/adobe/brackets/wiki/Linux-Version)
@@ -55,7 +53,7 @@ see the [extensions wiki page](https://github.com/adobe/brackets/wiki/Brackets-E
 
 #### Need help?
 
-Having problems starting Brackets the first time, or not sure how to use brackets?  Please 
+Having problems starting Brackets the first time, or not sure how to use Brackets?  Please 
 review [Troubleshooting](https://github.com/adobe/brackets/wiki/Troubleshooting), which helps 
 you to fix common problems and find extra help if needed.
 
@@ -86,7 +84,7 @@ Awesome! _There are lots of ways you can help._ First read
 then learn how to [pull the repo and hack on Brackets](https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets).
 
 The text editor inside Brackets is based on 
-[CodeMirror](http://github.com/marijnh/CodeMirror)—thanks to Marijn for
+[CodeMirror](http://github.com/codemirror/CodeMirror)—thanks to Marijn for
 taking our pull requests, implementing feature requests and fixing bugs! See 
 [Notes on CodeMirror](https://github.com/adobe/brackets/wiki/Notes-on-CodeMirror)
 for info on how we're using CodeMirror.
@@ -105,14 +103,14 @@ Not sure you needed the exclamation point there, but we like your enthusiasm.
 
 #### What's Brackets working on next?
 
-* In our [feature backlog](http://bit.ly/BracketsBacklog), the columns labeled "Sprint N"
-  are features already in progress and should ship within 2 weeks. Features at the top of
-  the "Product Backlog" list will come next.
+* In our [feature backlog](http://bit.ly/BracketsBacklog), the columns to the right
+  (starting from "Development") list the features that we're currently working on.
+  "Ready" shows what we'll be working on next.
 * Watch our [GitHub activity stream](https://github.com/adobe/brackets/pulse).
 
 #### Contact info
 
-* **Twitter:** [@brackets](http://twitter.com/#!/brackets)
+* **Twitter:** [@brackets](https://twitter.com/brackets)
 * **Blog:** http://blog.brackets.io/
 * **IRC:** [#brackets on freenode](http://webchat.freenode.net/?channels=brackets)
 * **Developers mailing list:** http://groups.google.com/group/brackets-dev

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Brackets",
-    "version": "0.37.0-0",
-    "apiVersion": "0.37.0",
+    "version": "1.1.0-0",
+    "apiVersion": "1.1.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"
@@ -17,7 +17,7 @@
         "jasmine-node": "1.11.0",
         "grunt-jasmine-node": "0.1.0",
         "grunt-cli": "0.1.9",
-        "phantomjs": "1.9.0-1",
+        "phantomjs": "1.9.11",
         "grunt-lib-phantomjs": "0.3.0",
         "grunt-contrib-jshint": "0.6.0",
         "grunt-contrib-watch": "0.4.3",
@@ -35,7 +35,9 @@
         "grunt-usemin": "0.1.11",
         "load-grunt-tasks": "0.2.0",
         "q": "0.9.2",
-        "jshint": "2.1.4"
+        "semver": "^4.1.0",
+        "jshint": "2.1.4",
+        "xmldoc": "^0.1.2"
     },
     "scripts": {
         "postinstall": "grunt install",