diff options
| author | Nivesh Rajbhandari | 2012-06-01 06:53:58 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-01 06:53:58 -0700 |
| commit | 69ca67093bb53188dca5437e0bfbfb7f676ada85 (patch) | |
| tree | cc2b387c796b0f34f1ab00a7c542c335d52005e9 /js/document/models | |
| parent | b7f048624c07a1186cca080bf4c9a87af7d53f35 (diff) | |
| parent | 7fcb10270f9e19415f8452c261c2d0c86916a29a (diff) | |
| download | ninja-69ca67093bb53188dca5437e0bfbfb7f676ada85.tar.gz | |
Merge branch 'refs/heads/valerio-document-bindings-fix' into document-bindings-fix
Conflicts:
js/stage/stage.reel/stage.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document/models')
| -rwxr-xr-x | js/document/models/text.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/document/models/text.js b/js/document/models/text.js index 0135b9ba..6cb61d48 100755 --- a/js/document/models/text.js +++ b/js/document/models/text.js | |||
| @@ -60,7 +60,6 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, { | |||
| 60 | } | 60 | } |
| 61 | // | 61 | // |
| 62 | this.parentContainer.removeChild(this.views.code.textViewContainer); | 62 | this.parentContainer.removeChild(this.views.code.textViewContainer); |
| 63 | this.application.ninja.stage.showCodeViewBar(false); | ||
| 64 | this.application.ninja.stage.restoreAllPanels(); | 63 | this.application.ninja.stage.restoreAllPanels(); |
| 65 | this.views.code = null; | 64 | this.views.code = null; |
| 66 | 65 | ||