refac: created requestObject

JohnnyTheTank · Dec 19, 2015 · 43eb419 · 43eb419
1 parent 15b8cd4
commit 43eb419
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <[email protected]>"
   ],
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "twitter plugin for apiNG",
   "main": "dist/apiNG-plugin-codebird.min.js",
   "moduleType": [],

diff --git a/demo/aping-config.js b/demo/aping-config.js
@@ -14,6 +14,7 @@ apingApp.config(['$provide', function ($provide) {
         orderBy : "timestamp",
         orderReverse : "true",
         model: "social",
+        getNativeData: false,
     });
 
 }]);
diff --git a/demo/index.html b/demo/index.html
@@ -16,7 +16,7 @@
 </head>
 <body ng-app="app">
     <h1>{'search':'münchen', 'result_type':'recent', 'language':'de'}</h1>
-    <aping model="social" items="20" aping-codebird="[{'search':'münchen', 'result_type':'recent', 'language':'de'}]"></aping>
+    <aping model="social" aping-codebird="[{'search':'münchen', 'result_type':'recent', 'language':'de'}]"></aping>
     <hr>
     <h1>{'search':'münchen', 'result_type':'recent', 'lat':'48.1374300', 'lng':'11.5754900', 'distance':5}</h1>
     <aping model="social" aping-codebird="[{'search':'münchen', 'result_type':'recent', 'lat':'48.1374300', 'lng':'11.5754900', 'distance':5}]"></aping>

diff --git a/dist/aping-plugin-codebird.min.js b/dist/aping-plugin-codebird.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aping-plugin-codebird",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "twitter plugin for apiNG",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/aping-codebird-directive.js b/src/aping-codebird-directive.js
@@ -35,26 +35,36 @@ var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
                         helperObject.getNativeData = false;
                     }
 
+                    //create requestObject for api request call
+                    var requestObject = {};
+                    if(typeof request.items !== "undefined") {
+                        requestObject.count = request.items;
+                    } else {
+                        requestObject.count = appSettings.items;
+                    }
+
                     if(request.search) {
+                        requestObject.q = request.search;
+                        requestObject.result_type = request.result_type || "mixed";
 
                         //https://dev.twitter.com/rest/reference/get/search/tweets
-                        var params = {
+                        var requestObject = {
                             q: request.search,
                             result_type: request.result_type || "mixed",
                             count:request.items || appSettings.items,
                         };
 
                         if(typeof request.lat !== "undefined" && typeof request.lng !== "undefined") {
-                            params.geocode = request.lat+","+request.lng+","+(request.distance || "1" )+"km";
+                            requestObject.geocode = request.lat+","+request.lng+","+(request.distance || "1" )+"km";
                         }
 
                         if(typeof request.language !== "undefined") {
-                            params.lang = request.language;
+                            requestObject.lang = request.language;
                         }
 
                         cb.__call(
                             "search_tweets",
-                            params,
+                            requestObject,
                             function (_data) {
                                 apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, helperObject));
                                 apingController.apply();
@@ -64,23 +74,21 @@ var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
 
                     } else if(request.user) {
                         //https://dev.twitter.com/rest/reference/get/statuses/user_timeline
-                        var params = {
-                            screen_name: request.user,
-                            contributor_details: true,
-                            count: request.items || appSettings.items
-                        };
+
+                        requestObject.screen_name = request.user;
+                        requestObject.contributor_details = true;
 
                         if(request.exclude_replies === true || request.exclude_replies === "true"){
-                            params.exclude_replies = true;
+                            requestObject.exclude_replies = true;
                         }
 
                         if(request.include_rts === false || request.include_rts === "false"){
-                            params.include_rts = false;
+                            requestObject.include_rts = false;
                         }
 
                         cb.__call(
                             "statuses_userTimeline",
-                            params,
+                            requestObject,
                             function (_data, rate, err) {
                                 apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, helperObject));
                                 apingController.apply();