impr: changed "type" to "model"

JohnnyTheTank · Dec 8, 2015 · a50bf50 · a50bf50
1 parent 589c0ca
commit a50bf50
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <jonathan.hornung@gmail.com>"
   ],
-  "version": "0.1.5",
+  "version": "0.1.6",
   "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
@@ -11,7 +11,7 @@ apingApp.config(['$provide', function ($provide) {
         maxItems: 100, //max items per aping
         orderBy : "timestamp",
         orderReverse : "true",
-        type: "social",
+        model: "social",
     });
 
 }]);
diff --git a/demo/index.html b/demo/index.html
@@ -15,8 +15,8 @@
     <script src="../src/aping-codebird-helper.js"></script>
 </head>
 <body ng-app="app">
-    <aping type="image" aping-codebird="[{'search':'zdf', 'result_type':'recent'}]"></aping>
+    <aping model="image" aping-codebird="[{'search':'zdf', 'result_type':'recent'}]"></aping>
     <br>
-    <aping type="social" aping-codebird="[{'user':'passy', 'showAvatar':false}]"></aping>
+    <aping model="social" aping-codebird="[{'user':'passy', 'showAvatar':false}]"></aping>
 </body>
 </html>
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.5",
+  "version": "0.1.6",
   "description": "twitter plugin for apiNG",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/aping-codebird-directive.js b/src/aping-codebird-directive.js
@@ -40,7 +40,7 @@ var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
                             "search_tweets",
                             params,
                             function (_data) {
-                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, appSettings.type, codebirdSettings));
+                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, appSettings.model, codebirdSettings));
                                 apingController.apply();
                             },
                             true
@@ -57,7 +57,7 @@ var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
                             "statuses_userTimeline",
                             params,
                             function (_data, rate, err) {
-                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, appSettings.type, codebirdSettings));
+                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, appSettings.model, codebirdSettings));
                                 apingController.apply();
                             },
                             true

diff --git a/src/aping-codebird-helper.js b/src/aping-codebird-helper.js
@@ -40,7 +40,7 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
         return false;
     };
 
-    this.getObjectByJsonData = function (_data, _type, _codebirdSettings) {
+    this.getObjectByJsonData = function (_data, _model, _codebirdSettings) {
 
         var requestResults = [];
         if (_data) {
@@ -49,14 +49,14 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
             if (_data.statuses) {
 
                 angular.forEach(_data.statuses, function (value, key) {
-                    var tempResult = _this.getItemByJsonData(value, _type, _codebirdSettings);
+                    var tempResult = _this.getItemByJsonData(value, _model, _codebirdSettings);
                     if(tempResult) {
                         requestResults.push(tempResult);
                     }
                 });
             } else if (_data.length > 0) {
                 angular.forEach(_data, function (value, key) {
-                    var tempResult = _this.getItemByJsonData(value, _type, _codebirdSettings);
+                    var tempResult = _this.getItemByJsonData(value, _model, _codebirdSettings);
                     if(tempResult) {
                         requestResults.push(tempResult);
                     }
@@ -68,10 +68,10 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
         return requestResults;
     };
 
-    this.getItemByJsonData = function (_item, _type, _codebirdSettings) {
+    this.getItemByJsonData = function (_item, _model, _codebirdSettings) {
         var returnObject = {};
-        if (_item && _type) {
-            switch (_type) {
+        if (_item && _model) {
+            switch (_model) {
                 case "social":
                     returnObject = this.getSocialItemByJsonData(_item, _codebirdSettings);
                     break;