Merge branch 'master' into ingo/fix-7752

Author: ingorichter

Gruntfile.js

@@ -29,7 +29,7 @@ module.exports = function (grunt) {
         resolve = common.resolve,
         platform = common.platform(),
         staging;
-    
+
     if (platform === "mac") {
         staging = "installer/mac/staging/<%= build.name %>.app/Contents";
     } else if (platform === "win") {
@@ -46,11 +46,11 @@ module.exports = function (grunt) {
             /* linux */
             "cef-linux32": {
                 "dest"      : "<%= downloads %>",
-                "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_linux32_release.zip"
+                "src"       : "<%= cef.url %>/cef_binary_<%= cef.version %>_linux32_release.zip"
             },
             "cef-linux64": {
                 "dest"      : "<%= downloads %>",
-                "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_linux64_release.zip"
+                "src"       : "<%= cef.url %>/cef_binary_<%= cef.version %>_linux64_release.zip"
             },
             "node-linux32": {
                 "dest"      : "<%= downloads %>",
@@ -63,7 +63,11 @@ module.exports = function (grunt) {
             /* mac */
             "cef-mac": {
                 "dest"      : "<%= downloads %>",
-                "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_macosx.zip"
+                "src"       : "<%= cef.url %>/cef_binary_<%= cef.version %>_macosx.zip"
+            },
+            "cef-mac-symbols": {
+                "src"  : "<%= cef.url %>/cef_binary_<%= cef.version %>_macosx32_release_symbols.zip",
+                "dest" : "<%= downloads %>/cefsymbols"
             },
             "node-mac": {
                 "dest"      : "<%= downloads %>",
@@ -72,7 +76,11 @@ module.exports = function (grunt) {
             /* win */
             "cef-win": {
                 "dest"      : "<%= downloads %>",
-                "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_windows.zip"
+                "src"       : "<%= cef.url %>/cef_binary_<%= cef.version %>_windows.zip"
+            },
+            "cef-win-symbols": {
+                "src"  : ["<%= cef.url %>/cef_binary_<%= cef.version %>_windows32_debug_symbols.zip", "<%= cef.url %>/cef_binary_<%= cef.version %>_windows32_release_symbols.zip"],
+                "dest" : "<%= downloads %>/cefsymbols"
             },
             "node-win": {
                 "dest"      : "<%= downloads %>",
@@ -201,6 +209,7 @@ module.exports = function (grunt) {
             }
         },
         "cef": {
+            "url"           : "http://s3.amazonaws.com/files.brackets.io/cef",
             "version"       : "3.1547.1459"
         },
         "node": {

appshell/appshell_extensions_win.cpp

@@ -1526,13 +1526,13 @@ bool UpdateAcceleratorTable(int32 tag, ExtensionString& keyStr)
                     lpaccelNew[newItem].key = ascii;
                 } else {
                     // Get the virtual key code for non-alpha-numeric characters.
-                    int keyCode = ::VkKeyScan(ascii);
-                    WORD vKey = (short)(keyCode & 0x000000FF);
-                    bool isAltGr = ((keyCode & 0x0000FF00) >> 8) >= 6;
+                    SHORT keyCode = ::VkKeyScan(ascii);
+                    WORD vKey = (WORD)(keyCode & 0xFF);
+                    bool isAltGr = ((keyCode & 0x600) == 0x600);
 
                     // Get unshifted key from keyCode so that we can determine whether the 
                     // key is a shifted one or not.
-                    UINT unshiftedChar = ::MapVirtualKey(vKey, 2);    
+                    UINT unshiftedChar = ::MapVirtualKey(vKey, MAPVK_VK_TO_CHAR);    
                     bool isDeadKey = ((unshiftedChar & 0x80000000) == 0x80000000);
 
                     // If one of the following is found, then the shortcut is not available for the

appshell/mac/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.40.0</string>
+	<string>0.41.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.40.0</string>
+	<string>0.41.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

appshell/version.rc

@@ -32,7 +32,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    	0,40,0,0
+FILEVERSION    	0,41,0,0
 /* PRODUCTVERSION 	1,0,0,0 */
 FILEOS         	VOS__WINDOWS32
 FILETYPE       	VFT_APP
@@ -43,7 +43,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      "brackets.io\0"
             VALUE "FileDescription",  "\0"
-            VALUE "FileVersion",      "Sprint 40\0"
+            VALUE "FileVersion",      "Sprint 41\0"
             VALUE "ProductName",      APP_NAME "\0"
             VALUE "ProductVersion",   "\0"
             VALUE "LegalCopyright",   "(c) 2012 Adobe Systems, Inc.\0"

installer/mac/buildInstaller.sh

@@ -2,7 +2,7 @@
 
 # config
 releaseName="Brackets"
-dmgName="${releaseName} Sprint 40"
+dmgName="${releaseName} Sprint 41"
 format="bzip2"
 encryption="none"
 tmpLayout="./dropDmgConfig/layouts/tempLayout"

installer/win/brackets-win-install-build.xml

@@ -11,7 +11,7 @@ default="build.mul">
   <!-- Product & version labeling -->
   <!-- See also: product name definitions in Brackets_<locale>.wxl -->
   <property name="product.shortname" value="Brackets"/>
-  <property name="product.sprint.number" value="40"/>
+  <property name="product.sprint.number" value="41"/>
   <property name="product.version.number" value="0.${product.sprint.number}"/>
   <property name="product.version.name" value="Sprint ${product.sprint.number}"/>
   <property name="product.fullname" value="Brackets ${product.version.name}"/>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "Brackets-Shell",
-    "version": "0.40.0-0",
+    "version": "0.41.0-0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets-shell/issues"
@@ -18,7 +18,7 @@
         "grunt-contrib-copy": "0.4.0",
         "grunt-contrib-clean": "0.4.0",
         "guid": "0.0.10",
-        "grunt-curl": "0.5.0",
+        "grunt-curl": "2.0.2",
         "grunt-shell": "0.2.1",
         "q": "0.9.2",
         "semver": "2.0.11"
@@ -28,4 +28,4 @@
         "install": "",
         "postinstall": "bash -c 'mv .appshell.gyp appshell.gyp;'"
     }
-}
+}