diff options
author | Jose Antonio Marquez | 2012-02-17 00:20:42 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-17 00:20:42 -0800 |
commit | 7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f (patch) | |
tree | 0a51be74f0d5b1f6c740cd1a9c79e00624a0c0af /js/document | |
parent | 9fe5d98bf469036c856e28d71ad4160d630b4af4 (diff) | |
parent | 18a42c37d080c03830c3f0a4156b81044e6309ee (diff) | |
download | ninja-7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index ad5417a9..0c8695fb 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -439,7 +439,8 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
439 | } | 439 | } |
440 | } | 440 | } |
441 | 441 | ||
442 | this.callback(this); | 442 | // Remving this callback and using the callback from the css load |
443 | // this.callback(this); | ||
443 | 444 | ||
444 | } | 445 | } |
445 | }, | 446 | }, |