Split View (Same Document)

src/document/Document.js

@@ -83,6 +83,11 @@ define(function (require, exports, module) {
 
     EventDispatcher.makeEventDispatcher(Document.prototype);
 
+    /**
+     * list of editors who were initialized as master editors for this doc.
+     */
+    Document.prototype._associatedFullEditors = [];
+
     /**
      * Number of clients who want this Document to stay alive. The Document is listed in
      * DocumentManager._openDocuments whenever refCount > 0.
@@ -196,12 +201,15 @@ define(function (require, exports, module) {
      */
     Document.prototype._makeEditable = function (masterEditor) {
         if (this._masterEditor) {
-            console.error("Document is already editable");
-        } else {
-            this._text = null;
-            this._masterEditor = masterEditor;
-            masterEditor.on("change", this._handleEditorChange.bind(this));
+            //Already a master editor is associated , so preserve the old editor in list of full editors
+            if(this._associatedFullEditors.indexOf(this._masterEditor) < 0){
+                this._associatedFullEditors.push(this._masterEditor);
+            }
         }
+
+        this._text = null;
+        this._masterEditor = masterEditor;
+        masterEditor.on("change", this._handleEditorChange.bind(this));
     };
 
     /**
@@ -215,7 +223,31 @@ define(function (require, exports, module) {
         } else {
             // _text represents the raw text, so fetch without normalized line endings
             this._text = this.getText(true);
-            this._masterEditor = null;
+            this._associatedFullEditors.splice(this._associatedFullEditors.indexOf(this._masterEditor),1);
+
+            //Identify the most recently created full editor before this and set that as new master editor
+            if(this._associatedFullEditors.length > 0){
+               this._masterEditor = this._associatedFullEditors[this._associatedFullEditors.length - 1]; 
+            } else {
+                this._masterEditor = null;
+            }
+        }
+    };
+
+    /**
+     * Toggles the master editor from a pool of full editors which has gained focus 
+     * To be used internally by Editor only 
+     */
+    Document.prototype._toggleMasterEditor = function (masterEditor) {
+        //Do a check before processing the request to ensure inline editors are not being set as master editor
+        if(this._associatedFullEditors.indexOf(masterEditor) >= 0){
+            if (this._masterEditor) {
+                //Already a master editor is associated , so preserve the old editor in list of editors
+                if(this._associatedFullEditors.indexOf(this._masterEditor) < 0){
+                    this._associatedFullEditors.push(this._masterEditor);
+                }
+            } 
+            this._masterEditor = masterEditor;
         }
     };
 

src/editor/Editor.js

@@ -961,6 +961,7 @@ define(function (require, exports, module) {
         this._codeMirror.on("focus", function () {
             self._focused = true;
             self.trigger("focus", self);
+            self.document._toggleMasterEditor(self);//Added to toggle fulleditors as master editor
         });
 
         this._codeMirror.on("blur", function () {

src/editor/EditorManager.js

@@ -542,7 +542,9 @@ define(function (require, exports, module) {
         var createdNewEditor = false,
             editor = document._masterEditor;
 
-        if (!editor) {
+        //Check if a master editor is not set already or the current master editor doesn't belong 
+        //to the pane container requested - to support creation of multiple full editors
+        if (!editor || editor.$el.parent()[0] !== pane.$content[0]) {
             // Performance (see #4757) Chrome wastes time messing with selection
             // that will just be changed at end, so clear it for now
             if (window.getSelection && window.getSelection().empty) {  // Chrome
@@ -552,11 +554,7 @@ define(function (require, exports, module) {
             // Editor doesn't exist: populate a new Editor with the text
             editor = _createFullEditorForDocument(document, pane, editorOptions);
             createdNewEditor = true;
-        } else if (editor.$el.parent()[0] !== pane.$content[0]) {
-            // editor does exist but is not a child of the pane so add it to the 
-            //  pane (which will switch the view's container as well)
-            pane.addView(editor);
-        }
+        } 
 
         // show the view
         pane.showView(editor);

src/view/MainViewManager.js

@@ -706,15 +706,6 @@ define(function (require, exports, module) {
         if (!pane) {
             throw new Error("invalid pane id: " + paneId);
         }
-
-        if (findInWorkingSet(ALL_PANES, file.fullPath) !== -1) {
-            return;
-        }
-
-        // if it's already open in another pane, then just use that pane
-        if (existingPaneId && existingPaneId !== pane.id) {
-            pane = _getPane(existingPaneId);
-        }
 
         var result = pane.reorderItem(file, index, force),
             entry = _makeMRUListEntry(file, pane.id);
@@ -1188,14 +1179,6 @@ define(function (require, exports, module) {
         var options = optionsIn || {},
             currentPaneId  = _getPaneIdForPath(doc.file.fullPath);
 
-        if (currentPaneId) {
-            // If the doc is open in another pane then switch to that pane and call open document
-            //  which will really just show the view as it has always done we could just 
-            //  do pane.showView(doc._masterEditor) in that case but Editor Manager may do some 
-            //  state syncing 
-            paneId = currentPaneId;
-        }
-
         var pane = _getPane(paneId);
 
         // If file is untitled or otherwise not within project tree, add it to
@@ -1237,31 +1220,6 @@ define(function (require, exports, module) {
         }
 
         var currentPaneId = _getPaneIdForPath(file.fullPath);
-
-        if (currentPaneId) {
-            // Warn user (only once) when file is already open in another view
-            if (!PreferencesManager.getViewState("splitview.multipane-info") &&
-                    currentPaneId !== _resolvePaneId(paneId)) {
-                PreferencesManager.setViewState("splitview.multipane-info", true);
-
-                // File tree also executes single-click code prior to executing double-click
-                // code, so delay showing modal dialog to prevent eating second click
-                window.setTimeout(function () {
-                    Dialogs.showModalDialog(
-                        DefaultDialogs.DIALOG_ID_INFO,
-                        Strings.SPLITVIEW_INFO_TITLE,
-                        Strings.SPLITVIEW_MULTIPANE_WARNING
-                    );
-                }, 500);
-            }
-
-            // If the doc is open in another pane
-            //  then switch to that pane and call open document
-            //  which will really just show the view as it has always done
-            //  we could just do pane.showView(doc._masterEditor) in that
-            //  case but Editor Manager may do some state syncing             
-            paneId = currentPaneId;
-        }
 
         // See if there is already a view for the file
         var pane = _getPane(paneId);

src/view/Pane.js

@@ -647,7 +647,7 @@ define(function (require, exports, module) {
      */
     Pane.prototype._canAddFile = function (file) {
         return ((this._views.hasOwnProperty(file.fullPath) && this.findInViewList(file.fullPath) === -1) ||
-                    (!MainViewManager._getPaneIdForPath(file.fullPath)));
+                    (MainViewManager._getPaneIdForPath(file.fullPath) !== this.id));
     };
 
     /**