diff options
Diffstat (limited to 'src/service')
| -rw-r--r-- | src/service/compiler.js | 6 | ||||
| -rw-r--r-- | src/service/filter.js | 1 | ||||
| -rw-r--r-- | src/service/filter/filter.js | 6 | ||||
| -rw-r--r-- | src/service/filter/filters.js | 118 | ||||
| -rw-r--r-- | src/service/filter/orderBy.js | 2 |
5 files changed, 15 insertions, 118 deletions
diff --git a/src/service/compiler.js b/src/service/compiler.js index 6185c909..c663baac 100644 --- a/src/service/compiler.js +++ b/src/service/compiler.js @@ -33,7 +33,7 @@ // watch the 'compile' expression for changes return scope.$eval(attrs.compile); }, - function(scope, value) { + function(value) { // when the 'compile' expression changes // assign it into the current DOM element.html(value); @@ -631,7 +631,7 @@ function $CompileProvider($provide) { bindings = parent.data('$binding') || []; bindings.push(interpolateFn); parent.data('$binding', bindings).addClass('ng-binding'); - scope.$watch(interpolateFn, function(scope, value) { + scope.$watch(interpolateFn, function(value) { node[0].nodeValue = value; }); }) @@ -656,7 +656,7 @@ function $CompileProvider($provide) { compile: function(element, attr) { if (interpolateFn) { return function(scope, element, attr) { - scope.$watch(interpolateFn, function(scope, value){ + scope.$watch(interpolateFn, function(value) { attr.$set(name, value); }); }; diff --git a/src/service/filter.js b/src/service/filter.js index 2947d84b..4ed3f620 100644 --- a/src/service/filter.js +++ b/src/service/filter.js @@ -94,7 +94,6 @@ function $FilterProvider($provide) { register('currency', currencyFilter); register('date', dateFilter); register('filter', filterFilter); - register('html', htmlFilter); register('json', jsonFilter); register('limitTo', limitToFilter); register('linky', linkyFilter); diff --git a/src/service/filter/filter.js b/src/service/filter/filter.js index 61cfc80f..49960546 100644 --- a/src/service/filter/filter.js +++ b/src/service/filter/filter.js @@ -64,17 +64,17 @@ <doc:scenario> it('should search across all fields when filtering with a string', function() { input('searchText').enter('m'); - expect(repeater('#searchTextResults tr', 'friend in friends').column('name')). + expect(repeater('#searchTextResults tr', 'friend in friends').column('friend.name')). toEqual(['Mary', 'Mike', 'Adam']); input('searchText').enter('76'); - expect(repeater('#searchTextResults tr', 'friend in friends').column('name')). + expect(repeater('#searchTextResults tr', 'friend in friends').column('friend.name')). toEqual(['John', 'Julie']); }); it('should search in specific fields when filtering with a predicate object', function() { input('search.$').enter('i'); - expect(repeater('#searchObjResults tr', 'friend in friends').column('name')). + expect(repeater('#searchObjResults tr', 'friend in friends').column('friend.name')). toEqual(['Mary', 'Mike', 'Julie']); }); </doc:scenario> diff --git a/src/service/filter/filters.js b/src/service/filter/filters.js index 69bfbacf..58a3a869 100644 --- a/src/service/filter/filters.js +++ b/src/service/filter/filters.js @@ -385,7 +385,7 @@ function dateFilter($locale) { </doc:source> <doc:scenario> it('should jsonify filtered objects', function() { - expect(binding('| json')).toBe('{\n "name":"value"}'); + expect(binding("{'name':'value'}")).toBe('{\n "name":"value"}'); }); </doc:scenario> </doc:example> @@ -422,108 +422,6 @@ var uppercaseFilter = valueFn(uppercase); /** * @ngdoc filter - * @name angular.module.ng.$filter.html - * @function - * - * @description - * Prevents the input from getting escaped by angular. By default the input is sanitized and - * inserted into the DOM as is. - * - * The input is sanitized by parsing the html into tokens. All safe tokens (from a whitelist) are - * then serialized back to properly escaped html string. This means that no unsafe input can make - * it into the returned string, however, since our parser is more strict than a typical browser - * parser, it's possible that some obscure input, which would be recognized as valid HTML by a - * browser, won't make it through the sanitizer. - * - * If you hate your users, you may call the filter with optional 'unsafe' argument, which bypasses - * the html sanitizer, but makes your application vulnerable to XSS and other attacks. Using this - * option is strongly discouraged and should be used only if you absolutely trust the input being - * filtered and you can't get the content through the sanitizer. - * - * @param {string} html Html input. - * @param {string=} option If 'unsafe' then do not sanitize the HTML input. - * @returns {string} Sanitized or raw html. - * - * @example - <doc:example> - <doc:source> - <script> - function Ctrl($scope) { - $scope.snippet = - '<p style="color:blue">an html\n' + - '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' + - 'snippet</p>'; - } - </script> - <div ng:controller="Ctrl"> - Snippet: <textarea ng:model="snippet" cols="60" rows="3"></textarea> - <table> - <tr> - <td>Filter</td> - <td>Source</td> - <td>Rendered</td> - </tr> - <tr id="html-filter"> - <td>html filter</td> - <td> - <pre><div ng:bind="snippet | html"><br/></div></pre> - </td> - <td> - <div ng:bind="snippet | html"></div> - </td> - </tr> - <tr id="escaped-html"> - <td>no filter</td> - <td><pre><div ng:bind="snippet"><br/></div></pre></td> - <td><div ng:bind="snippet"></div></td> - </tr> - <tr id="html-unsafe-filter"> - <td>unsafe html filter</td> - <td><pre><div ng:bind="snippet | html:'unsafe'"><br/></div></pre></td> - <td><div ng:bind="snippet | html:'unsafe'"></div></td> - </tr> - </table> - </div> - </doc:source> - <doc:scenario> - it('should sanitize the html snippet ', function() { - expect(using('#html-filter').binding('snippet | html')). - toBe('<p>an html\n<em>click here</em>\nsnippet</p>'); - }); - - it('should escape snippet without any filter', function() { - expect(using('#escaped-html').binding('snippet')). - toBe("<p style=\"color:blue\">an html\n" + - "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" + - "snippet</p>"); - }); - - it('should inline raw snippet if filtered as unsafe', function() { - expect(using('#html-unsafe-filter').binding("snippet | html:'unsafe'")). - toBe("<p style=\"color:blue\">an html\n" + - "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" + - "snippet</p>"); - }); - - it('should update', function() { - input('snippet').enter('new <b>text</b>'); - expect(using('#html-filter').binding('snippet | html')).toBe('new <b>text</b>'); - expect(using('#escaped-html').binding('snippet')).toBe("new <b>text</b>"); - expect(using('#html-unsafe-filter').binding("snippet | html:'unsafe'")).toBe('new <b>text</b>'); - }); - </doc:scenario> - </doc:example> - */ -//TODO(misko): turn sensitization into injectable service -function htmlFilter() { - return function(html, option){ - return new HTML(html, option); - }; -} - - -/** - * @ngdoc filter * @name angular.module.ng.$filter.linky * @function * @@ -558,10 +456,10 @@ function htmlFilter() { <tr id="linky-filter"> <td>linky filter</td> <td> - <pre><div ng:bind="snippet | linky"><br/></div></pre> + <pre><div ng:bind-html="snippet | linky"><br/></div></pre> </td> <td> - <div ng:bind="snippet | linky"></div> + <div ng:bind-html="snippet | linky"></div> </td> </tr> <tr id="escaped-html"> @@ -574,10 +472,10 @@ function htmlFilter() { <doc:scenario> it('should linkify the snippet with urls', function() { expect(using('#linky-filter').binding('snippet | linky')). - toBe('Pretty text with some links:\n' + - '<a href="http://angularjs.org/">http://angularjs.org/</a>,\n' + - '<a href="mailto:us@somewhere.org">us@somewhere.org</a>,\n' + - '<a href="mailto:another@somewhere.org">another@somewhere.org</a>,\n' + + toBe('Pretty text with some links: ' + + '<a href="http://angularjs.org/">http://angularjs.org/</a>, ' + + '<a href="mailto:us@somewhere.org">us@somewhere.org</a>, ' + + '<a href="mailto:another@somewhere.org">another@somewhere.org</a>, ' + 'and one more: <a href="ftp://127.0.0.1/">ftp://127.0.0.1/</a>.'); }); @@ -624,6 +522,6 @@ function linkyFilter() { raw = raw.substring(i + match[0].length); } writer.chars(raw); - return new HTML(html.join('')); + return html.join(''); }; }; diff --git a/src/service/filter/orderBy.js b/src/service/filter/orderBy.js index c67d2769..e7528a4b 100644 --- a/src/service/filter/orderBy.js +++ b/src/service/filter/orderBy.js @@ -63,7 +63,7 @@ </doc:source> <doc:scenario> it('should be reverse ordered by aged', function() { - expect(binding('predicate')).toBe('Sorting predicate = -age; reverse = '); + expect(binding('predicate')).toBe('-age'); expect(repeater('table.friend', 'friend in friends').column('friend.age')). toEqual(['35', '29', '21', '19', '10']); expect(repeater('table.friend', 'friend in friends').column('friend.name')). |