aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2011-07-16 22:01:19 -0700
committerIgor Minar2011-07-16 22:01:19 -0700
commitda464683aa7a76bd58deb889398e148e25cd2f7f (patch)
treee49f54d8226237b5a5f94c7c48bf7ae9e5550c6c
parenta0b35161a6b9143ee89853e5c924d7855a488c25 (diff)
downloadangular.js-da464683aa7a76bd58deb889398e148e25cd2f7f.tar.bz2
doc(ng:include): improve the doc example to avoid confusion
-rw-r--r--docs/examples/ng-include/template1.html1
-rw-r--r--docs/examples/ng-include/template2.html1
-rw-r--r--src/widgets.js18
3 files changed, 12 insertions, 8 deletions
diff --git a/docs/examples/ng-include/template1.html b/docs/examples/ng-include/template1.html
new file mode 100644
index 00000000..804b7e0d
--- /dev/null
+++ b/docs/examples/ng-include/template1.html
@@ -0,0 +1 @@
+Content of template1.html
diff --git a/docs/examples/ng-include/template2.html b/docs/examples/ng-include/template2.html
new file mode 100644
index 00000000..dad193c7
--- /dev/null
+++ b/docs/examples/ng-include/template2.html
@@ -0,0 +1 @@
+Content of template2.html
diff --git a/src/widgets.js b/src/widgets.js
index 3a7fa2a3..db39e783 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -824,21 +824,23 @@ angularWidget('select', function(element){
<doc:example>
<doc:source>
<select name="url">
- <option value="api/angular.filter.date.html">date filter</option>
- <option value="api/angular.filter.html.html">html filter</option>
+ <option value="examples/ng-include/template1.html">template1.html</option>
+ <option value="examples/ng-include/template2.html">template2.html</option>
<option value="">(blank)</option>
</select>
- <tt>url = <a href="{{url}}">{{url}}</a></tt>
+ url of the template: <tt><a href="{{url}}">{{url}}</a></tt>
<hr/>
<ng:include src="url"></ng:include>
</doc:source>
<doc:scenario>
- it('should load date filter', function(){
- expect(element('.doc-example-live ng\\:include').text()).toMatch(/angular\.filter\.date/);
+ it('should load template1.html', function(){
+ expect(element('.doc-example-live ng\\:include').text()).
+ toBe('Content of template1.html\n');
});
- it('should change to html filter', function(){
- select('url').option('api/angular.filter.html.html');
- expect(element('.doc-example-live ng\\:include').text()).toMatch(/angular\.filter\.html/);
+ it('should load template2.html', function(){
+ select('url').option('examples/ng-include/template2.html');
+ expect(element('.doc-example-live ng\\:include').text()).
+ toBe('Content of template2.html\n');
});
it('should change to blank', function(){
select('url').option('');