diff options
author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/document/views/code.js | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/document/views/code.js')
-rwxr-xr-x | js/document/views/code.js | 6 |
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, { | |||
82 | // | 82 | // |
83 | var type; | 83 | var type; |
84 | // | 84 | // |
85 | if(this.activeDocument) { | ||
86 | //need to hide only if another document was open before | ||
87 | //this.application.ninja.documentController._hideCurrentDocument(); | ||
88 | //this.hideOtherDocuments(doc.uuid); | ||
89 | } | ||
90 | // | ||
91 | switch(file.extension) { | 85 | switch(file.extension) { |
92 | case "css" : | 86 | case "css" : |
93 | type = "css"; | 87 | type = "css"; |