Merge pull request #14423 from adobe/master

Merging commits from master which fix the blockers for 1.13
adobe · Jun 14, 2018 · 49d29a8 · 49d29a8
2 parents 8f04753 + 10b651b
commit 49d29a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -158,8 +158,8 @@ define(function (require, exports, module) {
         var currentDoc          = DocumentManager.getCurrentDocument(),
             windowTitle         = brackets.config.app_title,
             currentlyViewedFile = MainViewManager.getCurrentlyViewedFile(MainViewManager.ACTIVE_PANE),
-            currentlyViewedPath = currentlyViewedFile.fullPath,
-            readOnlyString      = currentlyViewedFile.readOnly ? "[Read Only] - " : "";
+            currentlyViewedPath = currentlyViewedFile && currentlyViewedFile.fullPath,
+            readOnlyString      = (currentlyViewedFile && currentlyViewedFile.readOnly) ? "[Read Only] - " : "";
 
         if (!brackets.nativeMenus) {
             if (currentlyViewedPath) {

diff --git a/src/extensions/default/RemoteFileAdapter/main.js b/src/extensions/default/RemoteFileAdapter/main.js
@@ -59,7 +59,8 @@ define(function (require, exports, module) {
     function _setMenuItemsVisible() {
         var file = MainViewManager.getCurrentlyViewedFile(MainViewManager.ACTIVE_PANE),
             cMenuItems = [Commands.FILE_SAVE, Commands.FILE_RENAME, Commands.NAVIGATE_SHOW_IN_FILE_TREE, Commands.NAVIGATE_SHOW_IN_OS],
-            enable = (file.constructor.name !== "RemoteFile");
+            // Enable menu options when no file is present in active pane
+            enable = !file || (file.constructor.name !== "RemoteFile");
 
             // Enable or disable commands based on whether the file is a remoteFile or not.
             cMenuItems.forEach(function (item) {

diff --git a/src/search/FindBar.js b/src/search/FindBar.js
@@ -705,7 +705,7 @@ define(function (require, exports, module) {
      */
     FindBar.getInitialQuery = function (currentFindBar, editor) {
         var query,
-            selection = FindBar._getInitialQueryFromSelection(editor),
+            selection = editor ? FindBar._getInitialQueryFromSelection(editor) : "",
             replaceText = "";
 
         if (currentFindBar && !currentFindBar.isClosed()) {