Merge remote-tracking branch 'upstream/master' into sprint-to-release

Conflicts:
	appshell/version.rc
	installer/mac/buildInstaller.sh
	installer/win/brackets-win-install-build.xml

Author: Marcel Gerber

appshell/client_handler.cpp

@@ -353,8 +353,13 @@ void ClientHandler::SendOpenFileCommand(CefRefPtr<CefBrowser> browser, const Cef
   std::string fileArrayStr(fileArray);
   // FIXME: Use SendJSCommand once it supports parameters
   std::string cmd = "require('command/CommandManager').execute('file.openDroppedFiles'," + fileArrayStr + ")";
-  browser->GetMainFrame()->ExecuteJavaScript(CefString(cmd.c_str()),
+
+  // if files are droppend and the Open Dialog is visible, then browser is NULL
+  // This fixes https://github.com/adobe/brackets/issues/7752
+  if (browser) {
+    browser->GetMainFrame()->ExecuteJavaScript(CefString(cmd.c_str()),
                                 browser->GetMainFrame()->GetURL(), 0);
+  }
 }
 
 void ClientHandler::DispatchCloseToNextBrowser()

appshell/mac/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.43.0</string>
+	<string>0.44.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.43.0</string>
+	<string>0.44.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,43,0,0
+FILEVERSION    	0,44,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",      "Release 43\0"
+            VALUE "FileVersion",      "Release 44\0"
             VALUE "ProductName",      APP_NAME "\0"
             VALUE "ProductVersion",   "\0"
             VALUE "LegalCopyright",   "(c) 2012 Adobe Systems, Inc.\0"

installer/linux/debian/brackets.desktop

@@ -5,3 +5,4 @@ Categories=Development
 Exec=/opt/brackets/brackets %U
 Icon=brackets
 MimeType=text/html;
+Keywords=Text;Editor;Write;Web;Development;

installer/mac/buildInstaller.sh

@@ -2,7 +2,7 @@
 
 # config
 releaseName="Brackets"
-dmgName="${releaseName} Release 43"
+dmgName="${releaseName} Release 44"
 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.release.number" value="43"/>
+  <property name="product.release.number" value="44"/>
   <property name="product.version.number" value="0.${product.release.number}"/>
   <property name="product.version.name" value="Release ${product.release.number}"/>
   <property name="product.fullname" value="Brackets ${product.version.name}"/>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "Brackets-Shell",
-    "version": "0.43.0-0",
+    "version": "0.44.0-0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets-shell/issues"
@@ -28,4 +28,4 @@
         "install": "",
         "postinstall": "bash -c 'mv .appshell.gyp appshell.gyp;'"
     }
-}
+}