Skip to content
This repository was archived by the owner on Jun 26, 2020. It is now read-only.

Commit a91fdae

Browse files
committed
chore(release): update ionic to v0.10.0-alpha
1 parent a807216 commit a91fdae

File tree

11 files changed

+2152
-1071
lines changed

11 files changed

+2152
-1071
lines changed

www/lib/css/ionic.css

Lines changed: 161 additions & 60 deletions
Large diffs are not rendered by default.

www/lib/css/ionic.min.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

www/lib/js/angular/angular-sanitize.js

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.10
2+
* @license AngularJS v1.2.12
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -104,35 +104,37 @@ var $sanitizeMinErr = angular.$$minErr('$sanitize');
104104
</table>
105105
</div>
106106
</doc:source>
107-
<doc:scenario>
107+
<doc:protractor>
108108
it('should sanitize the html snippet by default', function() {
109-
expect(using('#bind-html-with-sanitize').element('div').html()).
109+
expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
110110
toBe('<p>an html\n<em>click here</em>\nsnippet</p>');
111111
});
112112
113113
it('should inline raw snippet if bound to a trusted value', function() {
114-
expect(using('#bind-html-with-trust').element("div").html()).
114+
expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).
115115
toBe("<p style=\"color:blue\">an html\n" +
116116
"<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" +
117117
"snippet</p>");
118118
});
119119
120120
it('should escape snippet without any filter', function() {
121-
expect(using('#bind-default').element('div').html()).
121+
expect(element(by.css('#bind-default div')).getInnerHtml()).
122122
toBe("&lt;p style=\"color:blue\"&gt;an html\n" +
123123
"&lt;em onmouseover=\"this.textContent='PWN3D!'\"&gt;click here&lt;/em&gt;\n" +
124124
"snippet&lt;/p&gt;");
125125
});
126126
127127
it('should update', function() {
128-
input('snippet').enter('new <b onclick="alert(1)">text</b>');
129-
expect(using('#bind-html-with-sanitize').element('div').html()).toBe('new <b>text</b>');
130-
expect(using('#bind-html-with-trust').element('div').html()).toBe(
128+
element(by.model('snippet')).clear();
129+
element(by.model('snippet')).sendKeys('new <b onclick="alert(1)">text</b>');
130+
expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
131+
toBe('new <b>text</b>');
132+
expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).toBe(
131133
'new <b onclick="alert(1)">text</b>');
132-
expect(using('#bind-default').element('div').html()).toBe(
134+
expect(element(by.css('#bind-default div')).getInnerHtml()).toBe(
133135
"new &lt;b onclick=\"alert(1)\"&gt;text&lt;/b&gt;");
134136
});
135-
</doc:scenario>
137+
</doc:protractor>
136138
</doc:example>
137139
*/
138140
function $SanitizeProvider() {
@@ -537,37 +539,38 @@ angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
537539
</tr>
538540
</table>
539541
</doc:source>
540-
<doc:scenario>
542+
<doc:protractor>
541543
it('should linkify the snippet with urls', function() {
542-
expect(using('#linky-filter').binding('snippet | linky')).
543-
toBe('Pretty text with some links:&#10;' +
544-
'<a href="http://angularjs.org/">http://angularjs.org/</a>,&#10;' +
545-
'<a href="mailto:us@somewhere.org">us@somewhere.org</a>,&#10;' +
546-
'<a href="mailto:another@somewhere.org">another@somewhere.org</a>,&#10;' +
547-
'and one more: <a href="ftp://127.0.0.1/">ftp://127.0.0.1/</a>.');
544+
expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
545+
toBe('Pretty text with some links: http://angularjs.org/, us@somewhere.org, ' +
546+
'another@somewhere.org, and one more: ftp://127.0.0.1/.');
547+
expect(element.all(by.css('#linky-filter a')).count()).toEqual(4);
548548
});
549549
550-
it ('should not linkify snippet without the linky filter', function() {
551-
expect(using('#escaped-html').binding('snippet')).
552-
toBe("Pretty text with some links:\n" +
553-
"http://angularjs.org/,\n" +
554-
"mailto:us@somewhere.org,\n" +
555-
"another@somewhere.org,\n" +
556-
"and one more: ftp://127.0.0.1/.");
550+
it('should not linkify snippet without the linky filter', function() {
551+
expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()).
552+
toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' +
553+
'another@somewhere.org, and one more: ftp://127.0.0.1/.');
554+
expect(element.all(by.css('#escaped-html a')).count()).toEqual(0);
557555
});
558556
559557
it('should update', function() {
560-
input('snippet').enter('new http://link.');
561-
expect(using('#linky-filter').binding('snippet | linky')).
562-
toBe('new <a href="http://link">http://link</a>.');
563-
expect(using('#escaped-html').binding('snippet')).toBe('new http://link.');
558+
element(by.model('snippet')).clear();
559+
element(by.model('snippet')).sendKeys('new http://link.');
560+
expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
561+
toBe('new http://link.');
562+
expect(element.all(by.css('#linky-filter a')).count()).toEqual(1);
563+
expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText())
564+
.toBe('new http://link.');
564565
});
565566
566567
it('should work with the target property', function() {
567-
expect(using('#linky-target').binding("snippetWithTarget | linky:'_blank'")).
568-
toBe('<a target="_blank" href="http://angularjs.org/">http://angularjs.org/</a>');
568+
expect(element(by.id('linky-target')).
569+
element(by.binding("snippetWithTarget | linky:'_blank'")).getText()).
570+
toBe('http://angularjs.org/');
571+
expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank');
569572
});
570-
</doc:scenario>
573+
</doc:protractor>
571574
</doc:example>
572575
*/
573576
angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {

www/lib/js/angular/angular-sanitize.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)