diff options
| -rw-r--r-- | angular-minified.js | 4 | ||||
| -rw-r--r-- | angular.js | 2 | ||||
| -rw-r--r-- | src/Formatters.js | 2 | ||||
| -rw-r--r-- | test/FormattersTest.js | 4 | ||||
| -rw-r--r-- | test/testabilityPatch.js | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/angular-minified.js b/angular-minified.js index cbaa88dc..0d32218c 100644 --- a/angular-minified.js +++ b/angular-minified.js @@ -56,8 +56,8 @@ url:"http://wwwapps.ups.com/WebTracking/processInputRequest?sort_by=status&track [];p(c.values||[],function(e){d.push(e)});b.push(d.join(","))});a=b.join("|");return a===""?null:"t:"+a},title:function(a){var b=[];a=a.title||[];p(_.isArray(a)?a:[a],function(c){b.push(encodeURIComponent(c))});return b.join("|")},collect:function(a,b){var c=[],d=0;p(a.series||[],function(e){var f=[];e=e[b]||[];p(_.isArray(e)?e:[e],function(g){f.push(encodeURIComponent(g));d++});c.push(f.join("|"))});return d?c.join(","):null},encode:function(a,b,c){b=b||200;c=c||b;var d="http://chart.apis.google.com/chart?", e=[];a.chs=b+"x"+c;p(a,function(f,g){f&&e.push(g+"="+f)});e.sort();d+=e.join("&");return new r.g({url:d,html:'<img width="'+b+'" height="'+c+'" src="'+d+'"/>'})}}),qrcode:function(a,b,c){return u.encode({cht:"qr",chl:encodeURIComponent(a)},b,c)},chart:{pie:function(a,b,c){return u("p",a,b,c)},pie3d:function(a,b,c){return u("p3",a,b,c)},pieConcentric:function(a,b,c){return u("pc",a,b,c)},barHorizontalStacked:function(a,b,c){return u("bhs",a,b,c)},barHorizontalGrouped:function(a,b,c){return u("bhg", a,b,c)},barVerticalStacked:function(a,b,c){return u("bvs",a,b,c)},barVerticalGrouped:function(a,b,c){return u("bvg",a,b,c)},line:function(a,b,c){return u("lc",a,b,c)},sparkline:function(a,b,c){return u("ls",a,b,c)},scatter:function(a,b,c){return u("s",a,b,c)}},html:function(a){return new r.g({html:a})},linky:function(a){if(!a)return a;for(var b=/(ftp|http|https|mailto):\/\/([^\(\)|\s]+)/,c,d=a,e=[];c=d.match(b);){c=c[0].replace(/[\.\;\,\(\)\{\}\<\>]$/,"");var f=d.indexOf(c);e.push(D(d.substr(0,f))); -e.push('<a href="'+c+'">');e.push(c);e.push("</a>");d=d.substring(f+c.length)}e.push(D(d));return new r.g({text:a,html:e.join("")})}},function(a,b){r[b]=a});u=r.googleChartApi;B(ea,{noop:{format:Da,parse:Da},"boolean":{format:oa,parse:V},number:{format:oa,parse:function(a){return 1*a}},list:{format:function(a){return a?a.join(", "):a},parse:function(a){return a?_(_(a.split(",")).map(k.trim)).select(_.identity):a}}});array=[].constructor;m.toJson=w;m.fromJson=M;H.ia=function(a,b){if(!(a===b||!a||!b)){var c= -function(e,f,g){return g.substring(0,2)!=="$$"&&typeof e[g]!=="function"&&typeof f[g]!=="function"};for(var d in b)c(a,b,d)&&delete b[d];for(d in a)if(c(a,b,d))b[d]=a[d]}};B(H.prototype,{$migrate:function(){W(this.$$entity.defaults,this);return this},$merge:function(a){W(a,this);return this},$save:function(a){this.$$entity.k.save(this,a===true?undefined:a);a===true&&this.$$entity.k.V();return this},$delete:function(a){this.$$entity.k.remove(this,a===true?undefined:a);a===true&&this.$$entity.k.V(); +e.push('<a href="'+c+'">');e.push(c);e.push("</a>");d=d.substring(f+c.length)}e.push(D(d));return new r.g({text:a,html:e.join("")})}},function(a,b){r[b]=a});u=r.googleChartApi;B(ea,{noop:{format:Da,parse:Da},"boolean":{format:oa,parse:V},number:{format:oa,parse:function(a){return 1*a}},list:{format:function(a){return a?a.join(", "):a},parse:function(a){return a?_(_(a.split(",")).map(k.trim)).select(_.identity):[]}}});array=[].constructor;m.toJson=w;m.fromJson=M;H.ia=function(a,b){if(!(a===b||!a|| +!b)){var c=function(e,f,g){return g.substring(0,2)!=="$$"&&typeof e[g]!=="function"&&typeof f[g]!=="function"};for(var d in b)c(a,b,d)&&delete b[d];for(d in a)if(c(a,b,d))b[d]=a[d]}};B(H.prototype,{$migrate:function(){W(this.$$entity.defaults,this);return this},$merge:function(a){W(a,this);return this},$save:function(a){this.$$entity.k.save(this,a===true?undefined:a);a===true&&this.$$entity.k.V();return this},$delete:function(a){this.$$entity.k.remove(this,a===true?undefined:a);a===true&&this.$$entity.k.V(); return this},$loadById:function(a,b){this.$$entity.k.load(this,a,b);return this},$loadFrom:function(a){H.ia(a,this);return this},$saveTo:function(a){H.ia(this,a);return this}});F.sa={"null":P(null),"true":P(true),"false":P(false),"+":function(a,b,c){return(b||0)+(c||0)},"-":function(a,b,c){return(b||0)-(c||0)},"*":function(a,b,c){return b*c},"/":function(a,b,c){return b/c},"%":function(a,b,c){return b%c},"^":function(a,b,c){return b^c},"=":function(a,b,c){return a.scope.h(b,c)},"==":function(a,b, c){return b==c},"!=":function(a,b,c){return b!=c},"<":function(a,b,c){return b<c},">":function(a,b,c){return b>c},"<=":function(a,b,c){return b<=c},">=":function(a,b,c){return b>=c},"&&":function(a,b,c){return b&&c},"||":function(a,b,c){return b||c},"&":function(a,b,c){return b&c},"|":function(a,b,c){return c(a,b)},"!":function(a,b){return!b}};F.ab={n:"\n",f:"\u000c",r:"\r",t:"\t",v:"\u000b","'":"'",'"':'"'};F.prototype={I:function(){return this.index+1<this.text.length?this.text.charAt(this.index+ 1):false},parse:function(){for(var a=this.i,b=F.sa,c=true;this.index<this.text.length;){var d=this.text.charAt(this.index);if(d=='"'||d=="'"){this.jc(d);c=true}else if(d=="("||d=="["){a.push({index:this.index,text:d});this.index++}else if(d=="{"){c=this.I();if(c==":"||c=="("){a.push({index:this.index,text:d+c});this.index++}else a.push({index:this.index,text:d});this.index++;c=true}else if(d==")"||d=="]"||d=="}"){a.push({index:this.index,text:d});this.index++;c=false}else if(d==":"||d=="."||d==","|| @@ -1934,7 +1934,7 @@ extend(angularFormatter, { 'list':formater( function(obj) { return obj ? obj.join(", ") : obj; }, function(value) { - return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : value; + return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : []; } ) }); diff --git a/src/Formatters.js b/src/Formatters.js index 74126feb..661dd701 100644 --- a/src/Formatters.js +++ b/src/Formatters.js @@ -8,7 +8,7 @@ extend(angularFormatter, { 'list':formater( function(obj) { return obj ? obj.join(", ") : obj; }, function(value) { - return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : value; + return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : []; } ) }); diff --git a/test/FormattersTest.js b/test/FormattersTest.js index b71e68dc..e91fd37f 100644 --- a/test/FormattersTest.js +++ b/test/FormattersTest.js @@ -7,8 +7,10 @@ TestCase("formatterTest", { testList: function() { assertEquals('a, b', angular.formatter.list.format(['a', 'b'])); + assertEquals('', angular.formatter.list.format([])); assertEquals(['abc', 'c'], angular.formatter.list.parse(" , abc , c ,,")); - assertEquals(null, angular.formatter.list.parse(null)); + assertEquals([], angular.formatter.list.parse("")); + assertEquals([], angular.formatter.list.parse(null)); }, testBoolean: function() { diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js index d9aed6f2..44199b66 100644 --- a/test/testabilityPatch.js +++ b/test/testabilityPatch.js @@ -12,7 +12,7 @@ function noop(){} jstd = jstestdriver; swfobject = { - createSwf:function(){ + createSwf:function() { fail("must mock out swfobject.createSwf in test."); } }; @@ -33,7 +33,6 @@ function report(reportTest){ }); } - MockLocation = function() { this.url = "http://server"; }; |