diff options
author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
tree | 796931014054ad6b0647854183f632ffd72ed9ee /js/document/views/code.js | |
parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
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"; |