code review changes

adobe · Jul 10, 2012 · 27b1b49 · 27b1b49
1 parent 59e40a9
commit 27b1b49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/document/ChangedDocumentTracker.js b/src/document/ChangedDocumentTracker.js
@@ -54,15 +54,14 @@ define(function (require, exports, module) {
         $(DocumentManager).on("afterDocumentCreate", function (event, doc) {
             // Only track documents in the current project
             if (ProjectManager.isWithinProject(doc.file.fullPath)) {
-               self._addListener(doc);
+                self._addListener(doc);
             }
         });
 
         $(DocumentManager).on("beforeDocumentDelete", function (event, doc) {
-            // Only documents in the current project are tracked
-            if (ProjectManager.isWithinProject(doc.file.fullPath)) {
-               self._removeListener(doc);
-            }
+            // In case a document somehow remains loaded after its project
+            // has been closed, unconditionally attempt to remove the listener.
+            self._removeListener(doc);
         });
 
         $(window).focus(this._onWindowFocus);
@@ -80,7 +79,7 @@ define(function (require, exports, module) {
      * @private
      */
     ChangedDocumentTracker.prototype._removeListener = function (doc) {
-        $(doc).off("change", self._onChange);
+        $(doc).off("change", this._onChange);
     };
 
     /**

diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js
@@ -1014,7 +1014,7 @@ define(function (require, exports, module) {
 
         // Initialize the active editor
         if (!activeFile && _workingSet.length > 0) {
-            activeFile = _workingSet[0];
+            activeFile = _workingSet[0].fullPath;
         }
 
         if (activeFile) {