From b628de9758c313b106d22468f4b49bd223698fd5 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 20 Feb 2010 17:27:21 -0800
Subject: fix option value bug
---
angular-minified.js | 140 ++++++++++++++++++++++++++--------------------------
angular.js | 71 +++++++++++++-------------
src/Binder.js | 64 +++++++++++++-----------
test/BinderTest.js | 22 ++++++---
4 files changed, 158 insertions(+), 139 deletions(-)
diff --git a/angular-minified.js b/angular-minified.js
index 3727acc4..a7689338 100644
--- a/angular-minified.js
+++ b/angular-minified.js
@@ -1,104 +1,104 @@
function F(){return function(){}}function K(p){return function(){return p}}
-(function(p,x){function n(){}function L(a,b,c){var d=p.console;switch(arguments.length){case 1:d.log(a);break;case 2:d.log(a,b);break;default:d.log(a,b,c);break}}function aa(a,b,c){var d=p.console;switch(arguments.length){case 1:d.error(a);break;case 2:d.error(a,b);break;default:d.error(a,b,c);break}}function ia(a,b){var c=x.createElement("div");c.className=a;for(var d=a="",e=0;e/g,">")}function La(a){if(!a||!a.replace)return a;return a.replace(//g,">").replace(/\"/g,""")}function Ma(a,b){if(!a)throw"Missing this";if(!_.isFunction(b))throw"Missing function";return function(){return b.apply(a,arguments)}}function la(a){var b=x.createElement("div");
-b.appendChild(a);var c=b.innerHTML;b.removeChild(a);return c}function W(a){var b=(""+a).toLowerCase();if(b=="f"||b=="0"||b=="false"||b=="no")a=false;return!!a}function X(a,b){for(var c in a){var d=b[c],e=typeof d;if(e=="undefined")b[c]=M(v(a[c]));else e=="object"&&d.constructor!=array&&c.substring(0,1)!="$"&&X(a[c],d)}}function ma(a){this.location=a;this.delay=25;this.setTimeout=function(b,c){p.setTimeout(b,c)};this.Ja=function(b){return b};this.N=a.href}function Na(){var a=k.fn;a.scope=function(){for(var b=
+b.appendChild(a);var c=b.innerHTML;b.removeChild(a);return c}function W(a){var b=(""+a).toLowerCase();if(b=="f"||b=="0"||b=="false"||b=="no")a=false;return!!a}function X(a,b){for(var c in a){var d=b[c],e=typeof d;if(e=="undefined")b[c]=M(w(a[c]));else e=="object"&&d.constructor!=array&&c.substring(0,1)!="$"&&X(a[c],d)}}function ma(a){this.location=a;this.delay=25;this.setTimeout=function(b,c){p.setTimeout(b,c)};this.Ka=function(b){return b};this.N=a.href}function Na(){var a=k.fn;a.scope=function(){for(var b=
this;b&&b.get(0);){var c=b.data("scope");if(c)return c;b=b.parent()}return null};a.controller=function(){return this.data("controller")||R.Kb}}function Oa(a){if(a.Gc=="console"&&!Q){Q=x.createElement("div");Q.id="ng-console";x.getElementsByTagName("body")[0].appendChild(Q);L=function(){ia("ng-console-info",arguments)};console.error=function(){ia("ng-console-error",arguments)}}}function ba(a,b){var c={};o(b,function(d,e){c[e]=_(d).bind(a)});return c}function Pa(a,b){var c=new na(b.server,b.database),
-d=new w(a[0],c,h,b.location,b);d.sa.push(b.Nc);c=new S(a.find("body"),b.server,b.database);var e=b.database=="$MEMORY"?new ca(p):new oa(b.server,k.getScript);e=new pa(e,new qa(a.find("body")),function(){d.d()});var f=new ra(e,c),g="/data/"+b.database,h=new Y(function(l,q){e.P("POST",g,l,q)},f,d.anchor);d.l=h;d.sa.push(function(){h.W()});var i=new u({$anchor:d.anchor,$updateView:_(d.d).bind(d),$config:b,$invalidWidgets:[],$console:p.console,$datastore:ba(h,{load:h.load,loadMany:h.ma,loadOrCreate:h.Ma,
-loadAll:h.La,save:h.save,remove:h.remove,flush:h.W,query:h.Ua,entity:h.G,entities:h.entities,documentCountsByUser:h.Ab,userDocumentIdsByEntity:h.sc,join:h.join}),$save:function(l){h.mc(i.j,l,d.anchor)},$window:p,$uid:function(){return""+(new Date).getTime()},$users:f},"ROOT");a.data("scope",i);d.G(i);d.compile();c.bind();(new z(a)).bind();var j=_(ba(i,{set:i.i,get:i.get,eval:i.eval})).extend({init:function(){b.location.listen(_(d.gc).bind(d));d.Ra();d.Eb();d.d();return j},element:a[0],updateView:_(d.d).bind(d),
-config:b});return j}function G(a,b,c){var d=_.last(b);o(c,function(e){d[e]=_[e]});m[a]=m[a]||{};o(b,function(e){B(m[a],e)})}function w(a,b,c,d,e){this.F=a;this.location=d;this.l=c;this.anchor={};this.xc=b;this.ub=e||{};this.sa=[]}function S(a,b,c){this.gb=a;this.fa=b;this.ka=c;this.kb=p;this.H=[]}function Y(a,b,c){this.post=a;this.Za=b;this.K=[];this.ha={$collections:this.K};this.anchor=c;this.S=[]}function T(a,b){return{format:a,parse:b||a}}function sa(a){return""+a}function v(a,b){var c=[];da(c,
+d=new u(a[0],c,h,b.location,b);d.sa.push(b.Nc);c=new S(a.find("body"),b.server,b.database);var e=b.database=="$MEMORY"?new ca(p):new oa(b.server,k.getScript);e=new pa(e,new qa(a.find("body")),function(){d.d()});var f=new ra(e,c),g="/data/"+b.database,h=new Y(function(l,q){e.P("POST",g,l,q)},f,d.anchor);d.l=h;d.sa.push(function(){h.W()});var i=new v({$anchor:d.anchor,$updateView:_(d.d).bind(d),$config:b,$invalidWidgets:[],$console:p.console,$datastore:ba(h,{load:h.load,loadMany:h.ma,loadOrCreate:h.Na,
+loadAll:h.Ma,save:h.save,remove:h.remove,flush:h.W,query:h.Va,entity:h.G,entities:h.entities,documentCountsByUser:h.Bb,userDocumentIdsByEntity:h.sc,join:h.join}),$save:function(l){h.mc(i.j,l,d.anchor)},$window:p,$uid:function(){return""+(new Date).getTime()},$users:f},"ROOT");a.data("scope",i);d.G(i);d.compile();c.bind();(new z(a)).bind();var j=_(ba(i,{set:i.i,get:i.get,eval:i.eval})).extend({init:function(){b.location.listen(_(d.gc).bind(d));d.Sa();d.Fb();d.d();return j},element:a[0],updateView:_(d.d).bind(d),
+config:b});return j}function G(a,b,c){var d=_.last(b);o(c,function(e){d[e]=_[e]});m[a]=m[a]||{};o(b,function(e){B(m[a],e)})}function u(a,b,c,d,e){this.F=a;this.location=d;this.l=c;this.anchor={};this.xc=b;this.vb=e||{};this.sa=[]}function S(a,b,c){this.hb=a;this.fa=b;this.ka=c;this.lb=p;this.H=[]}function Y(a,b,c){this.post=a;this.$a=b;this.K=[];this.ha={$collections:this.K};this.anchor=c;this.S=[]}function T(a,b){return{format:a,parse:b||a}}function sa(a){return""+a}function w(a,b){var c=[];da(c,
a,b?"\n ":null,_([]));return c.join("")}function M(a){try{var b=new D(a,true),c=b.da();b.L();return c()}catch(d){aa("fromJson error: ",a,d);throw d;}}function da(a,b,c,d){if(typeof b=="object"){if(d.include(b)){a.push("RECURSION");return}d.push(b)}var e=typeof b;if(b===null)a.push("null");else if(e==="function")return;else if(e==="boolean")a.push(""+b);else if(e==="number")isNaN(b)?a.push("null"):a.push(""+b);else if(e==="string")return a.push(m.String.quoteUnicode(b));else if(e==="object")if(b instanceof
Array){a.push("[");var f=b.length;e=false;for(var g=0;g>2;c=(c&3)<<4|d>>4;g=(d&15)<<2|e>>6;h=e&63;if(isNaN(d))g=h=64;else if(isNaN(e))h=64;b=b+this.B.charAt(f)+this.B.charAt(c)+this.B.charAt(g)+this.B.charAt(h)}return b},Hc:function(a){var b="",c,d,e,f,g,h=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");h>4;d=(d&15)<<4|f>>2;e=(f&3)<<6|g;b+=String.fromCharCode(c);if(f!=64)b+=String.fromCharCode(d);if(g!=64)b+=String.fromCharCode(e)}return b=fa.ib(b)},jb:function(a){a=a.replace(/\r\n/g,"\n");for(var b="",c=0;c127&&d<2048)b+=String.fromCharCode(d>>6|192);else{b+=String.fromCharCode(d>>12|224);b+=String.fromCharCode(d>>6&63|128)}b+=String.fromCharCode(d&63|128)}}return b},ib:function(a){for(var b="",c=0,d=c1=c2=
+Cb:function(a){var b="",c,d,e,f,g,h,i=0;for(a=fa.kb(a);i>2;c=(c&3)<<4|d>>4;g=(d&15)<<2|e>>6;h=e&63;if(isNaN(d))g=h=64;else if(isNaN(e))h=64;b=b+this.B.charAt(f)+this.B.charAt(c)+this.B.charAt(g)+this.B.charAt(h)}return b},Hc:function(a){var b="",c,d,e,f,g,h=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");h>4;d=(d&15)<<4|f>>2;e=(f&3)<<6|g;b+=String.fromCharCode(c);if(f!=64)b+=String.fromCharCode(d);if(g!=64)b+=String.fromCharCode(e)}return b=fa.jb(b)},kb:function(a){a=a.replace(/\r\n/g,"\n");for(var b="",c=0;c127&&d<2048)b+=String.fromCharCode(d>>6|192);else{b+=String.fromCharCode(d>>12|224);b+=String.fromCharCode(d>>6&63|128)}b+=String.fromCharCode(d&63|128)}}return b},jb:function(a){for(var b="",c=0,d=c1=c2=
0;c191&&d<224){c2=a.charCodeAt(c+1);b+=String.fromCharCode((d&31)<<6|c2&63);c+=2}else{c2=a.charCodeAt(c+1);c3=a.charCodeAt(c+2);b+=String.fromCharCode((d&15)<<12|(c2&63)<<6|c3&63);c+=3}}return b}};if(typeof x.getAttribute=="undefined")x.getAttribute=F();if(typeof Node=="undefined")Node={ELEMENT_NODE:1,ATTRIBUTE_NODE:2,TEXT_NODE:3,CDATA_SECTION_NODE:4,ENTITY_REFERENCE_NODE:5,ENTITY_NODE:6,PROCESSING_INSTRUCTION_NODE:7,
-COMMENT_NODE:8,DOCUMENT_NODE:9,DOCUMENT_TYPE_NODE:10,DOCUMENT_FRAGMENT_NODE:11,NOTATION_NODE:12};p.console||(p.console={log:n,error:n});var Q,V,k=p.jQuery||p.$,o=_.each,B=_.extend,Ha=_.identity,m=p.angular||(p.angular={}),ga=m.validator||(m.validator={}),s=m.filter||(m.filter={}),ha=m.formatter||(m.formatter={}),O=m.callbacks||(m.callbacks={});m.alert||(m.alert=function(){L(arguments);p.alert.apply(p,arguments)});var Ia=Ia||function(a){return k(a).is(":visible")};ma.prototype={Pb:function(a){this.Ja=
-a},watch:function(){var a=this;function b(){if(a.N!==a.location.href){var c=a.location.hash.match(/^#\$iframe_notify=(.*)$/);if(c){a.N.match(/#/)||(a.N+="#");a.location.href=a.N;c="_iframe_notify_"+c[1];var d=O[c];delete O[c];try{(d||n)()}catch(e){alert(e)}}else{a.Ja(a.location.href);a.N=a.location.href}}a.setTimeout(b,a.delay)}b()},i:function(a){var b=this.location.href;b.match(/#/)||(b+="#");if(b!=a)this.location.href=a;this.Kc=a},get:function(){return p.location.href}};m.startUrlWatcher=function(){var a=
+COMMENT_NODE:8,DOCUMENT_NODE:9,DOCUMENT_TYPE_NODE:10,DOCUMENT_FRAGMENT_NODE:11,NOTATION_NODE:12};p.console||(p.console={log:n,error:n});var Q,V,k=p.jQuery||p.$,o=_.each,B=_.extend,Ha=_.identity,m=p.angular||(p.angular={}),ga=m.validator||(m.validator={}),s=m.filter||(m.filter={}),ha=m.formatter||(m.formatter={}),O=m.callbacks||(m.callbacks={});m.alert||(m.alert=function(){L(arguments);p.alert.apply(p,arguments)});var Ia=Ia||function(a){return k(a).is(":visible")};ma.prototype={Pb:function(a){this.Ka=
+a},watch:function(){var a=this;function b(){if(a.N!==a.location.href){var c=a.location.hash.match(/^#\$iframe_notify=(.*)$/);if(c){a.N.match(/#/)||(a.N+="#");a.location.href=a.N;c="_iframe_notify_"+c[1];var d=O[c];delete O[c];try{(d||n)()}catch(e){alert(e)}}else{a.Ka(a.location.href);a.N=a.location.href}}a.setTimeout(b,a.delay)}b()},i:function(a){var b=this.location.href;b.match(/#/)||(b+="#");if(b!=a)this.location.href=a;this.Kc=a},get:function(){return p.location.href}};m.startUrlWatcher=function(){var a=
new ma(p.location);a.watch();return ba(a,{listen:a.Pb,set:a.i,get:a.get})};m.compile=function(a,b){k=p.jQuery;V=k.browser.msie;b=_({onUpdateView:n,server:"",location:{get:n,set:n,listen:n}}).extend(b||{});Oa(b);Na();return Pa(k(a),b)};var I={typeOf:function(a){if(a===null)return"null";var b=typeof a;if(b=="object"){if(a instanceof Array)return"array";if(a instanceof Date)return"date";if(a.nodeType==1)return"element"}return b}},Z={},Ja={includeIf:function(a,b,c){var d=_.indexOf(a,b);if(c)d==-1&&a.push(b);
-else a.splice(d,1);return a},sum:function(a,b){b=m.Function.compile(b);for(var c=0,d=0;d=0&&a.splice(c,1);return b},find:function(a,b,c){if(b){var d=m.Function.compile(b);_.detect(a,function(e){if(d(e)){c=e;return true}});return c}},findById:function(a,b){return m.zc.find(a,function(c){return c.ab==b},null)},filter:function(a,b){var c=[];c.sb=function(j){for(var l=0;l-1;case "object":for(var q in j)if(q.charAt(0)!=="$"&&e(j[q],l))return true;return false;case "array":for(q=0;q=0&&a.splice(c,1);return b},find:function(a,b,c){if(b){var d=m.Function.compile(b);_.detect(a,function(e){if(d(e)){c=e;return true}});return c}},findById:function(a,b){return m.zc.find(a,function(c){return c.bb==b},null)},filter:function(a,b){var c=[];c.tb=function(j){for(var l=0;l-1;case "object":for(var q in j)if(q.charAt(0)!=="$"&&e(j[q],l))return true;return false;case "array":for(q=0;q=0&&a.splice(d,1);a.unshift((c?"-":"+")+b);return a},orderByDirection:function(a,b,c,d){c=c||"ng-ascend";d=d||"ng-descend";a=a[0]||"";var e=true;if(a.charAt(0)=="-"){a=a.substring(1);e=false}else if(a.charAt(0)=="+")a=a.substring(1);return a==b?e?c:d:""},merge:function(a,
b,c){var d=a[b];if(!d){d={};a[b]=d}X(c,d);return a}},Qa={quote:function(a){return'"'+a.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n").replace(/\f/g,"\\f").replace(/\r/g,"\\r").replace(/\t/g,"\\t").replace(/\v/g,"\\v")+'"'},quoteUnicode:function(a){a=m.String.quote(a);for(var b=[],c=0;c-1;){c1||w.M(a[0])!==null};w.M=function(a){return(a=a.replace(/\n/gm," ").match(/^\{\{(.*)\}\}$/))?a[1]:null};w.prototype={hc:function(a){var b={};a.replace(/(?:^|&)([^&=]*)=?([^&]*)/g,
-function(c,d,e){if(d)b[decodeURIComponent(d)]=decodeURIComponent(e)});return b},Ra:function(){var a=this,b=this.location.get()||"",c=b.indexOf("#");if(!(c<0)){b=this.hc(b.substring(c+1));o(a.anchor,function(d,e){delete a.anchor[e]});o(b,function(d,e){a.anchor[e]=d})}},gc:function(){this.Ra();this.d()},qc:function(){var a=this.location.get()||"",b=a.indexOf("#");if(b>-1)a=a.substring(0,b);a+="#";b="";for(var c in this.anchor){var d=this.anchor[c];if(typeof d==="undefined"||d===null)delete this.anchor[c];
-else{a+=b+encodeURIComponent(c);if(d!==true)a+="="+encodeURIComponent(d);b="&"}}this.location.set(a);return a},d:function(){(new Date).getTime();var a=k(this.F).scope();a.tb();a.d();(new Date).getTime();this.qc();o(this.sa,function(b){b()})},U:function(a){var b=k(this.F),c=b.find(a);if(b.is(a))c=c.andSelf();return c},Eb:function(){this.U("[ng-init]").each(function(){var a=k(this),b=a.scope();try{b.eval(a.attr("ng-init"))}catch(c){alert("EVAL ERROR:\n"+a.attr("ng-init")+"\n"+v(c,true))}})},G:function(a){var b=
-this;this.U("[ng-entity]").attr("ng-watch",function(){try{var c=k(this);return a.G(c.attr("ng-entity"),b.l)+(c.attr("ng-watch")||"")}catch(d){L(d);alert(d)}})},compile:function(){var a=k(this.F);if(this.ub.autoSubmit){var b=this.U(":submit").not("[ng-action]");b.attr("ng-action","$save()");b.not(":disabled").not("ng-bind-attr").attr("ng-bind-attr",'{disabled:"{{$invalidWidgets}}"}')}this.Sa(this.F)(this.F,a.scope(),"");this.U("a[ng-action]").live("click",function(){var c=k(this),d=c.scope();try{d.eval(c.attr("ng-action"));
-c.removeAttr("ng-error");c.removeClass("ng-exception")}catch(e){c.addClass("ng-exception");c.attr("ng-error",v(e,true))}d.get("$updateView")();return false})},pc:function(a,b,c){b=b.concat();var d=b.pop(),e=w.ba(a.nodeValue);if(e.length>1||w.M(e[0])){var f=a.parentNode;if(ja(f)){f.setAttribute("ng-bind-template",a.nodeValue);c.push({path:b,b:function(l){return new N(l,l.getAttribute("ng-bind-template"))}})}else for(var g=0;g2&&a.setAttribute("ng-bind-attr",d)}a.getAttribute||L(a);var j=a.getAttribute("ng-repeat");if(j){a.removeAttribute("ng-repeat");var l=this.Sa(a);d=x.createComment("ng-repeat: "+
-j);e=a.parentNode;e.insertBefore(d,a);e.removeChild(a);function q(r,A,y){var J=k(a).clone();J.css("display","");J.attr("ng-repeat-index",""+y);J.data("scope",r);l(J[0],r,A+y+":");return J}c.push({path:b,b:function(r,A,y){return new Ga(k(r),j,q,y)}})}else{a.getAttribute("ng-eval")&&c.push({path:b,b:this.Zb});a.getAttribute("ng-bind")&&c.push({path:b,b:this.Qa});a.getAttribute("ng-bind-attr")&&c.push({path:b,b:this.Vb});a.getAttribute("ng-hide")&&c.push({path:b,b:this.$b});a.getAttribute("ng-show")&&
-c.push({path:b,b:this.ac});a.getAttribute("ng-class")&&c.push({path:b,b:this.Wb});a.getAttribute("ng-class-odd")&&c.push({path:b,b:this.Yb});a.getAttribute("ng-class-even")&&c.push({path:b,b:this.Xb});a.getAttribute("ng-style")&&c.push({path:b,b:this.bc});a.getAttribute("ng-watch")&&c.push({path:b,b:this.cc});d=a.nodeName;if(d=="INPUT"||d=="TEXTAREA"||d=="SELECT"||d=="BUTTON"){var P=this;c.push({path:b,b:function(r,A,y){r.name=y+r.name.split(":").pop();return P.xc.vb(k(r),A)}})}if(d=="OPTION")if(!k("").append(k(a).clone()).html().match(/.*<\/\s*option\s*>/gi))a.value=
-a.text;d=a.childNodes;for(e=0;e');this.gb.append(e);e.dialog({height:363,
-width:500,resizable:false,modal:true,title:'Authentication: <angular/>'});O["_iframe_notify_"+c]=function(){e.dialog("destroy");e.remove();o(b.H,function(f){f()});b.H=[]}},dc:function(){if(!this.Fa){this.Fa=k(S.db);this.Fa.Ic({Cc:true,height:70,Mc:true})}}};Y.eb=B(F(),{all:function(){return[]},query:function(){return[]},load:function(){return{}},title:undefined});Y.prototype={T:function(a){if(!a.l===this)throw"Parameter must be an instance of Entity! "+
-v(a);var b=a.$entity+"/"+a.$id,c=this.ha[b];if(c)H.ja(a,c);else c=this.ha[b]=a;return c},load:function(a,b,c,d){if(b&&b!=="*"){var e=this;this.D(["GET",a.$entity+"/"+b],function(f){a.$loadFrom(f);a.$migrate();f=a.$$entity(a);e.T(f);(c||n)(a)},d)}return a},ma:function(a,b,c){var d=this,e=[],f=0;o(b,function(g){e.push(d.load(a(),g,function(){f++;if(f==b.length)(c||n)(e)}))});return e},Ma:function(a,b,c){return this.load(a,b,c,function(d){if(d.$status_code==404){a.$id=b;(c||n)(a)}else throw d;})},La:function(a,
+[I,Z,Ra],["bind","bindAll","delay","defer","wrap","compose"]);u.ba=function(a){for(var b=[],c=0,d;(d=a.indexOf("{{",c))>-1;){c1||u.M(a[0])!==null};u.M=function(a){return(a=a.replace(/\n/gm," ").match(/^\{\{(.*)\}\}$/))?a[1]:null};u.prototype={hc:function(a){var b={};a.replace(/(?:^|&)([^&=]*)=?([^&]*)/g,
+function(c,d,e){if(d)b[decodeURIComponent(d)]=decodeURIComponent(e)});return b},Sa:function(){var a=this,b=this.location.get()||"",c=b.indexOf("#");if(!(c<0)){b=this.hc(b.substring(c+1));o(a.anchor,function(d,e){delete a.anchor[e]});o(b,function(d,e){a.anchor[e]=d})}},gc:function(){this.Sa();this.d()},qc:function(){var a=this.location.get()||"",b=a.indexOf("#");if(b>-1)a=a.substring(0,b);a+="#";b="";for(var c in this.anchor){var d=this.anchor[c];if(typeof d==="undefined"||d===null)delete this.anchor[c];
+else{a+=b+encodeURIComponent(c);if(d!==true)a+="="+encodeURIComponent(d);b="&"}}this.location.set(a);return a},d:function(){(new Date).getTime();var a=k(this.F).scope();a.ub();a.d();(new Date).getTime();this.qc();o(this.sa,function(b){b()})},U:function(a){var b=k(this.F),c=b.find(a);if(b.is(a))c=c.andSelf();return c},Fb:function(){this.U("[ng-init]").each(function(){var a=k(this),b=a.scope();try{b.eval(a.attr("ng-init"))}catch(c){alert("EVAL ERROR:\n"+a.attr("ng-init")+"\n"+w(c,true))}})},G:function(a){var b=
+this;this.U("[ng-entity]").attr("ng-watch",function(){try{var c=k(this);return a.G(c.attr("ng-entity"),b.l)+(c.attr("ng-watch")||"")}catch(d){L(d);alert(d)}})},compile:function(){var a=k(this.F);if(this.vb.autoSubmit){var b=this.U(":submit").not("[ng-action]");b.attr("ng-action","$save()");b.not(":disabled").not("ng-bind-attr").attr("ng-bind-attr",'{disabled:"{{$invalidWidgets}}"}')}this.Ta(this.F)(this.F,a.scope(),"");this.U("a[ng-action]").live("click",function(){var c=k(this),d=c.scope();try{d.eval(c.attr("ng-action"));
+c.removeAttr("ng-error");c.removeClass("ng-exception")}catch(e){c.addClass("ng-exception");c.attr("ng-error",w(e,true))}d.get("$updateView")();return false})},pc:function(a,b,c){b=b.concat();var d=b.pop(),e=u.ba(a.nodeValue);if(e.length>1||u.M(e[0])){var f=a.parentNode;if(ja(f)){f.setAttribute("ng-bind-template",a.nodeValue);c.push({path:b,b:function(l){return new N(l,l.getAttribute("ng-bind-template"))}})}else for(var g=0;g2&&a.setAttribute("ng-bind-attr",d)}a.getAttribute||L(a);var j=a.getAttribute("ng-repeat");if(j){a.removeAttribute("ng-repeat");var l=this.Ta(a);d=x.createComment("ng-repeat: "+
+j);e=a.parentNode;e.insertBefore(d,a);e.removeChild(a);function q(r,A,y){var J=k(a).clone();J.css("display","");J.attr("ng-repeat-index",""+y);J.data("scope",r);l(J[0],r,A+y+":");return J}c.push({path:b,b:function(r,A,y){return new Ga(k(r),j,q,y)}})}else{a.getAttribute("ng-eval")&&c.push({path:b,b:this.Zb});a.getAttribute("ng-bind")&&c.push({path:b,b:this.Ra});a.getAttribute("ng-bind-attr")&&c.push({path:b,b:this.Vb});a.getAttribute("ng-hide")&&c.push({path:b,b:this.$b});a.getAttribute("ng-show")&&
+c.push({path:b,b:this.ac});a.getAttribute("ng-class")&&c.push({path:b,b:this.Wb});a.getAttribute("ng-class-odd")&&c.push({path:b,b:this.Yb});a.getAttribute("ng-class-even")&&c.push({path:b,b:this.Xb});a.getAttribute("ng-style")&&c.push({path:b,b:this.bc});a.getAttribute("ng-watch")&&c.push({path:b,b:this.cc});d=a.nodeName;if(d=="INPUT"||d=="TEXTAREA"||d=="SELECT"||d=="BUTTON"){var P=this;c.push({path:b,b:function(r,A,y){r.name=y+r.name.split(":").pop();return P.xc.wb(k(r),A)}})}if(d=="OPTION")if(!k("").append(k(a).clone()).html().match(/.*<\/\s*option\s*>/gi))if(u.Ga(a.text))k(a).attr("ng-bind-attr",
+m.Oc({value:a.text}));else a.value=a.text;d=a.childNodes;for(e=0;e');this.hb.append(e);
+e.dialog({height:363,width:500,resizable:false,modal:true,title:'Authentication: <angular/>'});O["_iframe_notify_"+c]=function(){e.dialog("destroy");e.remove();o(b.H,function(f){f()});b.H=[]}},dc:function(){if(!this.Fa){this.Fa=k(S.eb);this.Fa.Ic({Cc:true,height:70,Mc:true})}}};Y.fb=B(F(),{all:function(){return[]},query:function(){return[]},load:function(){return{}},title:undefined});Y.prototype={T:function(a){if(!a.l===this)throw"Parameter must be an instance of Entity! "+
+w(a);var b=a.$entity+"/"+a.$id,c=this.ha[b];if(c)H.ja(a,c);else c=this.ha[b]=a;return c},load:function(a,b,c,d){if(b&&b!=="*"){var e=this;this.D(["GET",a.$entity+"/"+b],function(f){a.$loadFrom(f);a.$migrate();f=a.$$entity(a);e.T(f);(c||n)(a)},d)}return a},ma:function(a,b,c){var d=this,e=[],f=0;o(b,function(g){e.push(d.load(a(),g,function(){f++;if(f==b.length)(c||n)(e)}))});return e},Na:function(a,b,c){return this.load(a,b,c,function(d){if(d.$status_code==404){a.$id=b;(c||n)(a)}else throw d;})},Ma:function(a,
b){var c=this,d=[];d.$$accept=function(e){return e.$entity==a.title};this.K.push(d);this.D(["GET",a.title],function(e){for(var f=0;ff.title?1:-1});(a||n)(b)});return b},Ab:function(){var a={};this.post([["GET","$users"]],function(b,c){B(a,c[0])});return a},sc:function(a){var b={};this.post([["GET","$users/"+a]],function(c,d){B(b,d[0])});return b},G:function(a,b){if(!a)return Y.eb;var c=this,d=B(function(e){return new H(d,e)},{title:a,$$factory:true,l:this,defaults:b||{},load:function(e,f){return c.load(d(),e,f)},loadMany:function(e,f){return c.ma(d,e,f)},loadOrCreate:function(e,
-f){return c.Ma(d(),e,f)},all:function(e){return c.La(d,e)},query:function(e,f,g){return c.Ua(d,e,f,g)},properties:function(e){c.D(["GET",a+"/$properties"],e)}});return d},join:function(a){function b(){throw"Joined entities can not be instantiated into a document.";}var c=_(a).Dc().map(function(d,e){return e}).sortBy(function(d){var e=[];do{if(_(e).include(d))throw"Infinite loop in join: "+e.join(" -> ");e.push(d);if(!a[d])throw _("Named entity '<%=name%>' is undefined.").template({name:d});d=a[d].aa?
+"",d],function(e){delete c.ha[a.$entity+"/"+a.$id];_.each(c.K,function(f){for(var g=0;gf.title?1:-1});(a||n)(b)});return b},Bb:function(){var a={};this.post([["GET","$users"]],function(b,c){B(a,c[0])});return a},sc:function(a){var b={};this.post([["GET","$users/"+a]],function(c,d){B(b,d[0])});return b},G:function(a,b){if(!a)return Y.fb;var c=this,d=B(function(e){return new H(d,e)},{title:a,$$factory:true,l:this,defaults:b||{},load:function(e,f){return c.load(d(),e,f)},loadMany:function(e,f){return c.ma(d,e,f)},loadOrCreate:function(e,
+f){return c.Na(d(),e,f)},all:function(e){return c.Ma(d,e)},query:function(e,f,g){return c.Va(d,e,f,g)},properties:function(e){c.D(["GET",a+"/$properties"],e)}});return d},join:function(a){function b(){throw"Joined entities can not be instantiated into a document.";}var c=_(a).Dc().map(function(d,e){return e}).sortBy(function(d){var e=[];do{if(_(e).include(d))throw"Infinite loop in join: "+e.join(" -> ");e.push(d);if(!a[d])throw _("Named entity '<%=name%>' is undefined.").template({name:d});d=a[d].aa?
a[d].aa.substring(0,a[d].aa.indexOf(".")):undefined}while(d);return e.length}).value();if(_(c).select(function(d){return a[d].aa}).length!=c.length-1)throw"Exactly one entity needs to be primary.";b.query=function(d,e){var f=[],g=d?d.substring(0,d.indexOf(".")):undefined;if(g!=c[0])throw _("Named entity '<%=name%>' is not a primary entity.").template({name:g});var h=1;a[g].join.query(d.substring(d.indexOf(".")+1),e,function(i){var j=c[h++],l=a[j],q=l.aa,P={};_(i).each(function(r){var A={};f.push(A);
-A[g]=r;r=u.O(A,q);P[r]=r});l.join.ma(_.toArray(P),function(r){var A={};_(r).each(function(y){A[y.ab]=y});_(f).each(function(y){var J=u.O(y,q);y[j]=A[J]})})});return f};return b}};s.g=function(a){if(a)for(var b in a)this[b]=a[b]};s.g.get=function(a,b){b=b||"text";switch(typeof a){case "string":return b=="text"?a:undefined;case "object":if(a&&typeof a[b]!=="undefined")return a[b];return;default:return a}};var t;o({currency:function(a){k(this.R).toggleClass("ng-format-negative",a<0);return"$"+s.number.apply(this,
-[a,2])},number:function(a,b){if(isNaN(a)||!isFinite(a))return"";b=typeof b=="undefined"?2:b;var c=a<0;a=Math.abs(a);var d=Math.pow(10,b);a=""+Math.round(a*d);var e=a.substring(0,a.length-b);e=e||"0";d=a.substring(a.length-b);a=c?"-":"";for(c=0;c0){for(c=d.length;c0){for(c=d.length;c'+g+"",Oc:b});_.breakLoop()}});e&&_.breakLoop()});return e?e:b?c||new s.g({text:b+" is not recognized"}):null}}(),link:function(a,b){b=b||s.g.get(a);var c=s.g.get(a,"url")||s.g.get(a);if(c){if(m.Q.Jc(c)===null)c="mailto:"+c;a=''+b+"";return new s.g({text:b,url:c,html:a})}return a},bytes:function(){var a=
+"").replace(/ *$/,"");var d=b.replace(/ /g,""),e;o(a,function(f){o(f.qa,function(g){if(g.test(d)){g=f.name+": "+b;var h=f.url+b;e=new s.g({text:g,url:h,html:''+g+"",Pc:b});_.breakLoop()}});e&&_.breakLoop()});return e?e:b?c||new s.g({text:b+" is not recognized"}):null}}(),link:function(a,b){b=b||s.g.get(a);var c=s.g.get(a,"url")||s.g.get(a);if(c){if(m.Q.Jc(c)===null)c="mailto:"+c;a=''+b+"";return new s.g({text:b,url:c,html:a})}return a},bytes:function(){var a=
["bytes","KB","MB","GB","TB","PB"];return function(b){if(b===null)return"";for(var c=0;b>1E3;){b/=1024;c++}b=""+b;var d=b.indexOf(".");if(d>-1&&d+2"})}return null},lowercase:function(a){return(a=s.g.get(a))?(""+a).toLowerCase():a},uppercase:function(a){return(a=s.g.get(a))?
(""+a).toUpperCase():a},linecount:function(a){a=s.g.get(a);if(a===""||!a)return 1;return a.split(/\n|\f/).length},"if":function(a,b){return b?a:undefined},unless:function(a,b){return b?undefined:a},googleChartApi:B(function(a,b,c,d){b=b||{};a={cht:a,chco:t.collect(b,"color"),chtt:t.title(b),chdl:t.collect(b,"label"),chd:t.values(b),chf:"bg,s,FFFFFF00"};if(_.isArray(b.xLabels)){a.chxt="x";a.chxl="0:|"+b.Qc.join("|")}return t.encode(a,c,d)},{values:function(a){var b=[];o(a.series||[],function(c){var d=
[];o(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||[];o(_.isArray(a)?a:[a],function(c){b.push(encodeURIComponent(c))});return b.join("|")},collect:function(a,b){var c=[],d=0;o(a.series||[],function(e){var f=[];e=e[b]||[];o(_.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;o(a,function(f,g){f&&e.push(g+"="+f)});e.sort();d+=e.join("&");return new s.g({url:d,html:'
'})}}),qrcode:function(a,b,c){return t.encode({cht:"qr",chl:encodeURIComponent(a)},b,c)},chart:{pie:function(a,b,c){return t("p",a,b,c)},pie3d:function(a,b,c){return t("p3",a,b,c)},pieConcentric:function(a,b,c){return t("pc",a,b,c)},barHorizontalStacked:function(a,b,c){return t("bhs",a,b,c)},barHorizontalGrouped:function(a,b,c){return t("bhg",
a,b,c)},barVerticalStacked:function(a,b,c){return t("bvs",a,b,c)},barVerticalGrouped:function(a,b,c){return t("bvg",a,b,c)},line:function(a,b,c){return t("lc",a,b,c)},sparkline:function(a,b,c){return t("ls",a,b,c)},scatter:function(a,b,c){return t("s",a,b,c)}},html:function(a){return new s.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(C(d.substr(0,f)));
-e.push('');e.push(c);e.push("");d=d.substring(f+c.length)}e.push(C(d));return new s.g({text:a,html:e.join("")})}},function(a,b){s[b]=a});t=s.googleChartApi;B(ha,{noop:T(Ha,Ha),"boolean":T(sa,W),number:T(sa,function(a){return 1*a}),list:T(function(a){return a?a.join(", "):a},function(a){return a?_(_(a.split(",")).map(k.trim)).select(_.identity):[]}),trim:T(function(a){return a?$.trim(""+a):""})});array=[].constructor;m.toJson=v;m.fromJson=M;H.ja=function(a,b){if(!(a===b||!a||!b)){var c=
+e.push('');e.push(c);e.push("");d=d.substring(f+c.length)}e.push(C(d));return new s.g({text:a,html:e.join("")})}},function(a,b){s[b]=a});t=s.googleChartApi;B(ha,{noop:T(Ha,Ha),"boolean":T(sa,W),number:T(sa,function(a){return 1*a}),list:T(function(a){return a?a.join(", "):a},function(a){return a?_(_(a.split(",")).map(k.trim)).select(_.identity):[]}),trim:T(function(a){return a?$.trim(""+a):""})});array=[].constructor;m.toJson=w;m.fromJson=M;H.ja=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(){X(this.$$entity.defaults,this);return this},$merge:function(a){X(a,this);return this},$save:function(a){this.$$entity.l.save(this,a===true?undefined:a);a===true&&this.$$entity.l.W();return this},$delete:function(a){this.$$entity.l.remove(this,a===true?undefined:a);a===true&&this.$$entity.l.W();
return this},$loadById:function(a,b){this.$$entity.l.load(this,a,b);return this},$loadFrom:function(a){H.ja(a,this);return this},$saveTo:function(a){H.ja(this,a);return this}});E.ua={"null":K(null),"true":K(true),"false":K(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.i(b,c)},"==":function(a,b,
-c){return b==c},"!=":function(a,b,c){return b!=c},"<":function(a,b,c){return b":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}};E.cb={n:"\n",f:"\u000c",r:"\r",t:"\t",v:"\u000b","'":"'",'"':'"'};E.prototype={I:function(){return this.index+1":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}};E.db={n:"\n",f:"\u000c",r:"\r",t:"\t",v:"\u000b","'":"'",'"':'"'};E.prototype={I:function(){return this.index+10){e=e[0];var f=e.text;if(f==a||f==b||f==c||f==d||!a&&!b&&!c&&!d)return e}return false},a:function(a,b,c,d){if(a=this.I(a,b,c,d)){this.h.shift();return this.Ec=a}return false},k:function(a){if(!this.a(a)){var b=this.I();throw"Expecting '"+a+"' at column '"+(b.index+1)+"' in '"+this.text+"' got '"+this.text.substring(b.index)+"'.";}},hb:function(a,b){return function(c){return a(c,b(c))}},z:function(a,b,c){return function(d){return b(d,
-a(d),c(d))}},Ga:function(){return this.h.length>0},L:function(){if(this.h.length!==0)throw"Did not understand '"+this.text.substring(this.h[0].index)+"' while evaluating '"+this.text+"'.";},ra:function(){for(var a=[];;){this.h.length>0&&!this.I("}",")",";","]")&&a.push(this.Ea());if(!this.a(";"))return function(b){for(var c,d=0;d","<=",
-">="))a=this.z(a,b.b,this.Wa());return a},ob:function(){for(var a=this.Pa(),b;b=this.a("+","-");)a=this.z(a,b.b,this.Pa());return a},Pa:function(){for(var a=this.ga(),b;b=this.a("*","/","%");)a=this.z(a,b.b,this.ga());return a},ga:function(){var a;return this.a("+")?this.da():(a=this.a("-"))?this.z(D.fb,a.b,this.ga()):(a=this.a("!"))?this.hb(a.b,this.ga()):this.da()},Ib:function(a){var b=this.a(),c=b.text.split(".");a=a;for(var d,e=0;e1;d++){var e=a.shift(),f=c[e];if(!f){f={};c[e]=f}c=f}return c[a.shift()]=b},q:function(a,b){this.eval(a+"="+v(b))},eval:function(a,b){var c=
-u.V[a];if(!c){var d=new D(a);c=d.ra();d.L();u.V[a]=c}b=b||{};b.scope=this;b.self=this.j;return c(b)},o:function(a,b,c,d,e){try{var f=this.eval(b,c);if(a.C){a.C=false;k(a.view).removeClass("ng-exception").removeAttr("ng-error")}d&&d.apply(a,[f]);return true}catch(g){aa("Eval Widget Error:",g);b=v(g,true);a.C=true;k(a.view).addClass("ng-exception").attr("ng-error",b);e&&e.apply(a,[g,b]);return false}},uc:function(a,b,c){var d=u.V[a];if(!d){d=(new D(a)).Q();u.V[a]=d}a={scope:this,self:this.j,$element:c};
-return d(a)(a,b)},G:function(a,b){return(new D(a)).Db()({scope:this,l:b})},tb:function(){for(var a=this.j.$invalidWidgets;a.length>0;)a.pop()},Sb:function(a){this.j.$invalidWidgets.push(a)},watch:function(a){var b=this;(new D(a)).watch()({scope:this,lb:function(c,d){b.mb(c,function(e,f){try{return d({scope:b},e,f)}catch(g){alert(g)}})}})},mb:function(a,b){var c=this.ta[a];if(!c){c={Ka:[],s:a};this.ta[a]=c}c.Ka.push(b)},Gb:function(){var a=this,b=false;o(this.ta,function(c){var d=a.eval(c.s);if(d!==
-c.c){o(c.Ka,function(e){e(d,c.c);b=true});c.c=d}});return b}};oa.prototype={rb:function(a){return fa.Bb(a)},P:function(a,b,c,d){var e=this.tc+this.Tb++;a=this.rb(v({u:b,m:a,p:c}));b=Math.ceil(a.length/this.oa);c=this.url+"/$/"+e+"/"+b+"/";O[e]=function(h){delete O[e];d(200,h)};for(var f=0;f0){e=e[0];var f=e.text;if(f==a||f==b||f==c||f==d||!a&&!b&&!c&&!d)return e}return false},a:function(a,b,c,d){if(a=this.I(a,b,c,d)){this.h.shift();return this.Ec=a}return false},k:function(a){if(!this.a(a)){var b=this.I();throw"Expecting '"+a+"' at column '"+(b.index+1)+"' in '"+this.text+"' got '"+this.text.substring(b.index)+"'.";}},ib:function(a,b){return function(c){return a(c,b(c))}},z:function(a,b,c){return function(d){return b(d,
+a(d),c(d))}},Ha:function(){return this.h.length>0},L:function(){if(this.h.length!==0)throw"Did not understand '"+this.text.substring(this.h[0].index)+"' while evaluating '"+this.text+"'.";},ra:function(){for(var a=[];;){this.h.length>0&&!this.I("}",")",";","]")&&a.push(this.Ea());if(!this.a(";"))return function(b){for(var c,d=0;d","<=",
+">="))a=this.z(a,b.b,this.Xa());return a},pb:function(){for(var a=this.Qa(),b;b=this.a("+","-");)a=this.z(a,b.b,this.Qa());return a},Qa:function(){for(var a=this.ga(),b;b=this.a("*","/","%");)a=this.z(a,b.b,this.ga());return a},ga:function(){var a;return this.a("+")?this.da():(a=this.a("-"))?this.z(D.gb,a.b,this.ga()):(a=this.a("!"))?this.ib(a.b,this.ga()):this.da()},Jb:function(a){var b=this.a(),c=b.text.split(".");a=a;for(var d,e=0;e1;d++){var e=a.shift(),f=c[e];if(!f){f={};c[e]=f}c=f}return c[a.shift()]=b},q:function(a,b){this.eval(a+"="+w(b))},eval:function(a,b){var c=
+v.V[a];if(!c){var d=new D(a);c=d.ra();d.L();v.V[a]=c}b=b||{};b.scope=this;b.self=this.j;return c(b)},o:function(a,b,c,d,e){try{var f=this.eval(b,c);if(a.C){a.C=false;k(a.view).removeClass("ng-exception").removeAttr("ng-error")}d&&d.apply(a,[f]);return true}catch(g){aa("Eval Widget Error:",g);b=w(g,true);a.C=true;k(a.view).addClass("ng-exception").attr("ng-error",b);e&&e.apply(a,[g,b]);return false}},uc:function(a,b,c){var d=v.V[a];if(!d){d=(new D(a)).Q();v.V[a]=d}a={scope:this,self:this.j,$element:c};
+return d(a)(a,b)},G:function(a,b){return(new D(a)).Eb()({scope:this,l:b})},ub:function(){for(var a=this.j.$invalidWidgets;a.length>0;)a.pop()},Sb:function(a){this.j.$invalidWidgets.push(a)},watch:function(a){var b=this;(new D(a)).watch()({scope:this,mb:function(c,d){b.nb(c,function(e,f){try{return d({scope:b},e,f)}catch(g){alert(g)}})}})},nb:function(a,b){var c=this.ta[a];if(!c){c={La:[],s:a};this.ta[a]=c}c.La.push(b)},Hb:function(){var a=this,b=false;o(this.ta,function(c){var d=a.eval(c.s);if(d!==
+c.c){o(c.La,function(e){e(d,c.c);b=true});c.c=d}});return b}};oa.prototype={sb:function(a){return fa.Cb(a)},P:function(a,b,c,d){var e=this.tc+this.Tb++;a=this.sb(w({u:b,m:a,p:c}));b=Math.ceil(a.length/this.oa);c=this.url+"/$/"+e+"/"+b+"/";O[e]=function(h){delete O[e];d(200,h)};for(var f=0;fc)return"Value can not be greater than "+c+".";return null}else return"Value is not a number."},integer:function(a,b,c){if(b=ga.number(a,b,c))return b;if(!(""+a).match(/^\s*[\d+]*\s*$/)||a!=Math.round(a))return"Value is not a whole number.";return null},date:function(a){if(a.match(/^\d\d?\/\d\d?\/\d\d\d\d$/))return null;return"Value is not a date. (Expecting format: 12/31/2009)."},
ssn:function(a){if(a.match(/^\d\d\d-\d\d-\d\d\d\d$/))return null;return"SSN needs to be in 999-99-9999 format."},email:function(a){if(a.match(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/))return null;return"Email needs to be in username@host.com format."},phone:function(a){if(a.match(/^1\(\d\d\d\)\d\d\d-\d\d\d\d$/))return null;if(a.match(/^\+\d{2,3} (\(\d{1,5}\))?[\d ]+\d$/))return null;return"Phone number needs to be in 1(987)654-3210 format in North America or +999 (123) 45678 906 internationaly."},
url:function(a){if(a.match(/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/))return null;return"URL needs to be in http://server[:port]/path format."},json:function(a){try{M(a);return null}catch(b){return b.toString()}},asynchronous:function(a,b){var c=this.$element,d=c.$validateState=c.$validateState||{},e=d[a],f=this.$updateView;c.$lastKey=a;if(e===undefined){k(c).addClass("ng-input-indicator-wait");e=d[a]=null;b(a,function(g){e=d[a]=g?g:false;d[c.$lastKey]!==
-null&&k(c).removeClass("ng-input-indicator-wait");f()})}e===null&&this.$invalidWidgets.push(this.R);return e}},function(a,b){ga[b]=a});na.prototype={vb:function(a,b){var c,d=a.attr("type").toLowerCase(),e=a.attr("name");if(e)e=e.split(":").pop();var f="change",g=true,h=ha[a.attr("ng-format")]||ha.noop;if(d=="button"||d=="submit"||d=="reset"||d=="image"){c=new Sa(a[0],e,h);f="click";g=false}else if(d=="text"||d=="textarea"||d=="hidden"||d=="password"){c=new ta(a[0],e,h);f="keyup change"}else if(d==
-"checkbox"){c=new ua(a[0],e,h);f="click"}else if(d=="radio"){c=new xa(a[0],e,h);f="click"}else if(d=="select-one")c=new va(a[0],e,h);else if(d=="select-multiple")c=new wa(a[0],e,h);else if(d=="file")c=this.wb(a,e,h);else throw"Unknown type: "+d;a.data("controller",c);var i=b.get("$updateView");k(c.view,":input").bind(f,function(){if(c.e(b)){var j=k(c.view).attr("ng-action")||"";b.o(c,j)&&i(b)}return g});return c},wb:function(a){var b="__uploadWidget_"+this.Ub++,c=U.template(b);a.after(c);b=this.xb({data:this.fa+
+null&&k(c).removeClass("ng-input-indicator-wait");f()})}e===null&&this.$invalidWidgets.push(this.R);return e}},function(a,b){ga[b]=a});na.prototype={wb:function(a,b){var c,d=a.attr("type").toLowerCase(),e=a.attr("name");if(e)e=e.split(":").pop();var f="change",g=true,h=ha[a.attr("ng-format")]||ha.noop;if(d=="button"||d=="submit"||d=="reset"||d=="image"){c=new Sa(a[0],e,h);f="click";g=false}else if(d=="text"||d=="textarea"||d=="hidden"||d=="password"){c=new ta(a[0],e,h);f="keyup change"}else if(d==
+"checkbox"){c=new ua(a[0],e,h);f="click"}else if(d=="radio"){c=new xa(a[0],e,h);f="click"}else if(d=="select-one")c=new va(a[0],e,h);else if(d=="select-multiple")c=new wa(a[0],e,h);else if(d=="file")c=this.xb(a,e,h);else throw"Unknown type: "+d;a.data("controller",c);var i=b.get("$updateView");k(c.view,":input").bind(f,function(){if(c.e(b)){var j=k(c.view).attr("ng-action")||"";b.o(c,j)&&i(b)}return g});return c},xb:function(a){var b="__uploadWidget_"+this.Ub++,c=U.template(b);a.after(c);b=this.yb({data:this.fa+
"/admin/ServerAPI.swf",width:"95",height:"20",align:"top",wmode:"transparent"},{flashvars:"uploadWidgetId="+b,allowScriptAccess:"always"},b);a.remove();a=new U(c,a[0].name,b,this.fa+"/data/"+this.ka);k(b).parent().data("controller",a);return a}};O.flashEvent=function(a,b,c){a=x.getElementById(a);a=k(a);var d=a.parent().data("controller");U.prototype[b].apply(d,c);_.defer(a.scope().get("$updateView"))};U.template=function(a){return k('')};B(U.prototype,{cancel:n,complete:n,httpStatus:function(a){alert("httpStatus:"+this.J+" status:"+a)},ioError:function(){alert("ioError:"+this.J)},open:function(){alert("open:"+this.J)},progress:n,securityError:function(){alert("securityError:"+this.J)},uploadCompleteData:function(a){a=M(a);a.url=this.ya+"/"+a.id+"/"+a.text;this.view.find("input").attr("checked",true);var b=this.view.scope();this.value=a;this.e(b);this.value=null},select:function(a,b){this.name=a;this.view.find("a").text(a).attr("href",
a);this.view.find("span").text(m.filter.bytes(b));this.upload()},e:function(a){var b=this.view.find("input").attr("checked")?this.value:null;if(this.c===b)return false;else{a.i(this.J,b);return true}},d:function(a){if((a=a.get(this.J))&&this.value!==a){this.value=a;this.view.find("a").attr("href",this.value.url).text(this.value.text);this.view.find("span").text(m.filter.bytes(this.value.size))}this.view.find("input").attr("checked",!!a)},upload:function(){this.name&&this.rc.uploadFile(this.ya)}});
R.prototype={e:K(true),d:n};R.Kb=new R;var Sa=R;ta.prototype={e:function(a){var b=this.A.parse(this.view.value);if(this.c===b)return false;else{a.q(this.exp,b);this.c=b;return true}},d:function(a){var b=this.view,c=a.get(this.exp);if(typeof c==="undefined"){c=this.w;a.q(this.exp,c)}c=c?c:"";if(!_(this.c).isEqual(c)){b.value=this.A.format(c);this.c=c}var d=false;b.removeAttribute("ng-error");if(this.lc)d=!(c&&$.trim(""+c).length>0);var e=d?"Required Value":null;if(!d&&this.Q&&c){e=a.uc(this.Q,c,b);
-d=!!e}if(this.Ia!==e){this.Ia=d;if(e&&Ia(b)){b.setAttribute("ng-error",e);a.Sb(this)}k(b).toggleClass("ng-validation-error",d)}}};ua.prototype={e:function(a){var b=this.view;b=b.checked?b.value:"";b=this.A.parse(b);b=this.A.format(b);if(this.c===b)return false;else{a.q(this.exp,this.A.parse(b));this.c=b;return true}},d:function(a){var b=this.view,c=a.eval(this.exp);if(typeof c==="undefined"){c=this.w;a.q(this.exp,c)}b.checked=this.A.parse(b.value)==c}};va.prototype={e:function(a){if(this.view.selectedIndex<
+d=!!e}if(this.Ja!==e){this.Ja=d;if(e&&Ia(b)){b.setAttribute("ng-error",e);a.Sb(this)}k(b).toggleClass("ng-validation-error",d)}}};ua.prototype={e:function(a){var b=this.view;b=b.checked?b.value:"";b=this.A.parse(b);b=this.A.format(b);if(this.c===b)return false;else{a.q(this.exp,this.A.parse(b));this.c=b;return true}},d:function(a){var b=this.view,c=a.eval(this.exp);if(typeof c==="undefined"){c=this.w;a.q(this.exp,c)}b.checked=this.A.parse(b.value)==c}};va.prototype={e:function(a){if(this.view.selectedIndex<
0)a.q(this.exp,null);else{var b=this.view.value;if(this.c===b)return false;else{a.q(this.exp,b);this.c=b;return true}}},d:function(a){var b=this.view,c=a.get(this.exp);if(typeof c==="undefined"){c=this.w;a.q(this.exp,c)}if(c!==this.c){b.value=c?c:"";this.c=c}}};wa.prototype={selected:function(){for(var a=[],b=this.view.options,c=0;cd;--b)this.children.pop().element.remove();if(h&&h.element[0].nodeName==="OPTION")if(d=k(h.element[0].parentNode).data("controller")){d.c=undefined;d.d(a)}})}};z.va="mouseleave mouseout click dblclick keypress keyup";z.fc=function(){z.pa();var a=k(this);a.bind(z.va,z.pa);var b=a.position(),c=x.documentElement,d=(self.innerWidth||c&&c.clientWidth||
x.body.clientWidth)-b.left;c=a.hasClass("ng-exception")?"EXCEPTION:":"Validation error...";a=a.attr("ng-error");d=d>375?"left":"right";c=k("");k("body").append(c);if(d==="left")a=b.left+this.offsetWidth+11;else{a=b.left-315;c.find(".ng-arrow-right").css({left:301})}c.css({left:a+"px",top:b.top-3+"px"});return true};z.pa=function(){k("#ng-callout").unbind(z.va,
-z.pa).remove();return true};z.prototype={bind:function(){this.F.find(".ng-validation-error,.ng-exception").live("mouseover",z.fc)}};qa.prototype={za:F(),Ca:F()};ea.bb='loading....
';ea.prototype={za:function(){if(this.ea===0)(this.Na=this.Na||this.body.append(ea.bb).find("#ng-loading")).show();this.ea++},Ca:function(){this.ea--;this.ea===0&&this.Na.hide("fold")}}})(window,document);
+z.pa).remove();return true};z.prototype={bind:function(){this.F.find(".ng-validation-error,.ng-exception").live("mouseover",z.fc)}};qa.prototype={za:F(),Ca:F()};ea.cb='loading....
';ea.prototype={za:function(){if(this.ea===0)(this.Oa=this.Oa||this.body.append(ea.cb).find("#ng-loading")).show();this.ea++},Ca:function(){this.ea--;this.ea===0&&this.Oa.hide("fold")}}})(window,document);
diff --git a/angular.js b/angular.js
index be7711dc..fc834f93 100644
--- a/angular.js
+++ b/angular.js
@@ -909,14 +909,14 @@ Binder.prototype = {
});
return params;
},
-
+
parseAnchor: function() {
var self = this, url = this.location['get']() || "";
-
+
var anchorIndex = url.indexOf('#');
if (anchorIndex < 0) return;
var anchor = url.substring(anchorIndex + 1);
-
+
var anchorQuery = this.parseQueryString(anchor);
foreach(self.anchor, function(newValue, key) {
delete self.anchor[key];
@@ -925,12 +925,12 @@ Binder.prototype = {
self.anchor[key] = newValue;
});
},
-
+
onUrlChange: function() {
this.parseAnchor();
this.updateView();
},
-
+
updateAnchor: function() {
var url = this.location['get']() || "";
var anchorIndex = url.indexOf('#');
@@ -952,7 +952,7 @@ Binder.prototype = {
this.location['set'](url);
return url;
},
-
+
updateView: function() {
var start = new Date().getTime();
var scope = jQuery(this.doc).scope();
@@ -962,7 +962,7 @@ Binder.prototype = {
this.updateAnchor();
foreach(this.updateListeners, function(fn) {fn();});
},
-
+
docFindWithSelf: function(exp){
var doc = jQuery(this.doc);
var selection = doc.find(exp);
@@ -971,7 +971,7 @@ Binder.prototype = {
}
return selection;
},
-
+
executeInit: function() {
this.docFindWithSelf("[ng-init]").each(function() {
var jThis = jQuery(this);
@@ -983,7 +983,7 @@ Binder.prototype = {
}
});
},
-
+
entity: function (scope) {
var self = this;
this.docFindWithSelf("[ng-entity]").attr("ng-watch", function() {
@@ -997,7 +997,7 @@ Binder.prototype = {
}
});
},
-
+
compile: function() {
var jNode = jQuery(this.doc);
if (this.config['autoSubmit']) {
@@ -1021,7 +1021,7 @@ Binder.prototype = {
return false;
});
},
-
+
translateBinding: function(node, parentPath, factories) {
var path = parentPath.concat();
var offset = path.pop();
@@ -1057,7 +1057,7 @@ Binder.prototype = {
parent.removeChild(node);
}
},
-
+
precompile: function(root) {
var factories = [];
this.precompileNode(root, [], factories);
@@ -1078,7 +1078,7 @@ Binder.prototype = {
}
};
},
-
+
precompileNode: function(node, path, factories) {
var nodeType = node.nodeType;
if (nodeType == Node.TEXT_NODE) {
@@ -1087,11 +1087,11 @@ Binder.prototype = {
} else if (nodeType != Node.ELEMENT_NODE && nodeType != Node.DOCUMENT_NODE) {
return;
}
-
+
if (!node.getAttribute) return;
var nonBindable = node.getAttribute('ng-non-bindable');
if (nonBindable || nonBindable === "") return;
-
+
var attributes = node.attributes;
if (attributes) {
var bindings = node.getAttribute('ng-bind-attr');
@@ -1113,7 +1113,7 @@ Binder.prototype = {
node.setAttribute("ng-bind-attr", json);
}
}
-
+
if (!node.getAttribute) log(node);
var repeaterExpression = node.getAttribute('ng-repeat');
if (repeaterExpression) {
@@ -1136,7 +1136,7 @@ Binder.prototype = {
}});
return;
}
-
+
if (node.getAttribute('ng-eval')) factories.push({path:path, fn:this.ng_eval});
if (node.getAttribute('ng-bind')) factories.push({path:path, fn:this.ng_bind});
if (node.getAttribute('ng-bind-attr')) factories.push({path:path, fn:this.ng_bind_attr});
@@ -1161,56 +1161,61 @@ Binder.prototype = {
if (nodeName == 'OPTION') {
var html = jQuery('').append(jQuery(node).clone()).html();
if (!html.match(/.*<\/\s*option\s*>/gi)) {
- node.value = node.text;
+ if (Binder.hasBinding(node.text)) {
+ jQuery(node).attr('ng-bind-attr', angular.toJson({'value':node.text}));
+ } else {
+ node.value = node.text;
+ }
}
}
-
+
var children = node.childNodes;
for (var k = 0; k < children.length; k++) {
this.precompileNode(children[k], path.concat(k), factories);
}
},
-
+
ng_eval: function(node) {
return new EvalUpdater(node, node.getAttribute('ng-eval'));
},
-
+
ng_bind: function(node) {
return new BindUpdater(node, "{{" + node.getAttribute('ng-bind') + "}}");
},
-
+
ng_bind_attr: function(node) {
return new BindAttrUpdater(node, fromJson(node.getAttribute('ng-bind-attr')));
},
-
+
ng_hide: function(node) {
return new HideUpdater(node, node.getAttribute('ng-hide'));
},
-
+
ng_show: function(node) {
return new ShowUpdater(node, node.getAttribute('ng-show'));
},
-
+
ng_class: function(node) {
return new ClassUpdater(node, node.getAttribute('ng-class'));
},
-
+
ng_class_even: function(node) {
return new ClassEvenUpdater(node, node.getAttribute('ng-class-even'));
},
-
+
ng_class_odd: function(node) {
return new ClassOddUpdater(node, node.getAttribute('ng-class-odd'));
},
-
+
ng_style: function(node) {
return new StyleUpdater(node, node.getAttribute('ng-style'));
},
-
+
ng_watch: function(node, scope) {
scope.watch(node.getAttribute('ng-watch'));
}
-};function ControlBar(document, serverUrl, database) {
+};
+function ControlBar(document, serverUrl, database) {
this._document = document;
this.serverUrl = serverUrl;
this.database = database;
@@ -3138,10 +3143,10 @@ extend(Users.prototype, {
var self = this;
this.server.request("GET", "/account.json", {}, function(code, response){
self['current'] = response['user'];
- callback(response.user);
+ callback(response['user']);
});
},
-
+
'logout': function(callback) {
var self = this;
this.controlBar.logout(function(){
@@ -3149,7 +3154,7 @@ extend(Users.prototype, {
(callback||noop)();
});
},
-
+
'login': function(callback) {
var self = this;
this.controlBar.login(function(){
diff --git a/src/Binder.js b/src/Binder.js
index 4699a601..9fc32513 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -48,14 +48,14 @@ Binder.prototype = {
});
return params;
},
-
+
parseAnchor: function() {
var self = this, url = this.location['get']() || "";
-
+
var anchorIndex = url.indexOf('#');
if (anchorIndex < 0) return;
var anchor = url.substring(anchorIndex + 1);
-
+
var anchorQuery = this.parseQueryString(anchor);
foreach(self.anchor, function(newValue, key) {
delete self.anchor[key];
@@ -64,12 +64,12 @@ Binder.prototype = {
self.anchor[key] = newValue;
});
},
-
+
onUrlChange: function() {
this.parseAnchor();
this.updateView();
},
-
+
updateAnchor: function() {
var url = this.location['get']() || "";
var anchorIndex = url.indexOf('#');
@@ -91,7 +91,7 @@ Binder.prototype = {
this.location['set'](url);
return url;
},
-
+
updateView: function() {
var start = new Date().getTime();
var scope = jQuery(this.doc).scope();
@@ -101,7 +101,7 @@ Binder.prototype = {
this.updateAnchor();
foreach(this.updateListeners, function(fn) {fn();});
},
-
+
docFindWithSelf: function(exp){
var doc = jQuery(this.doc);
var selection = doc.find(exp);
@@ -110,7 +110,7 @@ Binder.prototype = {
}
return selection;
},
-
+
executeInit: function() {
this.docFindWithSelf("[ng-init]").each(function() {
var jThis = jQuery(this);
@@ -122,7 +122,7 @@ Binder.prototype = {
}
});
},
-
+
entity: function (scope) {
var self = this;
this.docFindWithSelf("[ng-entity]").attr("ng-watch", function() {
@@ -136,7 +136,7 @@ Binder.prototype = {
}
});
},
-
+
compile: function() {
var jNode = jQuery(this.doc);
if (this.config['autoSubmit']) {
@@ -160,7 +160,7 @@ Binder.prototype = {
return false;
});
},
-
+
translateBinding: function(node, parentPath, factories) {
var path = parentPath.concat();
var offset = path.pop();
@@ -196,7 +196,7 @@ Binder.prototype = {
parent.removeChild(node);
}
},
-
+
precompile: function(root) {
var factories = [];
this.precompileNode(root, [], factories);
@@ -217,7 +217,7 @@ Binder.prototype = {
}
};
},
-
+
precompileNode: function(node, path, factories) {
var nodeType = node.nodeType;
if (nodeType == Node.TEXT_NODE) {
@@ -226,11 +226,11 @@ Binder.prototype = {
} else if (nodeType != Node.ELEMENT_NODE && nodeType != Node.DOCUMENT_NODE) {
return;
}
-
+
if (!node.getAttribute) return;
var nonBindable = node.getAttribute('ng-non-bindable');
if (nonBindable || nonBindable === "") return;
-
+
var attributes = node.attributes;
if (attributes) {
var bindings = node.getAttribute('ng-bind-attr');
@@ -252,7 +252,7 @@ Binder.prototype = {
node.setAttribute("ng-bind-attr", json);
}
}
-
+
if (!node.getAttribute) log(node);
var repeaterExpression = node.getAttribute('ng-repeat');
if (repeaterExpression) {
@@ -275,7 +275,7 @@ Binder.prototype = {
}});
return;
}
-
+
if (node.getAttribute('ng-eval')) factories.push({path:path, fn:this.ng_eval});
if (node.getAttribute('ng-bind')) factories.push({path:path, fn:this.ng_bind});
if (node.getAttribute('ng-bind-attr')) factories.push({path:path, fn:this.ng_bind_attr});
@@ -300,53 +300,57 @@ Binder.prototype = {
if (nodeName == 'OPTION') {
var html = jQuery('').append(jQuery(node).clone()).html();
if (!html.match(/.*<\/\s*option\s*>/gi)) {
- node.value = node.text;
+ if (Binder.hasBinding(node.text)) {
+ jQuery(node).attr('ng-bind-attr', angular.toJson({'value':node.text}));
+ } else {
+ node.value = node.text;
+ }
}
}
-
+
var children = node.childNodes;
for (var k = 0; k < children.length; k++) {
this.precompileNode(children[k], path.concat(k), factories);
}
},
-
+
ng_eval: function(node) {
return new EvalUpdater(node, node.getAttribute('ng-eval'));
},
-
+
ng_bind: function(node) {
return new BindUpdater(node, "{{" + node.getAttribute('ng-bind') + "}}");
},
-
+
ng_bind_attr: function(node) {
return new BindAttrUpdater(node, fromJson(node.getAttribute('ng-bind-attr')));
},
-
+
ng_hide: function(node) {
return new HideUpdater(node, node.getAttribute('ng-hide'));
},
-
+
ng_show: function(node) {
return new ShowUpdater(node, node.getAttribute('ng-show'));
},
-
+
ng_class: function(node) {
return new ClassUpdater(node, node.getAttribute('ng-class'));
},
-
+
ng_class_even: function(node) {
return new ClassEvenUpdater(node, node.getAttribute('ng-class-even'));
},
-
+
ng_class_odd: function(node) {
return new ClassOddUpdater(node, node.getAttribute('ng-class-odd'));
},
-
+
ng_style: function(node) {
return new StyleUpdater(node, node.getAttribute('ng-style'));
},
-
+
ng_watch: function(node, scope) {
scope.watch(node.getAttribute('ng-watch'));
}
-};
\ No newline at end of file
+};
diff --git a/test/BinderTest.js b/test/BinderTest.js
index a3f1eac5..d565ee30 100644
--- a/test/BinderTest.js
+++ b/test/BinderTest.js
@@ -400,7 +400,7 @@ BinderTest.prototype.testRepeaterUpdateBindings = function(){
'A' +
'B' +
'', form.sortedHtml());
-
+
items.shift();
items.shift();
a.binder.updateView();
@@ -761,10 +761,20 @@ BinderTest.prototype.testSettingAnchorToNullOrUndefinedRemovesTheAnchorFromURL =
};
BinderTest.prototype.testFillInOptionValueWhenMissing = function() {
- var c = compile('');
- assertEquals(
- '',
- c.node.sortedHtml());
+ var c = compile(
+ '');
+ c.scope.set('a', 'A');
+ c.scope.set('b', 'B');
+ c.binder.updateView();
+
+ expect(c.node.find("option:first").attr('value')).toEqual('A');
+ expect(c.node.find("option:first").text()).toEqual('A');
+
+ expect(c.node.find("option:nth-child(2)").attr('value')).toEqual('');
+ expect(c.node.find("option:nth-child(2)").text()).toEqual('B');
+
+ expect(c.node.find("option:last").attr('value')).toEqual('C');
+ expect(c.node.find("option:last").text()).toEqual('C');
};
BinderTest.prototype.testValidateForm = function() {
@@ -972,7 +982,7 @@ BinderTest.prototype.testItShouldRenderMultiRootHtmlInBinding = function() {
x.scope.set("a", "acd");
x.binder.updateView();
assertEquals(
- 'before acdafter
',
+ 'before acdafter
',
x.node.sortedHtml());
};
--
cgit v1.2.3