diff options
author | Ananya Sen | 2012-02-15 10:01:59 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-15 10:01:59 -0800 |
commit | b8782f2e3dd106accbb0160a98e6b498f26752ea (patch) | |
tree | ca279bd78d65cf59249efd693c281c70a74c7b69 /js/controllers | |
parent | a90e3be8850b64e8e370aa8ff8cadaa448dd0c82 (diff) | |
download | ninja-b8782f2e3dd106accbb0160a98e6b498f26752ea.tar.gz |
Revert "Merging TextDocument into BaseDocument"
This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed.
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 9ece27f9..9b412576 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -9,8 +9,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
9 | var Montage = require("montage/core/core").Montage, | 9 | var Montage = require("montage/core/core").Montage, |
10 | Component = require("montage/ui/component").Component, | 10 | Component = require("montage/ui/component").Component, |
11 | Uuid = require("montage/core/uuid").Uuid, | 11 | Uuid = require("montage/core/uuid").Uuid, |
12 | HTMLDocument = require("js/io/document/html-document").HTMLDocument, | 12 | HTMLDocument = require("js/document/models/html-document").HTMLDocument, |
13 | TextDocument = require("js/io/document/text-document").TextDocument, | 13 | TextDocument = require("js/document/models/text-document").TextDocument, |
14 | DocumentController; | 14 | DocumentController; |
15 | //////////////////////////////////////////////////////////////////////// | 15 | //////////////////////////////////////////////////////////////////////// |
16 | // | 16 | // |
@@ -203,7 +203,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, { | |||
203 | break; | 203 | break; |
204 | default: | 204 | default: |
205 | //Open in code view | 205 | //Open in code view |
206 | var code = Montage.create(BaseDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea; | 206 | var code = Montage.create(TextDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea; |
207 | textArea = this.application.ninja.stage.stageView.createTextAreaElement(docuuid); | 207 | textArea = this.application.ninja.stage.stageView.createTextAreaElement(docuuid); |
208 | code.initialize(doc, docuuid, textArea, textArea.parentNode); | 208 | code.initialize(doc, docuuid, textArea, textArea.parentNode); |
209 | //code.init(doc.name, doc.uri, doc.extension, null, docuuid); | 209 | //code.init(doc.name, doc.uri, doc.extension, null, docuuid); |