From e41ee88ef85986dcd0fea23fefcc57d89cee5c0b Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 22 Jan 2010 11:21:22 -0800 Subject: fix bug when multiple binders on same page --- angular-minified.js | 42 ++++++++++++++++---------------- angular.js | 6 ++--- example/tweeter/tweeter_addressbook.html | 10 ++++---- src/Binder.js | 6 ++--- test.sh | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/angular-minified.js b/angular-minified.js index ccceb4ec..2209c269 100644 --- a/angular-minified.js +++ b/angular-minified.js @@ -6,19 +6,19 @@ c;this.location=o.location}function ja(a){this.location=a;this.delay=25;this.set function z(a,b){var c=[];$(c,a,b?"\n ":null);return c.join("")}function O(a){try{var b=new E(a,true),c=b.aa();b.I();return c()}catch(d){W("fromJson error: ",a,d);throw d;}}function $(a,b,c){var d=typeof b;if(b===null)a.push("null");else if(d!=="function")if(d==="boolean")a.push(""+b);else if(d==="number")isNaN(b)?a.push("null"):a.push(""+b);else if(d==="string")return a.push(m.String.quoteUnicode(b));else if(d==="object")if(b instanceof Array){a.push("[");var e=b.length;d=false;for(var f=0;f>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.u.charAt(f)+this.u.charAt(c)+this.u.charAt(g)+this.u.charAt(h)}return b},td: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=ba.ob(b)},pb: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},ob: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 y.getAttribute=="undefined")y.getAttribute=K();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};o.console||(o.console={log:n,error:n});var R,q=_.each,S=_.extend,k=o.jQuery,X=k.browser.msie,m=o.angular||(o.angular= {}),Ca=m.validator||(m.validator={}),r=m.filter||(m.filter={}),ca=m.callbacks||(m.callbacks={});m.alert||(m.alert=function(){w(arguments);o.alert.apply(o,arguments)});ia.prototype={load:function(){this.Db();w("Server: "+this.j.H);this.Cb();this.Bb();this.xb()},Cb:function(){w("Angular.configureJQueryPlugins()");k.fn.scope=function(){for(var a=this;a&&a.get(0);){var b=a.data("scope");if(b)return b;a=a.parent()}return null};k.fn.controller=function(){return this.data("controller")||Q.Wb}},Gc:function(){return""+ -(new Date).getTime()},Bb:function(){var a=this.j;if(!a.F){var b=a.H.match(/https?:\/\/([\w]*)/);a.F=b?b[1]:"$MEMORY"}},xb:function(){function a(){g.Qb(function(l){!l&&c.find("[ng-auth=eager]").length&&g.ka()})}w("Angular.bindHtml()");var b=this.Nc=new ja(this.location),c=this.document,d=new na(this.j.H,this.j.F),e=new x(c[0],d,b,this.j);d.rc=Ea(e,e.e);b=new P(c.find("body"),this.j.H);var f=this.j.F=="$MEMORY"?new aa(this.window):new ka(this.j.H,k.getScript);f=new la(f,new U(k(c.body)),function(){e.c()}); +(new Date).getTime()},Bb:function(){var a=this.j;if(!a.F){var b=a.H.match(/https?:\/\/([\w]*)/);a.F=b?b[1]:"$MEMORY"}},xb:function(){function a(){g.Qb(function(l){!l&&c.find("[ng-auth=eager]").length&&g.ka()})}w("Angular.bindHtml()");var b=this.Nc=new ja(this.location),c=this.document,d=new na(this.j.H,this.j.F),e=new x(c[0],d,b,this.j);d.rc=Ea(e,e.e);b=new P(c.find("body"),this.j.H);var f=this.j.F=="$MEMORY"?new aa(this.window):new ka(this.j.H,k.getScript);f=new la(f,new U(k(c.body)),function(){e.d()}); var g=new ma(f,b),h="/data/"+this.j.F,i=new T(function(l,p){f.N("POST",h,l,p)},g,e.anchor);e.ab.push(function(){i.Ea()});var j=new v({$anchor:e.anchor,$binder:e,$config:this.j,$console:o.console,$datastore:i,$save:function(l){i.Ac(j.q,l,e.anchor)},$window:o,$uid:this.Gc,$users:g},"ROOT");c.data("scope",j);w("$binder.entity()");e.K(j);w("$binder.compile()");e.compile();w("ControlBar.bind()");b.bind();w("$users.fetchCurrentUser()");a();w("PopUp.bind()");(new B(c)).bind();w("$binder.parseAnchor()"); e.Ta();c.find("body").show();w("ready()")},Db:function(){var a=o.location.href+"#";a=a.split("#")[1];var b={Jb:null};a=a.split("&");for(var c=0;c=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.Wc.find(a,function(c){return c.z==b},null)},filter:function(a, b){var c=[];c.yb=function(j){for(var l=0;l-1;case "object":for(var p in j)if(p.charAt(0)!=="$"&&e(j[p],l))return true;return false;case "array":for(p=0;p-1;){c1||x.J(a[0])!==null};x.J=function(a){return(a=a.replace(/\n/gm," ").match(/^\{\{(.*)\}\}$/))? -a[1]:null};x.prototype={uc:function(a){var b={};a.replace(/(?:^|&)([^&=]*)=?([^&]*)/g,function(c,d,e){if(d)b[decodeURIComponent(d)]=decodeURIComponent(e)});return b},Ta:function(a){var b=this;a=a||this.qa.Ga();var c=a.indexOf("#");if(!(c<0)){a=this.uc(a.substring(c+1));q(b.anchor,function(d,e){delete b.anchor[e]});q(a,function(d,e){b.anchor[e]=d})}},tc:function(a){this.Ta(a);this.c()},Hc:function(){var a=this.qa.Ga(),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.qa.Dc(a);return a},c:function(){(new Date).getTime();var a=k(this.B).scope();a.i("$invalidWidgets",[]);a.c();(new Date).getTime();this.Hc();_.each(this.ab,function(b){b()})},ha:function(a){var b=k(this.B),c=b.find(a);if(b.is(a))c=c.andSelf();return c},K:function(a){this.ha("[ng-entity]").attr("ng-watch",function(){try{var b=k(this);return a.K(b.attr("ng-entity"))+ -(b.attr("ng-watch")||"")}catch(c){alert(c)}})},compile:function(){var a=k(this.B),b=this;if(this.j.ad){var c=this.ha(":submit").not("[ng-action]");c.attr("ng-action","$save()");c.not(":disabled").not("ng-bind-attr").attr("ng-bind-attr",'{disabled:"{{$invalidWidgets}}"}')}this.Ua(this.B)(this.B,a.scope(),"");this.ha("a[ng-action]").live("click",function(){var d=k(this);try{d.scope().eval(d.attr("ng-action"));d.removeAttr("ng-error");d.removeClass("ng-exception")}catch(e){d.addClass("ng-exception"); -d.attr("ng-error",z(e,true))}b.c();return false})},Fc:function(a,b,c){b=b.concat();var d=b.pop(),e=x.Z(a.nodeValue);if(e.length>1||x.J(e[0])){var f=a.parentNode;if(ea(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;g-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.qa.Dc(a);return a},d:function(){(new Date).getTime();var a=k(this.B).scope();a.i("$invalidWidgets",[]);a.d();(new Date).getTime();this.Hc();_.each(this.ab,function(b){b()})},ha:function(a){var b=k(this.B),c=b.find(a);if(b.is(a))c=c.andSelf();return c},K:function(a){this.ha("[ng-entity]").attr("ng-watch",function(){try{var b=k(this);return a.K(b.attr("ng-entity"))+ +(b.attr("ng-watch")||"")}catch(c){alert(c)}})},compile:function(){var a=k(this.B);if(this.j.ad){var b=this.ha(":submit").not("[ng-action]");b.attr("ng-action","$save()");b.not(":disabled").not("ng-bind-attr").attr("ng-bind-attr",'{disabled:"{{$invalidWidgets}}"}')}this.Ua(this.B)(this.B,a.scope(),"");this.ha("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", +z(e,true))}d.eval("$binder.updateView()");return false})},Fc:function(a,b,c){b=b.concat();var d=b.pop(),e=x.Z(a.nodeValue);if(e.length>1||x.J(e[0])){var f=a.parentNode;if(ea(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||w(a);var j=a.getAttribute("ng-repeat");if(j){a.removeAttribute("ng-repeat");var l=this.Ua(a);d=y.createComment("ng-repeat: "+j);e=a.parentNode;e.insertBefore(d,a);e.removeChild(a);function p(s,t,A){var J= k(a).clone();J.css("display","");J.attr("ng-repeat-index",""+A);J.data("scope",s);l(J[0],s,t+A+":");return J}c.push({path:b,b:function(s,t,A){return new Ba(k(s),j,p,A)}})}else{a.getAttribute("ng-eval")&&c.push({path:b,b:this.lc});a.getAttribute("ng-bind")&&c.push({path:b,b:this.Ra});a.getAttribute("ng-bind-attr")&&c.push({path:b,b:this.hc});a.getAttribute("ng-hide")&&c.push({path:b,b:this.mc});a.getAttribute("ng-show")&&c.push({path:b,b:this.nc});a.getAttribute("ng-class")&&c.push({path:b,b:this.ic}); @@ -74,26 +74,26 @@ this.pa();this.k("}");return function(d){return function(e){var f=new v(d.scope. while(this.a(","))}this.k(")");return function(c){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},m:function(a,b){this.eval(a+"="+z(b))},eval:function(a,b){var c=v.U[a];if(!c){var d=new E(a);c=d.pa();d.I();v.U[a]=c}b=b||{};b.scope=this;return c(b)},l:function(a,b,c,d,e){try{var f=this.eval(b, c);if(a.w){a.w=false;k(a.view).removeClass("ng-exception").removeAttr("ng-error")}d&&d.apply(a,[f]);return true}catch(g){W("Eval Widget Error:",g);b=z(g,true);a.w=true;k(a.view).addClass("ng-exception").attr("ng-error",b);e&&e.apply(a,[g,b]);return false}},Kc:function(a,b){var c=v.U[a];if(!c){c=(new E(a)).O();v.U[a]=c}a={scope:this};return c(a)(a,b)},K:function(a){return(new E(a)).Ob()({scope:this})},dc:function(a){this.q.Tc.push(a)},watch:function(a){var b=this;(new E(a)).watch()({scope:this,qb:function(c, -d){b.rb(c,function(e,f){try{return d({scope:b},e,f)}catch(g){alert(g)}})}})},rb:function(a,b){var c=this.ra[a];if(!c){c={La:[],o:a};this.ra[a]=c}c.La.push(b)},Sb:function(){var a=this,b=false;q(this.ra,function(c){var d=a.eval(c.o);if(d!==c.d){q(c.La,function(e){e(d,c.d);b=true});c.d=d}});return b}};ka.prototype={vb:function(a){return ba.Lb(a)},N:function(a,b,c,d){var e=this.Jc+this.fc++;ca[e]=function(h){delete m[e];d(200,h)};a={Ld:b,Ad:a,Cd:c};a=this.vb(z(a));b=Math.ceil(a.length/this.la);c=this.url+ +d){b.rb(c,function(e,f){try{return d({scope:b},e,f)}catch(g){alert(g)}})}})},rb:function(a,b){var c=this.ra[a];if(!c){c={La:[],o:a};this.ra[a]=c}c.La.push(b)},Sb:function(){var a=this,b=false;q(this.ra,function(c){var d=a.eval(c.o);if(d!==c.c){q(c.La,function(e){e(d,c.c);b=true});c.c=d}});return b}};ka.prototype={vb:function(a){return ba.Lb(a)},N:function(a,b,c,d){var e=this.Jc+this.fc++;ca[e]=function(h){delete m[e];d(200,h)};a={Ld:b,Ad:a,Cd:c};a=this.vb(z(a));b=Math.ceil(a.length/this.la);c=this.url+ "/$/"+e+"/"+b+"/";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){b=Ca.number(a, b,c);if(b===null&&a!=Math.round(a))return"Value is not a whole number.";return b},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{O(a);return null}catch(b){return b.toString()}}},function(a,b){Ca[b]=a});na.prototype={Eb: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;if(d=="button"||d=="submit"||d=="reset"||d=="image"){c=new Ja(a[0],e);f="click";g=false}else if(d=="text"||d=="textarea"||d=="hidden"||d=="password"){c=new oa(a[0],e);f="keyup change"}else if(d=="checkbox"){c=new pa(a[0],e);f="click"}else if(d=="radio"){c=new sa(a[0],e);f="click"}else if(d=="select-one")c=new qa(a[0],e);else if(d=="select-multiple")c=new ra(a[0],e);else if(d=="file")c=this.Fb(a,e);else throw"Unknown type: "+d;a.data("controller", -c);var h=b.get("$binder");k(c.view,":input").bind(f,function(){if(c.e(b)){var i=k(c.view).attr("ng-action")||"";b.l(c,i)&&h.c(b)}return g});return c},Fb:function(a){var b="__uploadWidget_"+this.gc++,c=M.template(b);a.after(c);b=this.Aa({data:this.ca+"/admin/ServerAPI.swf",width:"95",height:"20",align:"top",Nd:"transparent"},{yd:"uploadWidgetId="+b,Zc:"always"},b);a.remove();a=new M(c,a[0].name,b,this.ca+"/data/"+this.F);k(b).data("controller",a);return a}};M.dispatchEvent=function(a,b,c){a=y.getElementById(a); -a=k(a).data("controller");M.prototype["_on_"+b].apply(a,c)};M.template=function(a){return k('')};M.prototype={e:function(a){var b=this.view.find("input").attr("checked")?this.value:null;if(this.d===b)return false;else{a.i(this.Ya,b);return true}},c:function(a){if((a=a.get(this.Ya))&&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)}};Q.prototype={e:L(true),c:n};Q.Wb=new Q;var Ja=Q;oa.prototype={e:function(a){var b=this.view.value;if(this.d===b)return false;else{a.m(this.exp,b);this.d=b;return true}},c:function(a){var b=this.view,c=a.get(this.exp);if(typeof c==="undefined"){c=this.p;a.m(this.exp,c)}c=c?c:"";if(this.d!=c)this.d=b.value=c;var d=false;b.removeAttribute("ng-error");if(this.zc)d=!(c&&c.length>0);var e=d?"Required Value": -null;if(!d&&this.O&&c){e=a.Kc(this.O,c);d=!!e}if(this.Ja!==e){this.Ja=d;if(e!==null){b.setAttribute("ng-error",e);a.dc(this)}k(b).toggleClass("ng-validation-error",d)}}};pa.prototype={e:function(a){var b=this.view;b=b.checked?b.value:"";if(this.d===b)return false;else{a.m(this.exp,b);this.d=b;return true}},c:function(a){var b=this.view,c=a.eval(this.exp);if(typeof c==="undefined"){c=this.p;a.m(this.exp,c)}b.checked=b.value==""+c}};qa.prototype={e:function(a){if(this.view.selectedIndex<0)a.m(this.exp, -null);else{var b=this.view.value;if(this.d===b)return false;else{a.m(this.exp,b);this.d=b;return true}}},c:function(a){var b=this.view,c=a.get(this.exp);if(typeof c==="undefined"){c=this.p;a.m(this.exp,c)}if(c!==this.d){b.value=c?c:"";this.d=c}}};ra.prototype={selected:function(){for(var a=[],b=this.view.options,c=0;c')};M.prototype={e:function(a){var b=this.view.find("input").attr("checked")?this.value:null;if(this.c===b)return false;else{a.i(this.Ya,b);return true}},d:function(a){if((a=a.get(this.Ya))&&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)}};Q.prototype={e:L(true),d:n};Q.Wb=new Q;var Ja=Q;oa.prototype={e:function(a){var b=this.view.value;if(this.c===b)return false;else{a.m(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.p;a.m(this.exp,c)}c=c?c:"";if(this.c!=c)this.c=b.value=c;var d=false;b.removeAttribute("ng-error");if(this.zc)d=!(c&&c.length>0);var e=d?"Required Value": +null;if(!d&&this.O&&c){e=a.Kc(this.O,c);d=!!e}if(this.Ja!==e){this.Ja=d;if(e!==null){b.setAttribute("ng-error",e);a.dc(this)}k(b).toggleClass("ng-validation-error",d)}}};pa.prototype={e:function(a){var b=this.view;b=b.checked?b.value:"";if(this.c===b)return false;else{a.m(this.exp,b);this.c=b;return true}},d:function(a){var b=this.view,c=a.eval(this.exp);if(typeof c==="undefined"){c=this.p;a.m(this.exp,c)}b.checked=b.value==""+c}};qa.prototype={e:function(a){if(this.view.selectedIndex<0)a.m(this.exp, +null);else{var b=this.view.value;if(this.c===b)return false;else{a.m(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.p;a.m(this.exp,c)}if(c!==this.c){b.value=c?c:"";this.c=c}}};ra.prototype={selected:function(){for(var a=[],b=this.view.options,c=0;cd;--b){var p=this.children.pop().element[0];p.parentNode.removeChild(p)}if(h&&h.element[0].nodeName==="OPTION")if(d=k(h.element[0].parentNode).data("controller")){d.d=undefined;d.c(a)}})}};B.wa="mouseleave mouseout click dblclick keypress keyup";B.sc=function(){B.na();var a=k(this);a.bind(B.wa,B.na);var b=a.position(),c=y.documentElement,d=(self.innerWidth||c&&c.clientWidth|| +null)return"";return D(z(a,true));default:return""}};N.prototype={e:n,d:function(a){for(var b=[],c=this.exp,d=c.length,e=0;ed;--b){var p=this.children.pop().element[0];p.parentNode.removeChild(p)}if(h&&h.element[0].nodeName==="OPTION")if(d=k(h.element[0].parentNode).data("controller")){d.c=undefined;d.d(a)}})}};B.wa="mouseleave mouseout click dblclick keypress keyup";B.sc=function(){B.na();var a=k(this);a.bind(B.wa,B.na);var b=a.position(),c=y.documentElement,d=(self.innerWidth||c&&c.clientWidth|| y.body.clientWidth)-b.left;c=a.hasClass("ng-exception")?"EXCEPTION:":"Validation error...";a=a.attr("ng-error");d=d>375?"left":"right";c=k("
"+c+"
"+a+"
");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};B.na=function(){k("#ng-callout").unbind(B.wa, B.na).remove();return true};B.prototype={bind:function(){this.B.find(".ng-validation-error,.ng-exception").live("mouseover",B.sc)}};U.ib='
loading....
';U.prototype={wb:function(){this.ba===0&&this.Na.show();this.ba++},Mb:function(){this.ba--;this.ba===0&&this.Na.hide("fold")}}})(window,document); diff --git a/angular.js b/angular.js index 755846ca..9609929c 100644 --- a/angular.js +++ b/angular.js @@ -1040,7 +1040,6 @@ Binder.prototype = { compile: function() { var jNode = jQuery(this.doc); - var self = this; if (this.config.autoSubmit) { var submits = this.docFindWithSelf(":submit").not("[ng-action]"); submits.attr("ng-action", "$save()"); @@ -1049,15 +1048,16 @@ Binder.prototype = { this.precompile(this.doc)(this.doc, jNode.scope(), ""); this.docFindWithSelf("a[ng-action]").live('click', function (event) { var jNode = jQuery(this); + var scope = jNode.scope(); try { - jNode.scope().eval(jNode.attr('ng-action')); + scope.eval(jNode.attr('ng-action')); jNode.removeAttr('ng-error'); jNode.removeClass("ng-exception"); } catch (e) { jNode.addClass("ng-exception"); jNode.attr('ng-error', toJson(e, true)); } - self.updateView(); + scope.eval('$binder.updateView()'); return false; }); }, diff --git a/example/tweeter/tweeter_addressbook.html b/example/tweeter/tweeter_addressbook.html index 91394552..64a3f95e 100644 --- a/example/tweeter/tweeter_addressbook.html +++ b/example/tweeter/tweeter_addressbook.html @@ -8,7 +8,7 @@ - +

Address Book

[ Filter: ] @@ -19,7 +19,7 @@ as {{user.name}} [ edit | X - | unmute + | mute ]
{{user.notes|linky}}
@@ -42,7 +42,7 @@

-muted={{muted}} +mute={{mute|json}} userFilter={{userFilter|json}} @@ -62,7 +62,7 @@ tweets={{tweets}} ]
Loading...
    -
  • @@ -71,7 +71,7 @@ tweets={{tweets}} ]: {{tweet.text | linky}} {{tweet.created_at}} - {{user.notes|linky}} + {{user.notes}}
diff --git a/src/Binder.js b/src/Binder.js index b29a07c6..b687fb77 100644 --- a/src/Binder.js +++ b/src/Binder.js @@ -137,7 +137,6 @@ Binder.prototype = { compile: function() { var jNode = jQuery(this.doc); - var self = this; if (this.config.autoSubmit) { var submits = this.docFindWithSelf(":submit").not("[ng-action]"); submits.attr("ng-action", "$save()"); @@ -146,15 +145,16 @@ Binder.prototype = { this.precompile(this.doc)(this.doc, jNode.scope(), ""); this.docFindWithSelf("a[ng-action]").live('click', function (event) { var jNode = jQuery(this); + var scope = jNode.scope(); try { - jNode.scope().eval(jNode.attr('ng-action')); + scope.eval(jNode.attr('ng-action')); jNode.removeAttr('ng-error'); jNode.removeClass("ng-exception"); } catch (e) { jNode.addClass("ng-exception"); jNode.attr('ng-error', toJson(e, true)); } - self.updateView(); + scope.eval('$binder.updateView()'); return false; }); }, diff --git a/test.sh b/test.sh index 32e8b4b7..c0d1e7ac 100755 --- a/test.sh +++ b/test.sh @@ -1,2 +1,2 @@ -java -jar lib/jstestdriver/JsTestDriver.jar --tests all 2>/dev/null | grep -v lib/jasmine +java -jar lib/jstestdriver/JsTestDriver.jar --tests all | grep -v lib/jasmine -- cgit v1.2.3