Merged with master

Author: WebsiteDeveloper

.gitignore

@@ -1,9 +1,12 @@
 Thumbs.db
-node_modules
-npm-debug.log
 src/brackets.css
 src/brackets.min.css
 
+# ignore node_modules created by grunt, but not more deeply-nested node_modules
+/node_modules
+/npm-debug.log
+
+
 # ignore everything in the dev extension directory EXCEPT the README
 # (so that the directory is non-empty and can be in git)
 src/extensions/dev/*

CONTRIBUTING.md

@@ -5,6 +5,10 @@ With this file we want to provide some general guidance how to contribute to Bra
 
 Issues starting Brackets the first time? Please review the [Troubleshooting Page](https://github.com/adobe/brackets/wiki/Troubleshooting).         
 
+## Starter Bugs
+
+If you need some inspiration for a **starter bug**, we have some for you either as [GitHub Issue](https://github.com/adobe/brackets/issues?labels=starter+bug&page=1&state=open) or on the [Trello Board](https://trello.com/board/brackets/4f90a6d98f77505d7940ce88) (there, choose on the right hand sidebar "Filter Cards" and then click on "Starter Feature").
+
 ## Getting Started
 
 Before you start coding, post to the [brackets-dev Google group](http://groups.google.com/group/brackets-dev) or the [#brackets IRC channel on freenode](http://freenode.net) about what you're thinking of working on, so you can get early feedback. 
@@ -51,3 +55,4 @@ priority. If a pull request already shows an assignee, please check with him/her
 
 * [the Brackets github issue tracker](https://github.com/adobe/brackets/issues)
 * [Brackets wiki](https://github.com/adobe/brackets/wiki/Resources)
+* [Contribute Page](http://brackets.io/contribute/)

Gruntfile.js

@@ -1,3 +1,25 @@
+/*
+ * 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 
+ * 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, 
+ * 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 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
 /*global module, require*/
 module.exports = function (grunt) {
     'use strict';
@@ -10,8 +32,10 @@ module.exports = function (grunt) {
                 '!src/thirdparty/**',
                 '!src/widgets/bootstrap-*.js',
                 '!src/extensions/**/unittest-files/**/*.js',
+                '!src/extensions/**/thirdparty/**/*.js',
                 '!src/extensions/dev/**',
                 '!src/extensions/disabled/**',
+                '!src/extensions/**/node_modules/**/*.js',
                 '!src/**/*-min.js',
                 '!src/**/*.min.js'
             ],
@@ -26,6 +50,7 @@ module.exports = function (grunt) {
             /* specs that can run in phantom.js */
             specs : [
                 'test/spec/CommandManager-test.js',
+                'test/spec/LanguageManager-test.js',
                 'test/spec/PreferencesManager-test.js',
                 'test/spec/ViewUtils-test.js'
             ]
@@ -51,7 +76,11 @@ module.exports = function (grunt) {
                     'src/thirdparty/CodeMirror2/lib/codemirror.js',
                     'src/thirdparty/CodeMirror2/lib/util/dialog.js',
                     'src/thirdparty/CodeMirror2/lib/util/searchcursor.js',
-                    'src/thirdparty/mustache/mustache.js'
+                    'src/thirdparty/mustache/mustache.js',
+                    'src/thirdparty/path-utils/path-utils.min'
+                ],
+                helpers : [
+                    'test/spec/PhantomHelper.js'
                 ],
                 template : require('grunt-template-jasmine-requirejs'),
                 templateOptions: {
@@ -82,31 +111,21 @@ module.exports = function (grunt) {
     });
 
     // load dependencies
+    grunt.loadTasks('tasks');
     grunt.loadNpmTasks('grunt-contrib-jasmine');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-watch');
 
     // task: install
     grunt.registerTask('install', ['write-config']);
 
-    // task: write-config
-    // merge package.json and src/brackets.config.json into src/config.json
-    grunt.registerTask('write-config', function () {
-        var packageJSON = grunt.file.readJSON("package.json"),
-            appConfigJSON = grunt.file.readJSON("src/brackets.config.json");
-
-        Object.keys(packageJSON).forEach(function (key) {
-            if (appConfigJSON[key] === undefined) {
-                appConfigJSON[key] = packageJSON[key];
-            }
-        });
-
-        grunt.file.write("src/config.json", JSON.stringify(appConfigJSON, null, "    "));
-    });
-
     // task: test
     grunt.registerTask('test', ['jshint', 'jasmine']);
 
+    // task: set-sprint
+    // Update sprint number in package.json and rewrite src/config.json
+    grunt.registerTask('set-sprint', ['update-sprint-number', 'write-config']);
+
     // Default task.
     grunt.registerTask('default', ['test']);
 };

README.md

@@ -1,4 +1,4 @@
-Welcome to Brackets! [![Build Status](https://travis-ci.org/adobe/brackets.png)](https://travis-ci.org/adobe/brackets)
+Welcome to Brackets! [![Build Status](https://travis-ci.org/adobe/brackets.png?branch=master)](https://travis-ci.org/adobe/brackets)
 -------------------
 
 Installers for the latest build can be [downloaded here](http://download.brackets.io/).
@@ -25,13 +25,13 @@ Brackets is early in development, so many of the features you would
 expect in a code editor are missing, and some existing features might be
 incomplete or not as useful as you'd want. But if you like the direction
 it's going, the [CONTRIBUTING.md](https://github.com/adobe/brackets/blob/master/CONTRIBUTING.md) 
-file contains some useful links to help you getting started, please contribute!    
+file contains some useful links to help you get started. Please contribute!    
 
 The text editor inside Brackets is based on 
 [CodeMirror](http://github.com/marijnh/CodeMirror)—thanks to Marijn for
-taking our pull requests :) See 
+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 upcoming things we're planning to contribute to CodeMirror.
+for info on how we're using CodeMirror.
 
 How to run Brackets
 -------------------
@@ -50,11 +50,11 @@ The native shell for Brackets lives in a separate repo,
 The Brackets native shell currently runs on Mac and Windows.
 The community has started working on a Linux port, and is making great progress;
 if you're interested, check out the
-[discussion thread](https://groups.google.com/forum/?fromgroups=#!topic/brackets-dev/29vOJ6tvl8A)
-on the brackets-dev Google Group.
+[Linux Version](https://github.com/adobe/brackets/wiki/Linux-Version) wiki page.
 
-You can download "stable" builds of Brackets from 
-[download.brackets.io](http://download.brackets.io). If you want to pull the repo directly via git, see [How to Hack on Brackets](https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets)
+You can download stable builds of Brackets from 
+[download.brackets.io](http://download.brackets.io). If you want to pull the repo 
+directly via git, see [How to Hack on Brackets](https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets)
 for instructions on how to get everything. 
 
 By default, Brackets opens a folder containing some simple "Getting Started" content.

package.json

@@ -1,30 +1,26 @@
 {
-    "name"                  : "Brackets",
-    "version"               : "0.20.0-0",
-    "homepage"              : "http://brackets.io",
-    "issues"                :
-    {
-        "url"               : "http://github.com/adobe/brackets/issues"
+    "name": "Brackets",
+    "version": "0.21.0-0",
+    "homepage": "http://brackets.io",
+    "issues": {
+        "url": "http://github.com/adobe/brackets/issues"
     },
-    "repository"            :
-    {
-        "type"              : "git",
-        "url"               : "https://github.com/adobe/brackets.git",
-        "branch"            : "",
-        "SHA"               : ""
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/adobe/brackets.git",
+        "branch": "",
+        "SHA": ""
     },
-    "devDependencies"       :
-    {
-        "grunt"                 : ">=0.4.0rc5",
-        "grunt-cli"             : ">=0.1.6",
-        "grunt-contrib-jshint"  : ">=0.1.1rc6",
-        "grunt-contrib-watch"   : ">=0.2.0rc5",
-        "grunt-contrib-jasmine" : ">=0.3.0rc7",
-        "grunt-template-jasmine-requirejs" : ">=0.1.0"
+    "devDependencies": {
+        "grunt": "~0.4.0",
+        "grunt-cli": "~0.1.0",
+        "grunt-contrib-jshint": "~0.2.0",
+        "grunt-contrib-watch": "~0.2.0",
+        "grunt-contrib-jasmine": "~0.3.0",
+        "grunt-template-jasmine-requirejs": "~0.1.0"
     },
-    "scripts"               :
-    {
-        "postinstall"       : "grunt install",
-        "test"              : "grunt test"
+    "scripts": {
+        "postinstall": "grunt install",
+        "test": "grunt test"
     }
-}
+}

samples/de/Erste Schritte/screenshots/brackets-quick-edit.png

@@ -28,9 +28,10 @@ samp
 
 img
 {
+    background: dimgray;
     border: 1px solid black;
-    background-color: dimgray;
-    padding: 10px;
+    border-radius: 2px;
+    padding: 15px 10px 10px;
     margin: 10px 0;
     max-width: 95%;
 }

samples/es/Primeros Pasos/main.css

@@ -209,7 +209,9 @@ define(function DOMAgent(require, exports, module) {
     // WebInspector Event: Page.frameNavigated
     function _onFrameNavigated(event, res) {
         // res = {frame}
-        exports.url = _cleanURL(res.frame.url);
+        if (!res.frame.parentId) {
+            exports.url = _cleanURL(res.frame.url);
+        }
     }
 
      // WebInspector Event: DOM.documentUpdated
@@ -291,6 +293,9 @@ define(function DOMAgent(require, exports, module) {
                 if (n.location > node.location) {
                     n.location += delta;
                 }
+                if (n.closeLocation !== undefined && n.closeLocation > node.location) {
+                    n.closeLocation += delta;
+                }
             });
         }
     }

samples/es/Primeros Pasos/screenshots/brackets-quick-edit.png

@@ -149,8 +149,10 @@ define(function GotoAgent(require, exports, module) {
         editor.focus();
 
         if (!noFlash) {
-            codeMirror.setLineClass(location.line, "flash");
-            window.setTimeout(codeMirror.setLineClass.bind(codeMirror, location.line), 1000);
+            codeMirror.addLineClass(location.line, "wrap", "flash");
+            window.setTimeout(function () {
+                codeMirror.removeLineClass(location.line, "wrap", "flash");
+            }, 1000);
         }
     }