aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-24 13:54:00 -0700
committerNivesh Rajbhandari2012-05-24 13:54:00 -0700
commitfd4af6d81725dfa0630ac5e52ba95405336f4074 (patch)
tree868197f79862e98b9c7f5a1f296d64832c68d48f /js/document/models
parentde25d2b7d05476d4f0d385b5e910db189f682d21 (diff)
parent70ff8dd670bc37c14caf850e06791d1e293b1e4b (diff)
downloadninja-fd4af6d81725dfa0630ac5e52ba95405336f4074.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/document/models')
-rwxr-xr-xjs/document/models/html.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 9cc8ce92..fd42d4de 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -64,6 +64,11 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
64 userComponents: { 64 userComponents: {
65 value: {} 65 value: {}
66 }, 66 },
67 ////////////////////////////////////////////////////////////////////
68 //
69 documentRoot: {
70 value: null
71 },
67 //////////////////////////////////////////////////////////////////// 72 ////////////////////////////////////////////////////////////////////
68 //Add a reference to a component instance to the userComponents hash using the element UUID 73 //Add a reference to a component instance to the userComponents hash using the element UUID
69 setComponentInstance: { 74 setComponentInstance: {