Merge pull request #2229 from chaffeqa/patch-1

fix(ready): correctly handle DOM Ready states
This commit is contained in:
Adam Bradley
2014-09-16 19:57:48 -05:00

View File

@@ -1,7 +1,7 @@
(function(window, document, ionic) {
var readyCallbacks = [];
var isDomReady = false;
var isDomReady = document.readyState === 'complete' || document.readyState === 'interactive';
function domReady() {
isDomReady = true;
@@ -11,7 +11,10 @@
readyCallbacks = [];
document.removeEventListener('DOMContentLoaded', domReady);
}
document.addEventListener('DOMContentLoaded', domReady);
if (!isDomReady){
document.addEventListener('DOMContentLoaded', domReady);
}
// From the man himself, Mr. Paul Irish.
// The requestAnimationFrame polyfill
@@ -110,7 +113,7 @@
* @param {function} callback The function to be called.
*/
ready: function(cb) {
if(isDomReady || document.readyState === "complete") {
if(isDomReady) {
ionic.requestAnimationFrame(cb);
} else {
readyCallbacks.push(cb);