Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

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

1 files changed, 0 insertions, 6 deletions

diff --git a/js/document/views/code.js b/js/document/views/code.js
index 0a0ff5c1..c8b2a23e 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -82,12 +82,6 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
                 //
             var type;
             //
-            if(this.activeDocument) {
-                //need to hide only if another document was open before
-                //this.application.ninja.documentController._hideCurrentDocument();
-                                //this.hideOtherDocuments(doc.uuid);
-            }
-            //
             switch(file.extension) {
                 case  "css" :
                     type = "css";