diff options
author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/document/views/code.js | |
parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@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"; |