Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@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";