aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
diff options
context:
space:
mode:
authorhwc4872012-06-04 09:15:12 -0700
committerhwc4872012-06-04 09:15:12 -0700
commit3f5351c5d75080727953caf5d8d9a312c1c9391b (patch)
treedcbc2db4e137e115b43a6117331ed1176f85904b /js/document/models
parent4aacbf5d3c7a42a3621eb3ae2723542a455e7720 (diff)
parent3abba04025dbc0daadb08184833a2558c442b8e1 (diff)
downloadninja-3f5351c5d75080727953caf5d8d9a312c1c9391b.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/document/models')
-rwxr-xr-xjs/document/models/html.js10
1 files changed, 9 insertions, 1 deletions
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 //