aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content
diff options
context:
space:
mode:
authorJørgen Borgesen2013-02-06 12:15:18 +0100
committerIgor Minar2013-02-25 15:32:14 -0800
commit753fc9e58d5e554d4930548558efecc283557eeb (patch)
tree8a809d0388e597b49ece1f964ea22d951414ac1d /docs/content
parent6a612df7de0162449d937d40b20b34a306ec9a75 (diff)
downloadangular.js-753fc9e58d5e554d4930548558efecc283557eeb.tar.bz2
feat(JQLite): ready() now supports document.readyState=='complete'
JQLite.ready() used for automatic bootstrapping (when jQuery is not present) now checks if document already is ready when first called. This simplifies bootstrapping when the angular script is loaded asynchronously. However if other scripts with angular app code are being loaded as well it is developers responsibility to ensure that these scripts are loaded after angular-loader.js is evaluated and before angular.js script is evaluated.
Diffstat (limited to 'docs/content')
-rw-r--r--docs/content/guide/bootstrap.ngdoc9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/content/guide/bootstrap.ngdoc b/docs/content/guide/bootstrap.ngdoc
index 3be24bb5..f1a46517 100644
--- a/docs/content/guide/bootstrap.ngdoc
+++ b/docs/content/guide/bootstrap.ngdoc
@@ -48,11 +48,10 @@ initialization.
# Automatic Initialization
-Angular initializes automatically upon `DOMContentLoaded` event, at which point Angular looks for
-the {@link api/ng.directive:ngApp `ng-app`} directive which
-designates your application root. If the {@link
-api/ng.directive:ngApp `ng-app`} directive is found then Angular
-will:
+Angular initializes automatically upon `DOMContentLoaded` event or when the `angular.js` script is
+evaluated if at that time `document.readyState` is set to `'complete'`. At this point Angular looks
+for the {@link api/ng.directive:ngApp `ng-app`} directive which designates your application root.
+If the {@link api/ng.directive:ngApp `ng-app`} directive is found then Angular will:
* load the {@link guide/module module} associated with the directive.
* create the application {@link api/AUTO.$injector injector}