diff options
author | Jose Antonio Marquez | 2012-06-20 16:47:37 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-20 16:47:37 -0700 |
commit | 313a62245400e6c8cfa6d2f02c603cc7f01ddfc6 (patch) | |
tree | c207d1290be0e894a57b03098bbb7bbe5f2aee86 /node_modules/montage/ui/component.js | |
parent | 2496e0d0b0ac5f8c53b12de77f0feda69ce4a2f4 (diff) | |
parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
download | ninja-313a62245400e6c8cfa6d2f02c603cc7f01ddfc6.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'node_modules/montage/ui/component.js')
-rwxr-xr-x | node_modules/montage/ui/component.js | 6 |
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 | ||
1990 | rootComponent.init().element = document; | 1990 | rootComponent.init(); |
1991 | //if(window.parent && window.parent.jasmine) { | 1991 | //if(window.parent && window.parent.jasmine) { |
1992 | exports.__root__ = rootComponent; | 1992 | exports.__root__ = rootComponent; |
1993 | //} | 1993 | //} |