Update Angular to 1.2.0 RC2
This commit is contained in:
parent
7416269494
commit
0d3a40980e
184 changed files with 17993 additions and 21133 deletions
|
@ -1,4 +1,4 @@
|
|||
<a href="http://github.com/angular/angular.js/tree/v1.2.0rc1/src/ngRoute/directive/ngView.js#L3" class="view-source btn btn-action"><i class="icon-zoom-in"> </i> View source</a><a href="http://github.com/angular/angular.js/edit/master/src/ngRoute/directive/ngView.js" class="improve-docs btn btn-primary"><i class="icon-edit"> </i> Improve this doc</a><h1><code ng:non-bindable="">ngView</code>
|
||||
<a href="http://github.com/angular/angular.js/tree/v1.2.0rc1/src/ngRoute/directive/ngView.js#L5" class="view-source btn btn-action"><i class="icon-zoom-in"> </i> View source</a><a href="http://github.com/angular/angular.js/edit/master/src/ngRoute/directive/ngView.js" class="improve-docs btn btn-primary"><i class="icon-edit"> </i> Improve this doc</a><h1><code ng:non-bindable="">ngView</code>
|
||||
<div><span class="hint">directive in module <code ng:non-bindable="">ngRoute</code>
|
||||
</span>
|
||||
</div>
|
||||
|
@ -9,6 +9,7 @@
|
|||
including the rendered template of the current route into the main layout (<code>index.html</code>) file.
|
||||
Every time the current route changes, the included view changes with it according to the
|
||||
configuration of the <code>$route</code> service.</p>
|
||||
<p>Requires the <a href="api/ngRoute"><code>ngRoute</code></a> module to be installed.</p>
|
||||
</div></div>
|
||||
<h2 id="Usage">Usage</h2>
|
||||
<div class="usage"><p>This directive can be used as custom element, but be aware of <a href="guide/ie">IE restrictions</a>.</p>as element:<pre class="prettyprint linenums"><ng-view>
|
||||
|
@ -41,10 +42,10 @@ as class<pre class="prettyprint linenums"><ANY class="ng-view">
|
|||
</div>
|
||||
<h2 id="Example">Example</h2>
|
||||
<div class="example"><div class="ngroute-directive-page ngroute-directive-ngview-page"><h4>Source</h2>
|
||||
<div source-edit="ngViewExample" source-edit-deps="angular.js angular-animate.js angular-route.js script.js" source-edit-html="index.html-141 book.html chapter.html" source-edit-css="animations.css" source-edit-js="script.js-142" source-edit-json="" source-edit-unit="" source-edit-scenario="scenario.js-143"></div>
|
||||
<div source-edit="ngViewExample" source-edit-deps="angular.js angular-animate.js angular-route.js script.js" source-edit-html="index.html-145 book.html chapter.html" source-edit-css="animations.css" source-edit-js="script.js-146" source-edit-json="" source-edit-unit="" source-edit-scenario="scenario.js-147"></div>
|
||||
<div class="tabbable"><div class="tab-pane" title="index.html">
|
||||
<pre class="prettyprint linenums" ng-set-text="index.html-141" ng-html-wrap="ngViewExample angular.js angular-animate.js angular-route.js script.js"></pre>
|
||||
<script type="text/ng-template" id="index.html-141">
|
||||
<pre class="prettyprint linenums" ng-set-text="index.html-145" ng-html-wrap="ngViewExample angular.js angular-animate.js angular-route.js script.js"></pre>
|
||||
<script type="text/ng-template" id="index.html-145">
|
||||
<div ng-controller="MainCntl as main">
|
||||
Choose:
|
||||
<a href="Book/Moby">Moby</a> |
|
||||
|
@ -137,8 +138,8 @@ as class<pre class="prettyprint linenums"><ANY class="ng-view">
|
|||
</style>
|
||||
</div>
|
||||
<div class="tab-pane" title="script.js">
|
||||
<pre class="prettyprint linenums" ng-set-text="script.js-142"></pre>
|
||||
<script type="text/ng-template" id="script.js-142">
|
||||
<pre class="prettyprint linenums" ng-set-text="script.js-146"></pre>
|
||||
<script type="text/ng-template" id="script.js-146">
|
||||
angular.module('ngViewExample', ['ngRoute', 'ngAnimate'], function($routeProvider, $locationProvider) {
|
||||
$routeProvider.when('/Book/:bookId', {
|
||||
templateUrl: 'book.html',
|
||||
|
@ -173,8 +174,8 @@ as class<pre class="prettyprint linenums"><ANY class="ng-view">
|
|||
</script>
|
||||
</div>
|
||||
<div class="tab-pane" title="End to end test">
|
||||
<pre class="prettyprint linenums" ng-set-text="scenario.js-143"></pre>
|
||||
<script type="text/ng-template" id="scenario.js-143">
|
||||
<pre class="prettyprint linenums" ng-set-text="scenario.js-147"></pre>
|
||||
<script type="text/ng-template" id="scenario.js-147">
|
||||
it('should load and compile correct template', function() {
|
||||
element('a:contains("Moby: Ch1")').click();
|
||||
var content = element('.doc-example-live [ng-view]').text();
|
||||
|
@ -190,6 +191,6 @@ as class<pre class="prettyprint linenums"><ANY class="ng-view">
|
|||
</script>
|
||||
</div>
|
||||
</div><div class="pull-right"> <button class="btn btn-primary" ng-click="animationsOff=true" ng-hide="animationsOff">Animations on</button> <button class="btn btn-primary disabled" ng-click="animationsOff=false" ng-show="animationsOff">Animations off</button></div><h2>Demo</h4>
|
||||
<div class="well doc-example-live animate-container" ng-class="{'animations-off':animationsOff == true}" ng-embed-app="ngViewExample" ng-set-html="index.html-141" ng-eval-javascript="script.js-142"></div>
|
||||
<div class="well doc-example-live animate-container" ng-class="{'animations-off':animationsOff == true}" ng-embed-app="ngViewExample" ng-set-html="index.html-145" ng-eval-javascript="script.js-146"></div>
|
||||
</div></div>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue