Merge branch 'master' of https://github.com/adobe/brackets into fold-selected

Author: thehogfather

samples/pt-br/Primeiros Passos/index.html

@@ -85,7 +85,7 @@ <h2>Envolva-se</h2>
         <li><a href="http://github.com/adobe/brackets">Brackets no GitHub</a></li>
         <li><a href="http://github.com/adobe/brackets/wiki">Brackets Wiki</a></li>
         <li><a href="http://groups.google.com/group/brackets-dev">Mailing List Desenvolvedores Brackets</a></li>
-        <li><a href="https://twitter.com/#!/brackets">@Brackets no Twitter</a></li>
+        <li><a href="https://twitter.com/brackets">@Brackets no Twitter</a></li>
         <li>Fale com os desenvolvedores no canal IRC #brackets no Freenode</li>
     </ul>
 
@@ -112,4 +112,4 @@ <h2>Envolva-se</h2>
     [::::::::::::::      ::::::::::::::]
     [[[[[[[[[[[[[[[      ]]]]]]]]]]]]]]]
 
--->
+-->

src/command/KeyBindingManager.js

@@ -406,13 +406,13 @@ define(function (require, exports, module) {
         // Ensure that the first letter of the key name is in upper case and the rest are
         // in lower case. i.e. 'a' => 'A' and 'up' => 'Up'
         if (/^[a-z]/i.test(key)) {
-            key = key.charAt(0).toUpperCase() + key.substr(1).toLowerCase();
+            key = _.capitalize(key.toLowerCase());
         }
 
         // Also make sure that the second word of PageUp/PageDown has the first letter in upper case.
         if (/^Page/.test(key)) {
             key = key.replace(/(up|down)$/, function (match, p1) {
-                return p1.charAt(0).toUpperCase() + p1.substr(1);
+                return _.capitalize(p1);
             });
         }
 

src/command/Menus.js

@@ -957,7 +957,7 @@ define(function (require, exports, module) {
         menu = getMenu(id);
 
         _.forEach(menuItemMap, function (value, key) {
-            if (key.substring(0, id.length) === id) {
+            if (_.startsWith(key, id)) {
                 if (value.isDivider) {
                     menu.removeMenuDivider(key);
                 } else {

src/extensions/default/JavaScriptCodeHints/main.js

@@ -219,16 +219,7 @@ define(function (require, exports, module) {
         }
 
         // trim leading and trailing string literal delimiters from the query
-        if (query.indexOf(HintUtils.SINGLE_QUOTE) === 0 ||
-                query.indexOf(HintUtils.DOUBLE_QUOTE) === 0) {
-            trimmedQuery = query.substring(1);
-            if (trimmedQuery.lastIndexOf(HintUtils.DOUBLE_QUOTE) === trimmedQuery.length - 1 ||
-                    trimmedQuery.lastIndexOf(HintUtils.SINGLE_QUOTE) === trimmedQuery.length - 1) {
-                trimmedQuery = trimmedQuery.substring(0, trimmedQuery.length - 1);
-            }
-        } else {
-            trimmedQuery = query;
-        }
+        trimmedQuery = _.trim(query, HintUtils.SINGLE_QUOTE + HintUtils.DOUBLE_QUOTE);
 
         if (hints) {
             formattedHints = formatHints(hints, trimmedQuery);

src/language/CodeInspection.js

@@ -422,7 +422,7 @@ define(function (require, exports, module) {
                                     (error.pos.line + 1) > 0 &&
                                     (error.codeSnippet = currentDoc.getLine(error.pos.line)) !== undefined) {
                                 error.friendlyLine = error.pos.line + 1;
-                                error.codeSnippet = error.codeSnippet.substr(0, Math.min(175, error.codeSnippet.length));  // limit snippet width
+                                error.codeSnippet = error.codeSnippet.substr(0, 175);  // limit snippet width
                             }
 
                             if (error.type !== Type.META) {

src/nls/es/strings.js

@@ -403,8 +403,8 @@ define({
     "CMD_CSS_QUICK_EDIT_NEW_RULE"         : "Nueva regla",
     "CMD_NEXT_DOC"                        : "Documento siguiente",
     "CMD_PREV_DOC"                        : "Documento anterior",
-    "CMD_NEXT_DOC_LIST_ORDER"             : "Document siguiente en la lista",
-    "CMD_PREV_DOC_LIST_ORDER"             : "Document anterior en la lista",
+    "CMD_NEXT_DOC_LIST_ORDER"             : "Documento siguiente en la lista",
+    "CMD_PREV_DOC_LIST_ORDER"             : "Documento anterior en la lista",
     "CMD_SHOW_IN_TREE"                    : "Mostrar en el árbol de directorios",
     "CMD_SHOW_IN_EXPLORER"                : "Mostrar en el Explorador",
     "CMD_SHOW_IN_FINDER"                  : "Mostrar en Finder",

src/preferences/PreferencesBase.js

@@ -1140,7 +1140,7 @@ define(function (require, exports, module) {
                 prefix = this.prefix;
 
             var onlyWithPrefix = function (id) {
-                if (id.substr(0, prefix.length) === prefix) {
+                if (_.startsWith(id, prefix)) {
                     return true;
                 }
                 return false;

src/preferences/PreferencesManager.js

@@ -407,9 +407,9 @@ define(function (require, exports, module) {
             if (before === -1) {
                 before = scopeOrder.length - 2;
             }
-            newScopeOrder = _.first(scopeOrder, before);
+            newScopeOrder = _.take(scopeOrder, before);
             newScopeOrder.push("project");
-            newScopeOrder.push.apply(newScopeOrder, _.rest(scopeOrder, before));
+            newScopeOrder.push.apply(newScopeOrder, _.drop(scopeOrder, before));
         } else {
             newScopeOrder = _.without(scopeOrder, "project");
         }

src/project/FileTreeView.js

@@ -469,7 +469,7 @@ define(function (require, exports, module) {
                 var aArgs = _.flatten([{
                     href: "#",
                     className: fileClasses
-                }, this.getIcons(), name, extension], true);
+                }, this.getIcons(), name, extension]);
                 nameDisplay = DOM.a.apply(DOM.a, aArgs);
             }
 
@@ -702,7 +702,7 @@ define(function (require, exports, module) {
             var aArgs = _.flatten([{
                 href: "#",
                 className: directoryClasses
-            }, this.getIcons()], true);
+            }, this.getIcons()]);
             if (!entry.get("rename")) {
                 aArgs.push(this.props.name);
             }

src/search/FindInFiles.js

@@ -138,7 +138,7 @@ define(function (require, exports, module) {
 
             if (highlightEndCh <= MAX_DISPLAY_LENGTH) {
                 // Don't store more than 200 chars per line
-                line = line.substr(0, Math.min(MAX_DISPLAY_LENGTH, line.length));
+                line = line.substr(0, MAX_DISPLAY_LENGTH);
             } else if (totalMatchLength > MAX_DISPLAY_LENGTH) {
                 // impossible to display the whole match
                 line = line.substr(ch, ch + MAX_DISPLAY_LENGTH);