Merge remote-tracking branch 'origin/master' into pflynn/find-in-files-scope

* origin/master: (206 commits)
  Update 'de' locale
  Add cleanup bug number to TODO. Improve docs on Resizer.
  update recent projects extension. remove reference to settings button.
  encode the URLs
  Fix Menu.removeMenuItem() unit tests: update for new setup where all tests in spec share one window (use unique ids for everything). Code cleanup in removeMenuItem(): use existing utility method to compute menu item id. Plus some docs tweaks.
  also check status 0
  Fix bug with Select Line around end of inline editor range, and add unit tests for it.
  Remove unused argument to highlightMatch()
  Fix edge case with string range reporting from stringMatch()
  trap status from XMLHttpRequest and fail accordingly
  Unit tests for new Select Line command (pull #2002)
  pass return value
  Comment formatting tweak per code review
  Fix Quick Open so discontiguous matches are highlighted in modes other than file search: - Hoist out generic highlightMatch() utility to generate bolded strings - Use it in both defaultResultsFormatter() and _filenameResultsFormatter() Also: - Clarify stringMatch() docs a bit - Fix an older glitch in basicMatchSort(): the sort field precedence list had a gap, leading to a no-op comparison step
  fix margin/padding in recent project drop down
  add Project Settings... item to file menu
  code review changes
  More focus bug fixes
  remove commented out code
  Tweaks to docs in various files: clarifications & added/fixed type annotations. Fix lots of JSLint errors in CSSUtils-test. Remove unused dependencies in WorkingSetView.
  ...

Conflicts:
	src/command/Menus.js

Author: peterflynn

.gitignore

@@ -2,10 +2,10 @@ Thumbs.db
 src/brackets.css
 src/brackets.min.css
 
-# ignore everything in the user extension directory EXCEPT the README
+# ignore everything in the dev extension directory EXCEPT the README
 # (so that the directory is non-empty and can be in git)
-src/extensions/user/*
-!src/extensions/user/README
+src/extensions/dev/*
+!src/extensions/dev/README
 
 #OSX .DS_Store files
 .DS_Store

LICENSE

@@ -17,7 +17,3 @@ 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.
-
-Please note that some portions of this project are written by third parties
-under different license terms. Your use of those portions are governed by
-the license terms contained in the corresponding files.

NOTICE

@@ -0,0 +1,165 @@
+Brackets is licensed under the MIT license (see LICENSE file).
+
+Brackets uses the following third party libraries that may have licenses 
+differing from that of Brackets itself. You can find the libraries and their
+respective licenses below.
+
+
+ - CodeMirrror - ./src/thirdparty/CodeMirror2
+
+    Copyright (C) 2012 by Marijn Haverbeke <[email protected]>
+
+    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.
+
+    Please note that some subdirectories of the CodeMirror distribution
+    include their own LICENSE files, and are released under different
+    licences.
+
+
+ - jQuery - ./src/thirdparty/jquery-1.7.js
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+
+ - JSLint - ./src/thirdparty/jslint
+
+    Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
+
+    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 shall be used for Good, not Evil.
+
+    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.
+
+
+ - LESS - ./src/thirdparty/less-1.3.0.min.js
+
+    Copyright (c) 2009-2011, Alexis Sellier
+    Licensed under the Apache 2.0 License.
+
+
+ - i18n.js - ./src/thirdparty/i18n.js
+
+    Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+    Available via the MIT or new BSD license.
+    see: http://github.com/jrburke/requirejs for details
+
+
+ - jsTree - ./src/thirdparty/jstree_pre1.0_fix_1
+
+    Copyright (c) 2010 Ivan Bozhanov (vakata.com)
+
+    Licensed same as jquery - under the terms of either the MIT License or the GPL Version 2 License
+        http://www.opensource.org/licenses/mit-license.php
+        http://www.gnu.org/licenses/gpl.html
+
+
+ - Mustache.js - ./src/thirdparty/mustache
+
+    Copyright (c) 2009 Chris Wanstrath (Ruby)
+    Copyright (c) 2010 Jan Lehnardt (JavaScript)
+
+    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.
+
+
+ - path-utils.js - ./src/thirdpary/path-utils
+
+    Copyright (c) 2011, Kin Blas
+    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 of the <organization> 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 <COPYRIGHT HOLDER> 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.
+
+
+ - Require.js - ./src/thirdparty/require.js
+
+    Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+    Available via the MIT or new BSD license.
+    see: http://github.com/jrburke/requirejs for details
+
+
+ - jQuery Smart Auto Complete Plugin - ./src/thirdparty/smart-auto-complete
+
+    Copyright (c) 2011 Lakshan Perera (laktek.com)
+
+    Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
+
+
+ - text.js - ./src/thirdparty/text.js
+
+    Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+    Available via the MIT or new BSD license.
+    see: http://github.com/jrburke/requirejs for details

src/LiveDevelopment/Agents/DOMAgent.js

@@ -174,12 +174,17 @@ define(function DOMAgent(require, exports, module) {
 
     /** Load the source document and match it with the DOM tree*/
     function _onFinishedLoadingDOM() {
-        console.assert(exports.url.substr(0, 7) === "file://", "Can only load file urls");
         var request = new XMLHttpRequest();
         request.open("GET", exports.url);
         request.onload = function onLoad() {
-            _mapDocumentToSource(request.response);
-            _load.resolve();
+            if ((request.status >= 200 && request.status < 300) ||
+                    request.status === 304 || request.status === 0) {
+                _mapDocumentToSource(request.response);
+                _load.resolve();
+            } else {
+                var msg = "Received status " + request.status + " from XMLHttpRequest while attempting to load source file at " + exports.url;
+                _load.reject(msg, { message: msg });
+            }
         };
         request.onerror = function onError() {
             _load.reject("Could not load source file at " + exports.url);