feat: decorate ng-click to register on renderNode in fa-directives

Famous · Aug 11, 2014 · 968b09a · 968b09a
1 parent 864bd8b
commit 968b09a
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 45 deletions.
diff --git a/dist/famous-angular.js b/dist/famous-angular.js
@@ -1708,31 +1708,65 @@ angular.module('famous.angular')
  * ```
  */
 
+  // .directive('faClick', ["$parse", "$famousDecorator", function ($parse, $famousDecorator) {
+  //   return {
+  //     restrict: 'A',
+  //     compile: function () {
+  //       return {
+  //         post: function (scope, element, attrs) {
+  //           var isolate = $famousDecorator.ensureIsolate(scope);
+
+  //           if (attrs.faClick) {
+  //             var renderNode = (isolate.renderNode._eventInput || isolate.renderNode);
+
+  //             renderNode.on("click", function (data) {
+  //               var fn = $parse(attrs.faClick);
+  //               fn(scope, {$event: data});
+  //               if (!scope.$$phase){
+  //                 scope.$apply();
+  //               }
+  //             });
+  //           }
+  //         }
+  //       };
+  //     }
+  //   };
+  // }])
 angular.module('famous.angular')
-  .directive('faClick', ["$parse", "$famousDecorator", function ($parse, $famousDecorator) {
-    return {
-      restrict: 'A',
-      compile: function () {
-        return {
-          post: function (scope, element, attrs) {
-            var isolate = $famousDecorator.ensureIsolate(scope);
+.config(function($provide) {
+  $provide.decorator('ngClickDirective', function($delegate, $famousDecorator, $parse) {
+      var directive = $delegate[0];
 
-            if (attrs.faClick) {
-              var renderNode = (isolate.renderNode._eventInput || isolate.renderNode);
+      var compile = directive.compile;
+      directive.compile = function(element , attrs, transclude) {
+        var isFa = /^FA\-.*/;
+        if(isFa.test(element[0].tagName)) {
+          console.log("compile in",element[0]);
+          return {
+            post: function (scope, element, attrs) {
+              var isolate = $famousDecorator.ensureIsolate(scope);
 
-              renderNode.on("click", function (data) {
-                var fn = $parse(attrs.faClick);
-                fn(scope, {$event: data});
-                if (!scope.$$phase){
-                  scope.$apply();
-                }
-              });
+              if (attrs.ngClick) {
+                var renderNode = (isolate.renderNode._eventInput || isolate.renderNode);
+
+                renderNode.on("click", function (data) {
+                  var fn = $parse(attrs.ngClick);
+                  fn(scope, {$event: data});
+                  if (!scope.$$phase){
+                    scope.$apply();
+                  }
+                });
+              }
             }
-          }
-        };
-      }
-    };
-  }]);
+          };
+        }else {
+          console.log("compile in normal");
+          return compile(element , attrs, transclude);
+        }
+      };
+      return $delegate;
+  });
+});
 
 /**
  * @ngdoc directive

diff --git a/dist/famous-angular.min.js b/dist/famous-angular.min.js
diff --git a/famous-angular-docs b/famous-angular-docs
diff --git a/famous-angular-examples b/famous-angular-examples
diff --git a/src/scripts/directives/fa-click.js b/src/scripts/directives/fa-click.js
@@ -58,28 +58,62 @@
  * ```
  */
 
+  // .directive('faClick', ["$parse", "$famousDecorator", function ($parse, $famousDecorator) {
+  //   return {
+  //     restrict: 'A',
+  //     compile: function () {
+  //       return {
+  //         post: function (scope, element, attrs) {
+  //           var isolate = $famousDecorator.ensureIsolate(scope);
+
+  //           if (attrs.faClick) {
+  //             var renderNode = (isolate.renderNode._eventInput || isolate.renderNode);
+
+  //             renderNode.on("click", function (data) {
+  //               var fn = $parse(attrs.faClick);
+  //               fn(scope, {$event: data});
+  //               if (!scope.$$phase){
+  //                 scope.$apply();
+  //               }
+  //             });
+  //           }
+  //         }
+  //       };
+  //     }
+  //   };
+  // }])
 angular.module('famous.angular')
-  .directive('faClick', ["$parse", "$famousDecorator", function ($parse, $famousDecorator) {
-    return {
-      restrict: 'A',
-      compile: function () {
-        return {
-          post: function (scope, element, attrs) {
-            var isolate = $famousDecorator.ensureIsolate(scope);
+.config(function($provide) {
+  $provide.decorator('ngClickDirective', function($delegate, $famousDecorator, $parse) {
+      var directive = $delegate[0];
+
+      var compile = directive.compile;
+      directive.compile = function(element , attrs, transclude) {
+        var isFa = /^FA\-.*/;
+        if(isFa.test(element[0].tagName)) {
+          console.log("compile in",element[0]);
+          return {
+            post: function (scope, element, attrs) {
+              var isolate = $famousDecorator.ensureIsolate(scope);
 
-            if (attrs.faClick) {
-              var renderNode = (isolate.renderNode._eventInput || isolate.renderNode);
+              if (attrs.ngClick) {
+                var renderNode = (isolate.renderNode._eventInput || isolate.renderNode);
 
-              renderNode.on("click", function (data) {
-                var fn = $parse(attrs.faClick);
-                fn(scope, {$event: data});
-                if (!scope.$$phase){
-                  scope.$apply();
-                }
-              });
+                renderNode.on("click", function (data) {
+                  var fn = $parse(attrs.ngClick);
+                  fn(scope, {$event: data});
+                  if (!scope.$$phase){
+                    scope.$apply();
+                  }
+                });
+              }
             }
-          }
-        };
-      }
-    };
-  }]);
+          };
+        }else {
+          console.log("compile in normal");
+          return compile(element , attrs, transclude);
+        }
+      };
+      return $delegate;
+  });
+});
diff --git a/src/scripts/famous b/src/scripts/famous