diff options
author | Jose Antonio Marquez | 2012-05-24 11:38:51 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-24 11:38:51 -0700 |
commit | e64328dc08418730ca580d33381cb2001c7a96fd (patch) | |
tree | 74e3996696adfea94158c29575e9393e56169930 /js/document/document-html.js | |
parent | d57cd68741f340a45be780675ed79b5caf2094e9 (diff) | |
parent | a8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (diff) | |
download | ninja-e64328dc08418730ca580d33381cb2001c7a96fd.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Conflicts:
js/document/document-html.js
js/helper-classes/3D/view-utils.js
js/stage/stage.reel/stage.js
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-x | js/document/document-html.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index 2375632c..157d7a0e 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -84,7 +84,7 @@ exports.HtmlDocument = Montage.create(Component, { | |||
84 | //Rendering design view, using observers to know when template is ready | 84 | //Rendering design view, using observers to know when template is ready |
85 | this.model.views.design.render(function () { | 85 | this.model.views.design.render(function () { |
86 | //TODO: Why is this needed? | 86 | //TODO: Why is this needed? |
87 | this._liveNodeList = this.model.documentRoot.getElementsByTagName('*'); | 87 | this.model.views.design._liveNodeList = this.documentRoot.getElementsByTagName('*'); |
88 | //Adding observer to know when template is ready | 88 | //Adding observer to know when template is ready |
89 | this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this)); | 89 | this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this)); |
90 | this._observer.observe(this.model.views.design.document.head, {childList: true}); | 90 | this._observer.observe(this.model.views.design.document.head, {childList: true}); |