Fixed issue esvit#33. Now it's possible to use values coming from aja…

…x calls.
marloncarvalho · Jun 3, 2015 · 45b7ea5 · 45b7ea5
1 parent bddc5e2
commit 45b7ea5
Show file tree

Hide file tree

Showing 16 changed files with 416 additions and 204 deletions.
diff --git a/angular-social.js b/angular-social.js
diff --git a/angular-social.map b/angular-social.map
diff --git a/angular-social.src.js b/angular-social.src.js
diff --git a/examples/demo1.html b/examples/demo1.html
@@ -64,8 +64,8 @@
             <li class="ng-social-odnoklassniki">Одноклассники</li>
             <li class="ng-social-mailru">Мой мир</li>
             <li class="ng-social-pinterest">Pinterest</li>
-            <li class="ng-social-github" user="esvit" repository="ng-table">GitHub</li>
-            <li class="ng-social-github-forks" user="esvit" repository="ng-table">Forks</li>
+            <li class="ng-social-github" user="'esvit'" repository="'ng-table'">GitHub</li>
+            <li class="ng-social-github-forks" user="user" repository="repository">Forks</li>
             <li class="ng-social-stumbleupon">StumbleUpon</li>
             <li class="ng-social-moi-krug">Мой круг</li>
             <li class="ng-social-linkedin">LinkedIn</li>
@@ -78,6 +78,8 @@
         controller('DemoCtrl', function($scope) {
             $scope.current_title = 'Test';
             $scope.current_description = 'Test description';
+            $scope.user = 'esvit';
+            $scope.repository = 'ng-table';
         })
         </script>
     </div>

diff --git a/src/scripts/02-facebook.js b/src/scripts/02-facebook.js
@@ -26,7 +26,11 @@ app.directive('ngSocialFacebook', ['$parse', function ($parse) {
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
+    scope: {
+      url: "=url",
+      description: "=description",
+      title: "=title"
+    },
     replace: true,
     transclude: true,
     template: '<li>' +
@@ -42,12 +46,18 @@ app.directive('ngSocialFacebook', ['$parse', function ($parse) {
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        url: $parse(attrs.url)(scope)
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+      scope.$watchGroup(['title', 'url', 'description'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            title: newValues[0],
+            url: newValues[1],
+            description: newValues[2]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   };
 }]);
diff --git a/src/scripts/03-twitter.js b/src/scripts/03-twitter.js
@@ -26,7 +26,11 @@ app.directive('ngSocialTwitter', ['$parse', function ($parse) {
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
+    scope: {
+      url: "=url",
+      title: "=title",
+      description: "=description"
+    },
     replace: true,
     transclude: true,
     template: '<li> \
@@ -41,13 +45,19 @@ app.directive('ngSocialTwitter', ['$parse', function ($parse) {
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        url: $parse(attrs.url)(scope),
-        title: $parse(attrs.title)(scope)
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+
+      scope.$watchGroup(['title', 'url', 'description'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            title: newValues[0],
+            url: newValues[1],
+            description: newValues[2]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   }
 }]);
diff --git a/src/scripts/04-google-plus.js b/src/scripts/04-google-plus.js
@@ -37,7 +37,11 @@ app.directive('ngSocialGooglePlus', ['$parse', function ($parse) {
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
+    scope: {
+      url: "=url",
+      description: "=description",
+      title: "=title"
+    },
     replace: true,
     transclude: true,
     template: '<li> \
@@ -52,12 +56,18 @@ app.directive('ngSocialGooglePlus', ['$parse', function ($parse) {
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        url: $parse(attrs.url)(scope)
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+      scope.$watchGroup(['title', 'url', 'description'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            title: newValues[0],
+            url: newValues[1],
+            description: newValues[2]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   };
 }]);
diff --git a/src/scripts/05-vk.js b/src/scripts/05-vk.js
@@ -33,8 +33,13 @@ app.directive('ngSocialVk', ['$parse', function ($parse) {
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
     replace: true,
+    scope: {
+      url: "=url",
+      description: "=description",
+      title: "=title",
+      image: "=image"
+    },
     transclude: true,
     template: '<li> \
                     <a ng-href="{{ctrl.link(options)}}" target="_blank" ng-click="ctrl.clickShare($event, options)" class="ng-social-button"> \
@@ -48,15 +53,20 @@ app.directive('ngSocialVk', ['$parse', function ($parse) {
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        url: $parse(attrs.url)(scope),
-        title: $parse(attrs.title)(scope),
-        description: $parse(attrs.description)(scope),
-        image: $parse(attrs.image)(scope)
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+
+      scope.$watchGroup(['url', 'description', 'title', 'image'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            url: newValues[0],
+            description: newValues[1],
+            title: newValues[2],
+            image: newValues[3]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   }
 }]);
diff --git a/src/scripts/06-odnoklassniki.js b/src/scripts/06-odnoklassniki.js
@@ -31,8 +31,10 @@ angular.module("ngSocial").directive('ngSocialOdnoklassniki', ['$parse', functio
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
     replace: true,
+    scope: {
+      url: "=url"
+    },
     transclude: true,
     template: '<li> \
                     <a ng-href="{{ctrl.link(options)}}" target="_blank" ng-click="ctrl.clickShare($event, options)" class="ng-social-button"> \
@@ -46,12 +48,17 @@ angular.module("ngSocial").directive('ngSocialOdnoklassniki', ['$parse', functio
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        url: $parse(attrs.url)(scope)
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+
+      scope.$watch('url', function(newValue, oldValue) {
+        if(newValue) {
+          options.urlOptions = {
+            url: newValue
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   }
 }]);
diff --git a/src/scripts/07-mailru.js b/src/scripts/07-mailru.js
@@ -19,8 +19,11 @@ angular.module("ngSocial").directive('ngSocialMailru', ['$parse', function ($par
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
     replace: true,
+    scope: {
+      url: "=url",
+      title: "=title"
+    },
     transclude: true,
     template: '<li> \
                     <a ng-href="{{ctrl.link(options)}}" target="_blank" ng-click="ctrl.clickShare($event, options)" class="ng-social-button"> \
@@ -34,13 +37,18 @@ angular.module("ngSocial").directive('ngSocialMailru', ['$parse', function ($par
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        url: $parse(attrs.url)(scope),
-        title: $parse(attrs.title)(scope)
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+
+      scope.$watchGroup(['title', 'url'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            title: newValues[0],
+            url: newValues[1]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   }
 }]);
diff --git a/src/scripts/08-pinterest.js b/src/scripts/08-pinterest.js
@@ -17,7 +17,11 @@ angular.module("ngSocial").directive('ngSocialPinterest', ['$parse', function ($
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
+    scope: {
+      url: "=url",
+      title: "=title",
+      image: "=image"
+    },
     replace: true,
     transclude: true,
     template: '<li> \
@@ -32,14 +36,19 @@ angular.module("ngSocial").directive('ngSocialPinterest', ['$parse', function ($
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        url: $parse(attrs.url)(scope),
-        title: $parse(attrs.title)(scope),
-        image: $parse(attrs.image)(scope)
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+
+      scope.$watchGroup(['title', 'url', 'image'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            title: newValues[0],
+            url: newValues[1],
+	        image: newValues[2]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   }
 }]);
diff --git a/src/scripts/09-github-forks.js b/src/scripts/09-github-forks.js
@@ -13,7 +13,10 @@ angular.module("ngSocial").directive('ngSocialGithubForks', function () {
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
+    scope: {
+      user: "=user",
+      repository: "=repository"
+    },
     replace: true,
     transclude: true,
     template: '<li> \
@@ -28,13 +31,18 @@ angular.module("ngSocial").directive('ngSocialGithubForks', function () {
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        'user': attrs.user,
-        'repository': attrs.repository
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+
+      scope.$watchGroup(['user', 'repository'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            user: newValues[0],
+            repository: newValues[1]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   }
 });
diff --git a/src/scripts/09-github.js b/src/scripts/09-github.js
@@ -13,7 +13,10 @@ angular.module("ngSocial").directive('ngSocialGithub', function () {
   return {
     restrict: 'C',
     require: '^?ngSocialButtons',
-    scope: true,
+    scope: {
+      user: "=user",
+      repository: "=repository"
+    },
     replace: true,
     transclude: true,
     template: '<li> \
@@ -28,13 +31,18 @@ angular.module("ngSocial").directive('ngSocialGithub', function () {
       if (!ctrl) {
         return;
       }
-      options.urlOptions = {
-        'user': attrs.user,
-        'repository': attrs.repository
-      };
-      scope.options = options;
-      scope.ctrl = ctrl;
-      ctrl.init(scope, element, options);
+
+      scope.$watchGroup(['user', 'repository'], function(newValues, oldValues) {
+        if(newValues) {
+          options.urlOptions = {
+            user: newValues[0],
+            repository: newValues[1]
+          };
+          scope.options = options;
+          scope.ctrl = ctrl;
+          ctrl.init(scope, element, options);
+        }
+      });
     }
   }
 });