aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-01 15:27:30 -0700
committerValerio Virgillito2012-06-01 15:27:30 -0700
commit8433fa5ed0d4cc91e10b7080aa8edb8d94ccc1a4 (patch)
tree72d0501e670d5a6c6d14d29645452870b0b3f0f8 /js/document/models
parentef48a58da2c7d173605fd43e8f48dac5055c3fa1 (diff)
parent4bb571a9551bba8a37bf3afd639412173d58bc71 (diff)
downloadninja-8433fa5ed0d4cc91e10b7080aa8edb8d94ccc1a4.tar.gz
Merge branch 'refs/heads/master' into document-bindings-fix
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 9f5599a2..9aa0d27e 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 selectionContainer: { 30 selectionContainer: {
23 value: [] 31 value: []
@@ -52,7 +60,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
52 //////////////////////////////////////////////////////////////////// 60 ////////////////////////////////////////////////////////////////////
53 // 61 //
54 webGlHelper: { 62 webGlHelper: {
55 value: webGlDocumentHelper 63 value: null
56 }, 64 },
57 //////////////////////////////////////////////////////////////////// 65 ////////////////////////////////////////////////////////////////////
58 // 66 //