diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/component.js | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 | //} |