aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/tutorial
diff options
context:
space:
mode:
authorElwin Arens2013-11-26 22:54:38 +0100
committerPete Bacon Darwin2013-12-04 22:36:40 +0000
commitfbc5cf514bea49f12c1ff1ff331c7cf54e92b670 (patch)
tree1d003a47253f6a734168ff3e0809538b1f54b382 /docs/content/tutorial
parentf01087f802839637843115cbcf99702e09d866f6 (diff)
downloadangular.js-fbc5cf514bea49f12c1ff1ff331c7cf54e92b670.tar.bz2
docs(tutorial/step-12): fix refernce to incorrect jquery version
Closes #5156
Diffstat (limited to 'docs/content/tutorial')
-rw-r--r--docs/content/tutorial/step_12.ngdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/content/tutorial/step_12.ngdoc b/docs/content/tutorial/step_12.ngdoc
index bd4333e4..1fabfd1c 100644
--- a/docs/content/tutorial/step_12.ngdoc
+++ b/docs/content/tutorial/step_12.ngdoc
@@ -43,7 +43,7 @@ __`app/index.html`.__
<pre>
...
<!-- jQuery is used for JavaScript animations (include this before angular.js) -->
- <script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
+ <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
<!-- required module to enable animation support in AngularJS -->
<script src="lib/angular/angular-animate.js"></script>
@@ -56,6 +56,10 @@ __`app/index.html`.__
...
</pre>
+<div class="alert alert-error">
+ **Important:** Be sure to use jQuery version `1.10.x`. AngularJS does not yet support jQuery `2.x`.
+</div>
+
Animations can now be created within the CSS code (`animations.css`) as well as the JavaScript code (`animations.js`).
But before we start, let's create a new module which uses the ngAnimate module as a dependency just like we did before
with `ngResource`.
@@ -383,10 +387,6 @@ isn't required to do JavaScript animations with AngularJS, but we're going to us
your own JavaScript animation library is beyond the scope of this tutorial. For more on
`jQuery.animate`, see the {@link http://api.jquery.com/animate/ jQuery documentation}.
-<div class="alert alert-error">
- **Important:** Be sure to use jQuery version `1.10.x`. AngularJS does not yet support jQuery `2.x`.
-</div>
-
The `addClass` and `removeClass` callback functions are called whenever an a class is added or removed
on the element that contains the class we registered, which is in this case `.phone`. When the `.active`
class is added to the element (via the `ng-class` directive) the `addClass` JavaScript callback will