fix(callbacks): fix callbacks using ES6

Using ES6 we need to bind the callbacks using `&`, so we have access to `this` in the context of the original scope
softmonkeyjapan · Sep 23, 2015 · 1f29a74 · 1f29a74
1 parent 1a35e7c
commit 1f29a74
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ Download [https://github.com/softmonkeyjapan/angular-google-picker/archive/0.2.1
 5. Add the directive to your HTML element
 
   ```html
-  <a href="javascript:;" lk-google-picker on-picked="onPicked" on-loaded="onLoaded" on-cancel="onCancel">Open my Google Drive</a>
+  <a href="javascript:;" lk-google-picker on-picked="onPicked(docs)" on-loaded="onLoaded()" on-cancel="onCancel()">Open my Google Drive</a>
   ```
 
 6. That's it, you're done!
@@ -195,7 +195,7 @@ angular.module('myApp', ['lk-google-picker'])
 ```
 
 ```html
-<a href="javascript:;" lk-google-picker on-loaded="onLoaded">Open my Google Drive</a>
+<a href="javascript:;" lk-google-picker on-loaded="onLoaded()">Open my Google Drive</a>
 ```
 
 ### onPicked

diff --git a/dist/google-picker.js b/dist/google-picker.js
@@ -51,9 +51,9 @@
     return {
       restrict: 'A',
       scope: {
-        onLoaded: '=',
-        onCancel: '=',
-        onPicked: '='
+        onLoaded: '&',
+        onCancel: '&',
+        onPicked: '&'
       },
       link: function (scope, element, attrs) {
         var accessToken = null;
@@ -127,13 +127,13 @@
         function pickerResponse (data) {
           gapi.client.load('drive', 'v2', function () {
             if (data.action == google.picker.Action.LOADED && scope.onLoaded) {
-              scope.onLoaded();
+              (scope.onLoaded || angular.noop)();
             }
             if (data.action == google.picker.Action.CANCEL && scope.onCancel) {
-              scope.onCancel();
+              (scope.onCancel || angular.noop)();
             }
             if (data.action == google.picker.Action.PICKED && scope.onPicked) {
-              scope.onPicked(data.docs);
+              (scope.onPicked || angular.noop)({docs: data.docs});
             }
             scope.$apply();
           });

diff --git a/dist/google-picker.min.js b/dist/google-picker.min.js
diff --git a/example/google-picker.min.js b/example/google-picker.min.js
diff --git a/example/index.html b/example/index.html
@@ -40,7 +40,7 @@
             </p>
 
             <div>
-              <a href="javascript:;" lk-google-picker on-picked="onPicked" on-loaded="onLoaded" on-cancel="onCancel" class="btn btn-2 btn-2c btn-blue">
+              <a href="javascript:;" lk-google-picker on-picked="onPicked(docs)" on-loaded="onLoaded()" on-cancel="onCancel()" class="btn btn-2 btn-2c btn-blue">
                 <i class="fa fa-inbox"></i>
                 <span>Pick files</span>
               </a>

diff --git a/src/google-picker.js b/src/google-picker.js
@@ -51,9 +51,9 @@
     return {
       restrict: 'A',
       scope: {
-        onLoaded: '=',
-        onCancel: '=',
-        onPicked: '='
+        onLoaded: '&',
+        onCancel: '&',
+        onPicked: '&'
       },
       link: function (scope, element, attrs) {
         var accessToken = null;
@@ -127,13 +127,13 @@
         function pickerResponse (data) {
           gapi.client.load('drive', 'v2', function () {
             if (data.action == google.picker.Action.LOADED && scope.onLoaded) {
-              scope.onLoaded();
+              (scope.onLoaded || angular.noop)();
             }
             if (data.action == google.picker.Action.CANCEL && scope.onCancel) {
-              scope.onCancel();
+              (scope.onCancel || angular.noop)();
             }
             if (data.action == google.picker.Action.PICKED && scope.onPicked) {
-              scope.onPicked(data.docs);
+              (scope.onPicked || angular.noop)({docs: data.docs});
             }
             scope.$apply();
           });