diff options
author | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
commit | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch) | |
tree | a432a4652bf7c96aea72a22bf27946eeee8fc4a5 /js/document/models/html.js | |
parent | 76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff) | |
parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
download | ninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/document/models/html.js')
-rwxr-xr-x | js/document/models/html.js | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/js/document/models/html.js b/js/document/models/html.js index 0f88229d..7064c6e3 100755 --- a/js/document/models/html.js +++ b/js/document/models/html.js | |||
@@ -23,6 +23,8 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { | |||
23 | value:function() { | 23 | value:function() { |
24 | //Creating instance of the webGL helper for this model | 24 | //Creating instance of the webGL helper for this model |
25 | this.webGlHelper = webGlDocumentHelper.create(); | 25 | this.webGlHelper = webGlDocumentHelper.create(); |
26 | // | ||
27 | this.libs = {montage: false, canvas: false, montageId: null, canvasId: null}; | ||
26 | } | 28 | } |
27 | }, | 29 | }, |
28 | //////////////////////////////////////////////////////////////////// | 30 | //////////////////////////////////////////////////////////////////// |
@@ -73,29 +75,6 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { | |||
73 | value: null | 75 | value: null |
74 | }, | 76 | }, |
75 | //////////////////////////////////////////////////////////////////// | 77 | //////////////////////////////////////////////////////////////////// |
76 | // | ||
77 | userComponents: { | ||
78 | value: {} | ||
79 | }, | ||
80 | //////////////////////////////////////////////////////////////////// | ||
81 | //Add a reference to a component instance to the userComponents hash using the element UUID | ||
82 | setComponentInstance: { | ||
83 | value: function(instance, el) { | ||
84 | this.userComponents[el.uuid] = instance; | ||
85 | } | ||
86 | }, | ||
87 | //////////////////////////////////////////////////////////////////// | ||
88 | //Returns the component instance obj from the element | ||
89 | getComponentFromElement: { | ||
90 | value: function(el) { | ||
91 | if(el) { | ||
92 | if(el.uuid) return this.userComponents[el.uuid]; | ||
93 | } else { | ||
94 | return null; | ||
95 | } | ||
96 | } | ||
97 | } | ||
98 | //////////////////////////////////////////////////////////////////// | ||
99 | //////////////////////////////////////////////////////////////////// | 78 | //////////////////////////////////////////////////////////////////// |
100 | }); | 79 | }); |
101 | //////////////////////////////////////////////////////////////////////// | 80 | //////////////////////////////////////////////////////////////////////// |