From 7c87c17d08dbba318af1a149c0bbedb696b03458 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 22 Mar 2010 18:20:49 -0700 Subject: upgraded jquery to 1.4.2 and made ng-action work with jquery --- src/directives.js | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/directives.js b/src/directives.js index e081d179..9f98badb 100644 --- a/src/directives.js +++ b/src/directives.js @@ -82,6 +82,15 @@ angularDirective("ng-repeat", function(expression, element){ }; }, {exclusive: true}); +angularDirective("ng-action", function(expression, element){ + return function(){ + var self = this; + jQuery(element.element).click(function(){ + self.$eval(expression); + }); + }; +}); + angularDirective("ng-watch", function(expression, element){ var match = expression.match(/^([^.]*):(.*)$/); if (!match) { @@ -93,6 +102,12 @@ angularDirective("ng-watch", function(expression, element){ }; }); +//Styling +// +//ng-class +//ng-class-odd, ng-class-even +//ng-style +//ng-show, ng-hide ///////////////////////////////////////// ///////////////////////////////////////// @@ -103,22 +118,6 @@ angularDirective("ng-watch", function(expression, element){ -//Styling -// -//ng-class -//ng-class-odd, ng-class-even -//ng-style -//ng-show, ng-hide - - -angularDirective("action", function(expression, element){ - return function(){ - var self = this; - jQuery(element).click(function(){ - self.$eval(expression); - }); - }; -}); //widget related //ng-validate, ng-required, ng-formatter -- cgit v1.2.3