Merge remote-tracking branch 'upstream/master'

Corne Dorrestijn · Corne Dorrestijn · commit 38ca366a9a17 · 2013-08-21T21:24:55.000+02:00
diff --git a/src/brackets.js b/src/brackets.js
@@ -271,7 +271,7 @@ define(function (require, exports, module) {
         }
 
         // Enable/Disable HTML Menus
-        if (brackets.platform !== "linux") {
+        if (brackets.nativeMenus) {
             $("body").addClass("has-appshell-menus");
         }
         
diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js
@@ -58,8 +58,8 @@ define(function (require, exports, module) {
         menu.addMenuDivider();
         menu.addMenuItem(Commands.FILE_EXTENSION_MANAGER);
         
-        // supress redundant quit menu item on mac
-        if (brackets.platform !== "mac" && !brackets.inBrowser) {
+        // suppress redundant quit menu item on mac
+        if (brackets.platform !== "mac" || !brackets.nativeMenus) {
             menu.addMenuDivider();
             menu.addMenuItem(Commands.FILE_QUIT);
         }
@@ -161,7 +161,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.HELP_SHOW_EXT_FOLDER);
 
 
-        var hasAboutItem = (brackets.platform !== "mac" || brackets.inBrowser);
+        var hasAboutItem = (brackets.platform !== "mac" || !brackets.nativeMenus);
         
         // Add final divider only if we have a twitter URL or about item
         if (hasAboutItem || brackets.config.twitter_url) {
diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -174,7 +174,7 @@ define(function (require, exports, module) {
     }
     
     function _isHTMLMenu(id) {
-        return (!$("body").hasClass("has-appshell-menus") || brackets.inBrowser) || _isContextMenu(id);
+        return (!brackets.nativeMenus || _isContextMenu(id));
     }
 
     /**
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -78,7 +78,7 @@ define(function (require, exports, module) {
         var currentDoc = DocumentManager.getCurrentDocument(),
             windowTitle = brackets.config.app_title;
 
-        if (brackets.inBrowser) {
+        if (!brackets.nativeMenus) {
             if (currentDoc) {
                 _$title.text(_currentTitlePath);
                 _$title.attr("title", currentDoc.file.fullPath);
diff --git a/src/editor/Editor.js b/src/editor/Editor.js
@@ -362,6 +362,7 @@ define(function (require, exports, module) {
             lineNumbers: _showLineNumbers,
             lineWrapping: _wordWrap,
             styleActiveLine: _styleActiveLine,
+            coverGutterNextToScrollbar: true,
             matchBrackets: true,
             dragDrop: false,
             extraKeys: codeMirrorKeyMap,
diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js
@@ -115,7 +115,7 @@ define({
 	"WITH": "Avec",
 	"BUTTON_YES": "Oui",
 	"BUTTON_NO": "Non",
-	"BUTTON_ALL": "[7118973] !é=All=!",
+	"BUTTON_ALL": "Tout",
 	"BUTTON_STOP": "Arrêter",
 	"BUTTON_REPLACE": "Remplacer",
 
@@ -127,7 +127,7 @@ define({
 	"NO_UPDATE_TITLE": "Votre logiciel est à jour.",
 	"NO_UPDATE_MESSAGE": "Vous utilisez la dernière version de {APP_NAME}.",
 
-	"FIND_REPLACE_TITLE": "[7118975] !é=Replace \"{0}\" with \"{1}\" &mdash; {3} {2} matches=!",
+	"FIND_REPLACE_TITLE": "Remplacer « {0} » par « {1} » &mdash; {3} {2} résultats",
 
 	"FIND_IN_FILES_TITLE": "« {4} » trouvé {5} &mdash; {0} {1} dans {2} {3}",
 	"FIND_IN_FILES_SCOPED": "dans <span class='dialog-filename'>{0}</span>",
@@ -448,8 +448,8 @@ define({
     
     // extensions/default/JavaScriptCodeHints
 	"CMD_JUMPTO_DEFINITION": "Accéder à la définition",
-	"CMD_SHOW_PARAMETER_HINT": "[7119026] !é=Show Parameter Hint=!",
-	"NO_ARGUMENTS": "[7119027] !é=<no parameters>=!",
+	"CMD_SHOW_PARAMETER_HINT": "Afficher l’indicateur de paramètre",
+	"NO_ARGUMENTS": "<aucun paramètre>",
 
     // extensions/default/JSLint
 	"CMD_JSLINT": "Activer JSLint",
diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js
@@ -127,7 +127,7 @@ define({
 	"NO_UPDATE_TITLE": "最新バージョンです",
 	"NO_UPDATE_MESSAGE": "{APP_NAME} の最新バージョンを実行中です。",
 
-	"FIND_REPLACE_TITLE": "!能=[7118975] Replace \"{0}\" with \"{1}\" &mdash; {3} {2} matches_=!",
+	"FIND_REPLACE_TITLE": "「{0}」を「{1}」に置換 &mdash; {3} {2} 件が見つかりました",
 
 	"FIND_IN_FILES_TITLE": "「{4}」の検索結果 {5} &mdash; {2} {3} / {0} {1}",
 	"FIND_IN_FILES_SCOPED": "<span class='dialog-filename'>{0}</span> 内",
@@ -448,8 +448,8 @@ define({
     
     // extensions/default/JavaScriptCodeHints
 	"CMD_JUMPTO_DEFINITION": "定義にジャンプ",
-	"CMD_SHOW_PARAMETER_HINT": "!能=[7119026] Show Parameter Hint_=!",
-	"NO_ARGUMENTS": "!能=[7119027] <no parameters>_=!",
+	"CMD_SHOW_PARAMETER_HINT": "パラメーターヒントを表示",
+	"NO_ARGUMENTS": "<パラメーターがありません>",
 
     // extensions/default/JSLint
 	"CMD_JSLINT": "JSLint を有効にする",
diff --git a/src/nls/tr/strings.js b/src/nls/tr/strings.js
@@ -140,10 +140,10 @@ define({
      * StatusBar strings
      */
     "STATUSBAR_CURSOR_POSITION"             : "Satır {0}, Kolon {1}",
-    "STATUSBAR_INDENT_TOOLTIP_SPACES"       : "Click to switch indentation to spaces",
-    "STATUSBAR_INDENT_TOOLTIP_TABS"         : "Click to switch indentation to tabs",
-    "STATUSBAR_INDENT_SIZE_TOOLTIP_SPACES"  : "Click to change number of spaces used when indenting",
-    "STATUSBAR_INDENT_SIZE_TOOLTIP_TABS"    : "Click to change tab character width",
+    "STATUSBAR_INDENT_TOOLTIP_SPACES"       : "Girintiyi boşluk karakterleriyle değiştirmek için tıklayın",
+    "STATUSBAR_INDENT_TOOLTIP_TABS"         : "Girintiyi tab karakterleriyle değiştirmek için tıklayın",
+    "STATUSBAR_INDENT_SIZE_TOOLTIP_SPACES"  : "Girintide kullanılacak boşluk sayısını değiştirmek için tıklayın",
+    "STATUSBAR_INDENT_SIZE_TOOLTIP_TABS"    : "Tab karakter genişliğini değiştirmek için tıklayın",
     "STATUSBAR_SPACES"                      : "Boşluk",
     "STATUSBAR_TAB_SIZE"                    : "Tab Boyutu",
     "STATUSBAR_LINE_COUNT"                  : "{0} Satır",
@@ -166,6 +166,7 @@ define({
     "CMD_LIVE_FILE_PREVIEW"               : "Canlı Önizleme",
     "CMD_PROJECT_SETTINGS"                : "Proje Ayarları\u2026",
     "CMD_FILE_RENAME"                     : "Yeniden Adlandır",
+    "CMD_FILE_DELETE"                     : "Sil",
     "CMD_QUIT"                            : "Çık",
 
     // Edit menu commands
@@ -210,6 +211,7 @@ define({
     "CMD_NEXT_DOC"                        : "Sonraki Dosya",
     "CMD_PREV_DOC"                        : "Önceki Dosya",
     "CMD_SHOW_IN_TREE"                    : "Dosya Listesinde Göster",
+    "CMD_SHOW_IN_OS"                      : "Bulunduğu Konumu Aç",
     
     // Help menu commands
     "HELP_MENU"                           : "Yardım",
@@ -223,7 +225,7 @@ define({
     "CMD_ABORT_QUIT"                      : "Çıkışı İptal Et",
 
     // Strings for main-view.html
-    "EXPERIMENTAL_BUILD"                   : "Experimental Build",
+    "EXPERIMENTAL_BUILD"                   : "Deneysel Sürüm",
     "SEARCH_RESULTS"                       : "Arama sonuçları",
     "OK"                                   : "Tamam",
     "DONT_SAVE"                            : "Kaydetme",
@@ -235,7 +237,7 @@ define({
     "RELAUNCH_CHROME"                      : "Chrome'u Tekrar Aç",
     "ABOUT"                                : "Hakkında",
     "CLOSE"                                : "Kapat",
-    "ABOUT_TEXT_LINE1"                     : "sprint 14 experimental build ",
+    "ABOUT_TEXT_LINE1"                     : "sprint 14 test sürümü",
     "ABOUT_TEXT_LINE3"                     : "Üçüncü parti yazılımlara ilişkin bildirimler, şartlar ve koşullar <span class=\"non-clickble-link\">http://www.adobe.com/go/thirdparty/</span> adresinde bulunmaktadır ve bu adreste referans olarak dahil edilmiştir",
     "ABOUT_TEXT_LINE4"                     : "Döküman ve kodlar için <span class=\"non-clickble-link\">https://github.com/adobe/brackets/</span> adresine bakabilirsiniz.",
     "UPDATE_NOTIFICATION_TOOLTIP"          : "{APP_NAME} programının yeni versiyonu bulunmakta! Detaylar için tıklayın.",
diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
@@ -43,7 +43,7 @@
 @code-padding: 15px;
 
 .CodeMirror-focused .CodeMirror-activeline-background {
-    background: @activeline-bgcolor !important; 
+    background: @activeline-bgcolor; 
 }
 
 .cm-s-default {
@@ -108,6 +108,17 @@
         background-color: @background-color-3;
         border-right: none;
     }
+    .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+        background-color: #ebebeb;
+    }
+    .platform-mac & {
+        .CodeMirror-scrollbar-filler {
+            background-image: url(images/scrollbar-mac-corner.png);
+        }
+        .CodeMirror-gutter-filler {
+            background-image: url(images/scrollbar-mac-bg.png);
+        }
+    }
     .CodeMirror-linenumber {
         color: @accent-comment;
         min-width: 2.5em;
@@ -171,10 +182,10 @@
     }
     
     .CodeMirror-focused .CodeMirror-activeline-background {
-        background: darken(@activeline-bgcolor, @bc-color-step-size / 2) !important; 
+        background: darken(@activeline-bgcolor, @bc-color-step-size / 2); 
     }
     &.CodeMirror-focused .CodeMirror .CodeMirror-activeline-background {
-        background: transparent !important; 
+        background: transparent; 
     }
 }
 
diff --git a/src/styles/images/scrollbar-mac-bg.png b/src/styles/images/scrollbar-mac-bg.png
diff --git a/src/styles/images/scrollbar-mac-corner.png b/src/styles/images/scrollbar-mac-corner.png
diff --git a/src/utils/Global.js b/src/utils/Global.js
@@ -67,8 +67,6 @@ define(function (require, exports, module) {
     // TODO: (issue #266) load conditionally
     global.brackets.shellAPI = require("utils/ShellAPI");
     
-    global.brackets.inBrowser = !global.brackets.hasOwnProperty("fs");
-    
     if (global.navigator.platform === "MacIntel" || global.navigator.platform === "MacPPC") {
         global.brackets.platform = "mac";
     } else if (global.navigator.platform.indexOf("Linux") >= 0) {
@@ -77,6 +75,10 @@ define(function (require, exports, module) {
         global.brackets.platform = "win";
     }
     
+    global.brackets.inBrowser = !global.brackets.hasOwnProperty("fs");
+    
+    global.brackets.nativeMenus = (!global.brackets.inBrowser && (global.brackets.platform !== "linux"));
+    
     global.brackets.isLocaleDefault = function () {
         return !global.localStorage.getItem("locale");
     };
diff --git a/tools/restore_installed_build.sh b/tools/restore_installed_build.sh
@@ -1,21 +1,39 @@
-#!/bin/sh
+#!/bin/bash
+
+# Detect the user's operating system
+platform=`uname -s`;
+if [[ "$platform" == 'Linux' ]]; then
+   # This is the default directory for Ubuntu installations (if installed with the *.deb).
+   # May have to adjust if other operating systems use different directories.
+   default_app_directory='/opt/brackets';
+   symlink='dev';
+elif [[ "$platform" == 'Darwin' ]]; then # MAC OSX
+   default_app_directory='/Applications/Brackets Sprint 14.app';
+   symlink='Contents/dev';
+else
+   # Warn for unknown operating system?
+   default_app_directory='/opt/brackets';
+   symlink='dev';
+fi
 
 # Make sure the appname was passed in and is valid
 if [[ ${1} == "" ]]; then
   echo "Usage: restore_installed_build.sh <application>"
   echo "Restore Brackets to use the installed HTML/CSS/JS files."
   echo ""
   echo "Parameters: application - full path to the Brackets application"
-  echo "Example: ./restore_installed_build.sh \"/Applications/Brackets Sprint 14.app\""
-  exit;
+  echo "Example: ./restore_installed_build.sh \"$default_app_directory\""
+  exit 0;
 fi
 
 if [ ! -d "${1}" ]; then
   echo "$1 not found."
-  exit;
+  exit 1;
 fi
 
-if [[ -d "${1}/Contents/dev" || -n $(find -L "${1}/Contents/dev" -type l) ]]; then
-  rm "${1}/Contents/dev"
+link_name="${1}/$symlink"
+
+if [[ -L "$link_name" ]]; then
+  rm "$link_name" || exit 1;
   echo "$1 has been restored to the installed configuration."
 fi
diff --git a/tools/setup_for_hacking.sh b/tools/setup_for_hacking.sh
@@ -1,18 +1,34 @@
-#!/bin/sh
+#!/bin/bash
+
+# Detect the user's operating system
+platform=`uname -s`;
+if [[ "$platform" == 'Linux' ]]; then
+   # This is the default directory for Ubuntu installations (if installed with the *.deb).
+   # May have to adjust if other operating systems use different directories.
+   default_app_directory='/opt/brackets';
+   symlink='dev';
+elif [[ "$platform" == 'Darwin' ]]; then # MAC OSX
+   default_app_directory='/Applications/Brackets Sprint 14.app';
+   symlink='Contents/dev';
+else
+   # Warn for unknown operating system?
+   default_app_directory='/opt/brackets';
+   symlink='dev';
+fi
 
 # Make sure the appname was passed in and is valid
 if [[ ${1} == "" ]]; then
   echo "Usage: setup_for_hacking.sh <application>"
   echo "Setup Brackets to use the HTML/CSS/JS files pulled from GitHub."
   echo ""
   echo "Parameters: application - full path to the Brackets application"
-  echo "Example: ./setup_for_hacking.sh \"/Applications/Brackets Sprint 14.app\""
-  exit;
+  echo "Example: ./setup_for_hacking.sh \"$default_app_directory\""
+  exit 0;
 fi
 
 if [ ! -d "${1}" ]; then
   echo "$1 not found."
-  exit;
+  exit 1;
 fi
 
 # Get the full path of this script
@@ -25,13 +41,15 @@ fi;
 # Remove /tools/setup_for_hacking.sh to get the root directory
 root_dir=${full_path%/*/*}
 
-# Remove existing "dev" symlink, if present
-if [[ -d "${1}/Contents/dev" || -n $(find -L "${1}/Contents/dev" -type l) ]]; then
-  rm "${1}/Contents/dev"
+link_name="${1}/$symlink"
+
+# Remove existing symlink, if present
+if [[ -L "$link_name" ]]; then
+  rm "$link_name" || exit 1;
 fi
 
 # Make new symlink
-ln -s "$root_dir" "${1}/Contents/dev"
+ln -s "$root_dir" "$link_name" || exit 1;
 
 echo "Brackets will now use the files in $root_dir"
 echo "Run the restore_installed_build.sh script to revert back to the installed source files"
diff --git a/tools/setup_server_smokes.sh b/tools/setup_server_smokes.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Make sure the server root folder was passed in and is valid
 if [[ ${1} == "" ]]; then
@@ -7,12 +7,12 @@ if [[ ${1} == "" ]]; then
   echo ""
   echo "Parameters: server-root-path - local file path to server root folder"
   echo "Example: ./setup_server_smokes.sh \"/Library/WebServer/Documents\""
-  exit;
+  exit 0;
 fi
 
 if [ ! -d "${1}" ]; then
   echo "$1 not found."
-  exit;
+  exit 1;
 fi
 
 # Get the full path of this script
@@ -30,10 +30,10 @@ server_test_dir="$root_dir/test/smokes/server-tests"
 
 # Remove existing "server-tests" symlink, if present
 if [ -d "${1}/server-tests" ]; then
-  rm "${1}/server-tests"
+  rm "${1}/server-tests" || exit 1;
 fi
 
 # Make new symlink
-ln -s "$server_test_dir" "${1}/server-tests"
+ln -s "$server_test_dir" "${1}/server-tests" || exit 1;
 
 echo "Local server now has access to Brackets server-tests smoke test files"

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ define(function (require, exports, module) {`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`// Enable/Disable HTML Menus`
`274`		`- if (brackets.platform !== "linux") {`
	`274`	`+ if (brackets.nativeMenus) {`
`275`	`275`	`$("body").addClass("has-appshell-menus");`
`276`	`276`	`}`
`277`	`277`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ define(function (require, exports, module) {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`function _isHTMLMenu(id) {`
`177`		`- return (!$("body").hasClass("has-appshell-menus") \|\| brackets.inBrowser) \|\| _isContextMenu(id);`
	`177`	`+ return (!brackets.nativeMenus \|\| _isContextMenu(id));`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`@code-padding: 15px;`
`44`	`44`
`45`	`45`	`.CodeMirror-focused .CodeMirror-activeline-background {`
`46`		`- background: @activeline-bgcolor !important;`
	`46`	`+ background: @activeline-bgcolor;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`.cm-s-default {`
`@@ -108,6 +108,17 @@`
`108`	`108`	`background-color: @background-color-3;`
`109`	`109`	`border-right: none;`
`110`	`110`	`}`
	`111`	`+ .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {`
	`112`	`+ background-color: #ebebeb;`
	`113`	`+ }`
	`114`	`+ .platform-mac & {`
	`115`	`+ .CodeMirror-scrollbar-filler {`
	`116`	`+ background-image: url(images/scrollbar-mac-corner.png);`
	`117`	`+ }`
	`118`	`+ .CodeMirror-gutter-filler {`
	`119`	`+ background-image: url(images/scrollbar-mac-bg.png);`
	`120`	`+ }`
	`121`	`+ }`
`111`	`122`	`.CodeMirror-linenumber {`
`112`	`123`	`color: @accent-comment;`
`113`	`124`	`min-width: 2.5em;`
`@@ -171,10 +182,10 @@`
`171`	`182`	`}`
`172`	`183`
`173`	`184`	`.CodeMirror-focused .CodeMirror-activeline-background {`
`174`		`- background: darken(@activeline-bgcolor, @bc-color-step-size / 2) !important;`
	`185`	`+ background: darken(@activeline-bgcolor, @bc-color-step-size / 2);`
`175`	`186`	`}`
`176`	`187`	`&.CodeMirror-focused .CodeMirror .CodeMirror-activeline-background {`
`177`		`- background: transparent !important;`
	`188`	`+ background: transparent;`
`178`	`189`	`}`
`179`	`190`	`}`
`180`	`191`