Skip to content

Commit 6fbe7ee

Browse files
author
Dean Sofer
committed
Merge branch 'master' of github.com:angular-ui/angular-ui.github.com
* 'master' of github.com:angular-ui/angular-ui.github.com: Removed Length demo Changing angular-ui submodule to latest master branch Fixed an unclosed ancor Update index.html Added specific version of masked input jquery lib Fixed angular-ui submodule reference removed link to incorrect masked input library Conflicts: angular-ui
2 parents 61432b6 + d5cd9fa commit 6fbe7ee

File tree

5 files changed

+296
-55
lines changed

5 files changed

+296
-55
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
[submodule "lib/select2"]
55
path = lib/select2
66
url = git://github.com/ivaynberg/select2.git
7-
[submodule "lib/maskedinput"]
8-
path = lib/maskedinput
9-
url = git://github.com/digitalBush/jquery.maskedinput.git
107
[submodule "lib/bootstrap"]
118
path = lib/bootstrap
129
url = git://github.com/twitter/bootstrap.git

‎index.html‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<!DOCTYPE html>
32
<html lang="en" ng-app="demoApp" id="top">
43
<head>
@@ -10,7 +9,7 @@
109
<script src="http://code.angularjs.org/1.0.1/angular-1.0.1.min.js"></script>
1110
<script src="angular-ui/build/angular-ui.js"></script>
1211
<script src="js/prettify.js"></script>
13-
<script src="lib/maskedinput/src/jquery.maskedinput.js"></script>
12+
<script src="lib/maskedinput/jquery.maskedinput.js"></script>
1413
<script src="lib/select2/select2.js"></script>
1514
<script src="lib/CodeMirror/lib/codemirror.js"></script>
1615
<script src="lib/CodeMirror/mode/javascript/javascript.js"></script>
@@ -69,7 +68,6 @@
6968
<b class="caret"></b>
7069
</a>
7170
<ul class="dropdown-menu">
72-
<li><a scrollto href="#filters-length">Length</a></li>
7371
<li><a scrollto href="#filters-highlight">Highlight</a></li>
7472
<li><a scrollto href="#filters-inflector">Inflector</a></li>
7573
<li><a scrollto href="#filters-unique">Unique</a></li>
@@ -441,12 +439,13 @@ <h3>How?</h3>
441439
</section>
442440

443441
<section id="directives-mask">
444-
<div class="page-header">
442+
<div class="page-header" ng-init="maskDemo = 12345678">
445443
<h1>Mask</h1>
446444
</div>
447445
<h3>What?</h3>
448446
<p></p>
449447
<p><input ng-model="maskDemo" ui-mask="'99-99-9999'" placeholder="__-__-____"></p>
448+
<p>Mask model value: {{maskDemo}}</p>
450449

451450
<h3>Why?</h3>
452451
<p></p>
@@ -736,6 +735,7 @@ <h3>How?</h3>
736735
&lt;option value=&quot;three&quot;&gt;Third&lt;/option&gt;
737736
&lt;/select&gt;
738737
</pre>
738+
<p>Or try playing around with this <a href="http://plnkr.co/edit/X4nBw1?p=preview">sandbox demo</a> to see how AJAX works</p>
739739
</section>
740740

741741
<section id="directives-showhide">
@@ -881,41 +881,6 @@ <h3>How?</h3>
881881

882882
</section>
883883

884-
<section id="filters-length" ng-controller="LengthCtrl">
885-
<div class="page-header">
886-
<h1>Length</h1>
887-
</div>
888-
<div class="row">
889-
<div class="span6">
890-
<h3>What?</h3>
891-
<p>Get the length attribute of an array, string, or object</p>
892-
<div class="well">
893-
<p><input ng-model="lengthFilter" placeholder="Filter the list"></p>
894-
<p>There are {{(items | filter:lengthFilter).length}} items.</p>
895-
<ul>
896-
<li ng-repeat="value in items | filter:lengthFilter">{{value}}</li>
897-
</ul>
898-
</div>
899-
</div>
900-
<div class="span6">
901-
<h3>Why?</h3>
902-
<p>If you used another filter to modify the array or string, you cannot look at its inherit properties. This allows you to get the length property.</p>
903-
</div>
904-
</div>
905-
<h3>How?</h3>
906-
<pre class="prettyprint linenums" ng-non-bindable>
907-
&lt;input ng-model=&quot;lengthFilter&quot; placeholder=&quot;Filter the list&quot;&gt;
908-
&lt;p&gt;There are {{(items | filter:lengthFilter).length}} items.&lt;/p&gt;
909-
&lt;ul&gt;
910-
&lt;li ng-repeat=&quot;value in items | filter:lengthFilter&quot;&gt;{{value}}&lt;/li&gt;
911-
&lt;/ul&gt;
912-
913-
&lt;script&gt;
914-
$scope.items = [&#x27;First&#x27;,&#x27;Second&#x27;,&#x27;Third&#x27;,&#x27;Fourth&#x27;,&#x27;Fifth&#x27;];
915-
&lt;/script&gt;
916-
</pre>
917-
</section>
918-
919884
<section id="filters-highlight">
920885
<div class="page-header">
921886
<h1>Highlight</h1>
@@ -953,7 +918,7 @@ <h3>What?</h3>
953918
<label><input type="radio" value="variable" ng-model="inflectorType"> Variable</label>
954919
</p>
955920
<p><input placeholder="Enter some text to inflect" ng-model="inflectorText"></p>
956-
<p>{{inflectorText|inflector:inflectorType}}</p>
921+
<!--<p>{{inflectorText|inflector:inflectorType}}</p>-->
957922
</div>
958923

959924
<h3>How?</h3>

‎js/app.js‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ function ResetCtrl($scope) {
4949
$scope.resetModel = 'Hover over me';
5050
}
5151

52-
function LengthCtrl($scope) {
53-
$scope.items = [
54-
'First',
55-
'Second',
56-
'Third',
57-
'Fourth',
58-
'Fifth'
59-
];
60-
}
61-
6252
function KeypressCtrl($scope) {
6353
$scope.keypressCallback = function($event) {
6454
$event.preventDefault();
@@ -106,7 +96,7 @@ function MapCtrl($scope) {
10696
center: new google.maps.LatLng(35.784, -78.670),
10797
zoom: 15,
10898
mapTypeId: google.maps.MapTypeId.ROADMAP
109-
};
99+
};
110100

111101
$scope.addMarker = function($event) {
112102
$scope.myMarkers.push(new google.maps.Marker({

‎lib/maskedinput‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)