aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/component.js
diff options
context:
space:
mode:
authorJon Reid2012-06-20 15:05:26 -0700
committerJon Reid2012-06-20 15:05:26 -0700
commit6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch)
treeaa6becc1e97aecbe6fb43aa33770def3c3de227d /node_modules/montage/ui/component.js
parentf887a74a7d03a2008a2c43d455a2b3e9223028af (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'node_modules/montage/ui/component.js')
-rwxr-xr-xnode_modules/montage/ui/component.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/montage/ui/component.js b/node_modules/montage/ui/component.js
index 30119815..09b91bed 100755
--- a/node_modules/montage/ui/component.js
+++ b/node_modules/montage/ui/component.js
@@ -1795,7 +1795,7 @@ var rootComponent = Montage.create(Component, /** @lends module:montage/ui/compo
1795 } 1795 }
1796 if (drawLogger.isDebug) { 1796 if (drawLogger.isDebug) {
1797 // Detect any DOM modification since the previous draw 1797 // Detect any DOM modification since the previous draw
1798 var newSource = document.getElementsByTagName('html')[0].innerHTML; 1798 var newSource = document.documentElement.innerHTML;
1799 if (self._oldSource && newSource !== self._oldSource) { 1799 if (self._oldSource && newSource !== self._oldSource) {
1800 var warning = ["DOM modified outside of the draw loop"]; 1800 var warning = ["DOM modified outside of the draw loop"];
1801 var out = self._diff(self._oldSource.split("\n"), newSource.split("\n")); 1801 var out = self._diff(self._oldSource.split("\n"), newSource.split("\n"));
@@ -1820,7 +1820,7 @@ var rootComponent = Montage.create(Component, /** @lends module:montage/ui/compo
1820 1820
1821 if (drawLogger.isDebug) { 1821 if (drawLogger.isDebug) {
1822 console.groupEnd(); 1822 console.groupEnd();
1823 self._oldSource = document.getElementsByTagName('html')[0].innerHTML; 1823 self._oldSource = document.documentElement.innerHTML;
1824 } 1824 }
1825 self._frameTime = null; 1825 self._frameTime = null;
1826 if (self._scheduleComposerRequest) { 1826 if (self._scheduleComposerRequest) {
@@ -1987,7 +1987,7 @@ var rootComponent = Montage.create(Component, /** @lends module:montage/ui/compo
1987 } 1987 }
1988}); 1988});
1989 1989
1990rootComponent.init().element = document; 1990rootComponent.init();
1991//if(window.parent && window.parent.jasmine) { 1991//if(window.parent && window.parent.jasmine) {
1992exports.__root__ = rootComponent; 1992exports.__root__ = rootComponent;
1993//} 1993//}