impr: implemented correct "items" behaviour

JohnnyTheTank · Dec 21, 2015 · 0605931 · 0605931
1 parent 8cc9886
commit 0605931
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
     <script src="bower_components/angular-facebook-api-factory/src/angular-facebook-api-factory.js"></script>
     ```
 
-4. Use the factory `facebookFactory`.
+4. Use the factory `facebookFactory`
 
 
 ### factory methods
@@ -25,7 +25,7 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
 ```js
 facebookFactory.getPostsFromPageById({
     pageId:"<PAGE_ID>",
-    limit:"<LIMIT>", // (optional) default: 20
+    limit:"<LIMIT>", // (optional) valid values: 0-100 | default: 25
     until:"<UNTIL>", // (optional)
     since:"<SINCE>", // (optional)
     __previous:"<PREVIOUS>", // (optional)
@@ -43,7 +43,7 @@ facebookFactory.getPostsFromPageById({
 ```js
 facebookFactory.getPhotosFromPageById({
     page:"<PAGE>", // ID or name
-    limit:"<LIMIT>", // (optional) default: 20
+    limit:"<LIMIT>", // (optional) valid values: 0-100 | default: 25
     before:"<BEFORE>", // (optional)
     after:"<AFTER>", // (optional)
     access_token:"<ACCESS_TOKEN>"
@@ -59,7 +59,7 @@ facebookFactory.getPhotosFromPageById({
 ```js
 facebookFactory.getVideosFromPageById({
     pageId:"<PAGE_ID>",
-    limit:"<LIMIT>", // (optional) default: 20
+    limit:"<LIMIT>", // (optional) valid values: 0-100 | default: 25
     before:"<BEFORE>", // (optional)
     after:"<AFTER>", // (optional)
     access_token:"<ACCESS_TOKEN>"
@@ -75,7 +75,7 @@ facebookFactory.getVideosFromPageById({
 ```js
 facebookFactory.getEventsFromPageById({
     pageId:"<PAGE_ID>",
-    limit:"<LIMIT>", // (optional) default: 20
+    limit:"<LIMIT>", // (optional) valid values: 0-100 | default: 25
     before:"<BEFORE>", // (optional)
     after:"<AFTER>", // (optional)
     access_token:"<ACCESS_TOKEN>"

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-facebook-api-factory",
   "description": "angularjs factory for facebook json rest api requests",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "Gruntfile.js",
   "authors": [
     "Jonathan Hornung"
@@ -26,6 +26,6 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "~1.4.7"
+    "angular": "*"
   }
 }
diff --git a/demo/js/app.js b/demo/js/app.js
@@ -1,47 +1,44 @@
 var app = angular.module("app", ['jtt_facebook']);
 app.controller('controller', ['$scope', 'facebookFactory', function($scope, facebookFactory) {
 
-    var _acces_token = "<YOUR_FACEBOOK_ACCESS_TOKEN>";
+    var _access_token = '<YOUR_FACEBOOK_ACCESS_TOKEN>';
 
     facebookFactory.getPostsFromPageById({
         page:"147615681968982",
-        limit:20,
-        access_token:_acces_token,
+        limit:100,
+        access_token:_access_token,
     }).success(function(_data){
         console.log("posts");
         console.log(_data);
     });
 
     facebookFactory.getPhotosFromPageById({
         page:"147615681968982",
-        limit:20,
-        access_token:_acces_token,
+        access_token:_access_token,
     }).success(function(_data){
         console.log("photos");
         console.log(_data);
     });
 
     facebookFactory.getVideosFromPageById({
         page:"147615681968982",
-        limit:20,
-        access_token:_acces_token,
+        access_token:_access_token,
     }).success(function(_data){
         console.log("videos");
         console.log(_data);
     });
 
     facebookFactory.getEventsFromPageById({
         page:"147615681968982",
-        limit:20,
-        access_token:_acces_token,
+        access_token:_access_token,
     }).success(function(_data){
         console.log("events");
         console.log(_data);
     });
 
     facebookFactory.getPageById({
         page:"147615681968982",
-        access_token:_acces_token,
+        access_token:_access_token,
     }).success(function(_data){
         console.log("page");
         console.log(_data);

diff --git a/dist/angular-facebook-api-factory.min.js b/dist/angular-facebook-api-factory.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-facebook-api-factory",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "angularjs factory for facebook json rest api requests",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/angular-facebook-api-factory.js b/src/angular-facebook-api-factory.js
@@ -89,17 +89,19 @@ angular.module("jtt_facebook", [])
         this.getNew = function (_type, _params) {
 
             var facebookSearchData = {
-                object: {},
+                object: {
+                    access_token:_params.access_token || undefined,
+                },
                 url: "",
             };
 
+            if (typeof _params.limit !== "undefined") {
+                facebookSearchData.object.limit = _params.limit;
+            }
+
             switch (_type) {
                 case "postsFromPageById":
-                    facebookSearchData.object = {
-                        fields:"id,message,story,created_time,full_picture,from,link,description,type,shares,source,picture,object_id",
-                        limit:_params.limit || 20,
-                        access_token:_params.access_token,
-                    };
+                    facebookSearchData.object.fields = "id,message,story,created_time,full_picture,from,link,description,type,shares,source,picture,object_id";
 
                     facebookSearchData = this.fillDataInObjectByList(facebookSearchData, _params, [
                         '__paging_token', 'until', 'since', '__previous'
@@ -110,11 +112,7 @@ angular.module("jtt_facebook", [])
 
                 case "photosFromPageById":
 
-                    facebookSearchData.object = {
-                        fields:"id,created_time,from,link,picture,album,name,images",
-                        limit:_params.limit || 20,
-                        access_token:_params.access_token,
-                    };
+                    facebookSearchData.object.fields = "id,created_time,from,link,picture,album,name,images";
 
                     facebookSearchData = this.fillDataInObjectByList(facebookSearchData, _params, [
                         'before', 'after'
@@ -125,11 +123,7 @@ angular.module("jtt_facebook", [])
 
                 case "videosFromPageById":
 
-                    facebookSearchData.object = {
-                        fields:"id,created_time,from,description,source,picture,format,title,embed_html,permalink_url",
-                        limit:_params.limit || 20,
-                        access_token:_params.access_token,
-                    };
+                    facebookSearchData.object.fields = "id,created_time,from,description,source,picture,format,title,embed_html,permalink_url";
 
                     facebookSearchData = this.fillDataInObjectByList(facebookSearchData, _params, [
                         'before', 'after'
@@ -140,11 +134,7 @@ angular.module("jtt_facebook", [])
 
                 case "eventsFromPageById":
 
-                    facebookSearchData.object = {
-                        fields:"id,owner,description,picture{url},end_time,name,cover,category,place,start_time,ticket_uri",
-                        limit:_params.limit || 20,
-                        access_token:_params.access_token,
-                    };
+                    facebookSearchData.object.fields = "id,owner,description,picture{url},end_time,name,cover,category,place,start_time,ticket_uri";
 
                     facebookSearchData = this.fillDataInObjectByList(facebookSearchData, _params, [
                         'before', 'after'
@@ -155,10 +145,9 @@ angular.module("jtt_facebook", [])
 
                 case "pageById":
 
-                    facebookSearchData.object = {
-                        fields:"cover,link,picture{url},username,name",
-                        access_token:_params.access_token,
-                    };
+                    facebookSearchData.object.fields = "cover,link,picture{url},username,name";
+
+                    facebookSearchData.object.limit = undefined;
 
                     facebookSearchData.url = this.getApiBaseUrl()+_params.page+"/";
                     break;