Squashed commit of the following:

commit 302ae3c1812086d976eb67c9cf693c43205f3904
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Thu Feb 16 11:13:05 2012 -0800

    hide the rulers when no document is open

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 2e766c9eaa98fa20f311b3eb2f892a1a240e90cf
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Thu Feb 16 06:43:33 2012 -0800

    file picker:
    Enable ok if user double clicks folder and enter it.
    Validate path if user enter it manually in addressbar.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 16:09:14 2012 -0800

    fixes to document tabbing

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 56d2a8d11a73cd04c7f1bc20d1ded52b9c1242f2
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:54:38 2012 -0800

    Revert "Revert "Creating NinjaTemplate to HTML function""

    This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:54:14 2012 -0800

    Revert "Revert "Reverting text/html document classes and setting up MVC folder structure""

    This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit aead95ce4b2571356701229567bfde73d54bed93
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:53:55 2012 -0800

    Revert "Revert "Cleaning up""

    This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit a8d1a2e1f4f4ab7b9298bfbd1b49731785c79c3a
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:52:56 2012 -0800

    Revert "Revert "Merging TextDocument into BaseDocument""

    This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit e864dc319805e259b7ae39a9d4d96fac552a1f87
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:52:38 2012 -0800

    Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build"

    This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:06:42 2012 -0800

    merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit b8782f2e3dd106accbb0160a98e6b498f26752ea
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:01:59 2012 -0800

    Revert "Merging TextDocument into BaseDocument"

    This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed.

    Conflicts:

    	js/controllers/document-controller.js

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 09:58:37 2012 -0800

    Revert "Cleaning up"

    This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da.

    Conflicts:

    	js/controllers/document-controller.js
    	js/io/document/text-document.js

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 9048cd50bf5e0a418d1d95498bb593961f72db36
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 09:51:12 2012 -0800

    Revert "Reverting text/html document classes and setting up MVC folder structure"

    This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 2e308be9bec5e06d81b2905b65005a232f0a190d
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 09:50:20 2012 -0800

    Revert "Creating NinjaTemplate to HTML function"

    This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 19 insertions, 13 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index f397ace7..b1a22c1b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -34,17 +34,17 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
             return this._activeDocument;
         },
         set: function(doc) {
-            if(this._activeDocument)  this._activeDocument.isActive = false;
-                
-            if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
+            if(!!this._activeDocument) this._activeDocument.isActive = false;
 
             this._activeDocument = doc;
-            this._activeDocument.isActive = true;
+            if(!!this._activeDocument){
 
-            if(!!this._activeDocument.editor){
-                this._activeDocument.editor.focus();
+                if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
+                this._activeDocument.isActive = true;
+                if(!!this._activeDocument.editor){
+                    this._activeDocument.editor.focus();
+                }
             }
-
         }
     },
 
@@ -184,7 +184,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                         switch (doc.extension) {
                                 case 'html': case 'html':
                                         //Open in designer view
-                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
+                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument.bind(this));
                                         break;
                                 default:
                                         //Open in code view
@@ -250,7 +250,6 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
         }
 
             var doc = this._findDocumentByUUID(id);
-            this._removeDocumentView(doc.container);
 
             var closeDocumentIndex = this._findIndexByUUID(id);
             this._documents.splice(this._findIndexByUUID(id), 1);
@@ -263,8 +262,11 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                     nextDocumentIndex = closeDocumentIndex - 1;
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
+                this._removeDocumentView(doc.container);
             }else if(this._documents.length === 0){
-                //if there are no documents to switch to then just show the iframeContainer
+                this.activeDocument = null;
+                this._removeDocumentView(doc.container);
+                this.application.ninja.stage.stageView.hideRulers();
                 document.getElementById("iframeContainer").style.display="block";
             }
         }
@@ -275,11 +277,15 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _onOpenDocument: {
         value: function(doc){
             //var data = DocumentManager.activeDocument;
-            //DocumentManager._hideCurrentDocument();
 
-            //stageManagerModule.stageManager.toggleCanvas();
+            this._hideCurrentDocument();
+            this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid);
+
+            this.application.ninja.stage.hideCanvas(false);
+
+            this.activeDocument = doc;
 
-            DocumentController.activeDocument = doc;
+            this._showCurrentDocument();
 
             NJevent("onOpenDocument", doc);
 //            appDelegateModule.MyAppDelegate.onSetActiveDocument();