diff options
author | Jose Antonio Marquez | 2012-02-14 14:00:48 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-14 14:00:48 -0800 |
commit | 93c8f327d662a7693d1d6ca050a0efd15ebc18ed (patch) | |
tree | b3f9e8708977b740a72be24dfa1905d37317ae53 /js/controllers | |
parent | a7952c5a16e2cae3fd1a459b03b9f16bba1004da (diff) | |
download | ninja-93c8f327d662a7693d1d6ca050a0efd15ebc18ed.tar.gz |
Merging TextDocument into BaseDocument
Merged the text-document class with base-document, didn't make sense to have two classes for basic model of documents, the html-document class remain extending base-document to incorporate design view. These two classes might be renamed.
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 9b412576..25f60cc5 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -10,7 +10,7 @@ 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/document/models/html-document").HTMLDocument, | 12 | HTMLDocument = require("js/document/models/html-document").HTMLDocument, |
13 | TextDocument = require("js/document/models/text-document").TextDocument, | 13 | BaseDocument = require("js/document/models/base-document").BaseDocument, |
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(TextDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea; | 206 | var code = Montage.create(BaseDocument, {"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); |