aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-01 15:28:27 -0700
committerJose Antonio Marquez2012-06-01 15:28:27 -0700
commit5b4739d78618a40cacb0e127d1cc412fb839e441 (patch)
tree8761dbbd4f6e3883f8f3072127b90358ca0c19d3 /js/document
parent745c39fb9460e882f5c6c5cfeedc0b3edf85f8eb (diff)
parent4bb571a9551bba8a37bf3afd639412173d58bc71 (diff)
downloadninja-5b4739d78618a40cacb0e127d1cc412fb839e441.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Components
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/document-html.js2
-rwxr-xr-xjs/document/models/html.js10
2 files changed, 11 insertions, 1 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index c60a12a2..b5684dc5 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -62,6 +62,8 @@ exports.HtmlDocument = Montage.create(Component, {
62 parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach 62 parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach
63 views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic 63 views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
64 }); 64 });
65 //Calling the any init routines in the model
66 this.model.init();
65 //Initiliazing views and hiding 67 //Initiliazing views and hiding
66 if (this.model.views.design.initialize(this.model.parentContainer)) { 68 if (this.model.views.design.initialize(this.model.parentContainer)) {
67 //Hiding iFrame, just initiliazing 69 //Hiding iFrame, just initiliazing
diff --git a/js/document/models/html.js b/js/document/models/html.js
index fd42d4de..0fe33990 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -18,6 +18,14 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
18 value: false 18 value: false
19 }, 19 },
20 //////////////////////////////////////////////////////////////////// 20 ////////////////////////////////////////////////////////////////////
21 //Called by the document immidiately after the model is created
22 init: {
23 value:function() {
24 //Creating instance of the webGL helper for this model
25 this.webGlHelper = webGlDocumentHelper.create();
26 }
27 },
28 ////////////////////////////////////////////////////////////////////
21 // 29 //
22 selection: { 30 selection: {
23 value: [] 31 value: []
@@ -57,7 +65,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
57 //////////////////////////////////////////////////////////////////// 65 ////////////////////////////////////////////////////////////////////
58 // 66 //
59 webGlHelper: { 67 webGlHelper: {
60 value: webGlDocumentHelper 68 value: null
61 }, 69 },
62 //////////////////////////////////////////////////////////////////// 70 ////////////////////////////////////////////////////////////////////
63 // 71 //