Skip to content

Commit 44f92db

Browse files
author
Dean Sofer
committed
Merge branch 'master' of github.com:angular-ui/angular-ui.github.com
2 parents 1d051b9 + 253ea71 commit 44f92db

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
url = git://github.com/tinymce/tinymce.git
1919
[submodule "lib/CodeMirror2"]
2020
path = lib/CodeMirror2
21-
url = https://github.com/marijnh/CodeMirror2
21+
url = git://github.com/marijnh/CodeMirror2

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ <h1>Modal</h1>
368368
<h3>What?</h3>
369369
<p>Takes the twitter bootstrap modal and lets you assign an ng-model to it. You can open/close the modal any way you want: data-* attributes, or use elm.modal('show'), or whatever. The ng-model you give will always correspond to whether the modal is opened or not, and if you set it it will also change the modal.
370370
<p>
371-
<div id="myModal" class="modal hide fade" ui-modal ng-model="modalShown">
371+
<div id="modalGuy" class="modal hide" ui-modal ng-model="modalShown">
372372
<div class="modal-header"><h1>Modalin'!</h1></div>
373373
<div class="modal-body">
374374
<p>Cool beans, dude.</p>
@@ -379,7 +379,7 @@ <h3>What?</h3>
379379
</div>
380380
</div>
381381
<a class="btn" ng-click="modalShown=true">Open Modal with ng-model</a><br>
382-
<a class="btn" data-toggle="modal" data-target="#myModal">Open Modal with data-toggle="modal"</a>
382+
<a class="btn" data-toggle="modal" href="#modalGuy">Open Modal with data-toggle="modal"</a>
383383
</p>
384384
<h3>Why?</h3>
385385
<p>We wanted to be able to open/close a modal programatically, so we stuck an ng-model onto the bootstrap modal and called it a day.</p>
@@ -388,7 +388,7 @@ <h3>Why?</h3>
388388
<h3>How?</h3>
389389
<pre class="prettyprint linenums" ng-non-bindable>
390390
&lt;script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-modal.js"&gt;&lt;/script&gt;
391-
&lt;div ui-modal ng-model="modalShown" id="myModal" class="modal hide"&gt;
391+
&lt;div ui-modal ng-model="modalShown" id="myModal"&gt;
392392
Cool, a modal dialog!
393393
&lt;a data-dismiss="modal"&gt;Close 1&lt;/a&gt;
394394
&lt;a ng-click="modalShown=false"&gt;Close 2&lt;/a&gt;
@@ -613,7 +613,7 @@ <h1>Length</h1>
613613
<div class="row">
614614
<div class="span6">
615615
<h3>What?</h3>
616-
<p>Get the length attribute of an array or string</p>
616+
<p>Get the length attribute of an array, string, or object</p>
617617
<div class="well">
618618
<p><input ng-model="lengthFilter" placeholder="Filter the list"></p>
619619
<p>There are {{items | filter:lengthFilter | length}} items.</p>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy