updated to new apiNG structure

JohnnyTheTank · Jan 11, 2016 · 414c307 · 414c307
1 parent 0ee8d4b
commit 414c307
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 52 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Jonathan Hornung
+Copyright (c) 2016 Jonathan Hornung
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/bower.json b/bower.json
@@ -4,8 +4,8 @@
   "authors": [
     "Jonathan Hornung <jonathan.hornung@gmail.com>"
   ],
-  "version": "0.7.0",
-  "description": "tumblr plugin for apiNG",
+  "version": "0.7.6",
+  "description": "Tumblr plugin for apiNG",
   "main": "dist/aping-plugin-tumblr.min.js",
   "moduleType": [],
   "keywords": [

diff --git a/demo/aping-config.js b/demo/aping-config.js
@@ -1,21 +1,13 @@
 "use strict";
 apingApp.config(['$provide', function ($provide) {
-
-    $provide.constant("apingApiKeys", {
-        tumblr: [
-            {'api_key':'<YOUR_TUMBLR_API_KEY>'},
-        ],
+    $provide.value("apingDefaultSettings", {
+        apingApiKeys : {
+            //...
+            tumblr: [
+                //{'api_key':'<YOUR_TUMBLR_API_KEY>'},
+                {'api_key':'lINWJaOl0lu3ajBn5tdqJgs8IFisHu5GJ8hBYzR41f4BHEl9E6'},
+            ],
+            //...
+        }
     });
-
-    $provide.constant("apingDefaultSettings", {
-        templateUrl : "aping_design_blanko.html",
-        items : 20, //items per request
-        maxItems: 100, //max items per aping
-        orderBy : "timestamp",
-        orderReverse : "true",
-        model: "social",
-        getNativeData: false,
-        removeDoubles: false,
-    });
-
 }]);
diff --git a/demo/index.html b/demo/index.html
@@ -15,13 +15,15 @@
 
     <h1>{'page':'camaradakalderra', 'tag':'soccer'}</h1>
     <aping
+            template-url="template.html"
             model="image"
             items="15"
             aping-tumblr="[{'page':'camaradakalderra', 'tag':'soccer'}]">
     </aping>
     <hr>
     <h1>{'page':'namikamusik'}</h1>
     <aping
+            template-url="template.html"
             model="image"
             aping-tumblr="[{'page':'namikamusik'}]">
     </aping>

diff --git a/demo/aping_design_blanko.html → demo/template.html b/demo/aping_design_blanko.html → demo/template.html
diff --git a/dist/aping-plugin-tumblr.js b/dist/aping-plugin-tumblr.js
@@ -1,8 +1,8 @@
 /**
     @name: aping-plugin-tumblr 
-    @version: 0.7.0 (09-01-2016) 
-    @author: Jonathan Hornung 
-    @url: https://github.com/JohnnyTheTank/apiNG-plugin-tumblr#readme 
+    @version: 0.7.6 (11-01-2016) 
+    @author: Jonathan Hornung <jonathan.hornung@gmail.com> 
+    @url: https://github.com/JohnnyTheTank/apiNG-plugin-tumblr 
     @license: MIT
 */
 "use strict";
@@ -17,7 +17,7 @@ var jjtApingTumblr = angular.module("jtt_aping_tumblr", ['jtt_tumblr'])
 
                 var appSettings = apingController.getAppSettings();
 
-                var requests = apingUtilityHelper.parseJsonFromAttributes(attrs.apingTumblr, apingTumblrHelper.getThisPlattformString(), appSettings);
+                var requests = apingUtilityHelper.parseJsonFromAttributes(attrs.apingTumblr, apingTumblrHelper.getThisPlatformString(), appSettings);
 
                 requests.forEach(function (request) {
 
@@ -33,7 +33,7 @@ var jjtApingTumblr = angular.module("jtt_aping_tumblr", ['jtt_tumblr'])
 
                     //create requestObject for api request call
                     var requestObject = {
-                        api_key: apingUtilityHelper.getApiCredentials(apingTumblrHelper.getThisPlattformString(), "api_key"),
+                        api_key: apingUtilityHelper.getApiCredentials(apingTumblrHelper.getThisPlatformString(), "api_key"),
                         filter:"text",
 
                     };
@@ -44,7 +44,7 @@ var jjtApingTumblr = angular.module("jtt_aping_tumblr", ['jtt_tumblr'])
                         requestObject.limit = appSettings.items;
                     }
 
-                    if(requestObject.limit == 0) {
+                    if (requestObject.limit === 0 || requestObject.limit === '0') {
                         return false;
                     }
 
@@ -62,10 +62,6 @@ var jjtApingTumblr = angular.module("jtt_aping_tumblr", ['jtt_tumblr'])
                         requestObject.tag = request.tag;
                     }
 
-                    if(requestObject.limit == 0) {
-                        return false;
-                    }
-
                     if(request.page) {
 
                         requestObject.page = request.page;
@@ -99,7 +95,7 @@ var jjtApingTumblr = angular.module("jtt_aping_tumblr", ['jtt_tumblr'])
     }]);;"use strict";
 
 jjtApingTumblr.service('apingTumblrHelper', ['apingModels', 'apingTimeHelper', 'apingUtilityHelper', function (apingModels, apingTimeHelper, apingUtilityHelper) {
-    this.getThisPlattformString = function () {
+    this.getThisPlatformString = function () {
         return "tumblr";
     };
 
@@ -243,7 +239,7 @@ jjtApingTumblr.service('apingTumblrHelper', ['apingModels', 'apingTimeHelper', '
     };
 
     this.getSocialItemByJsonData = function (_item) {
-        var socialObject = apingModels.getNew("social", this.getThisPlattformString());
+        var socialObject = apingModels.getNew("social", this.getThisPlatformString());
 
         //fill _item in socialObject
         $.extend(true, socialObject, {
@@ -319,7 +315,7 @@ jjtApingTumblr.service('apingTumblrHelper', ['apingModels', 'apingTimeHelper', '
     };
 
     this.getVideoItemByJsonData = function (_item) {
-        var videoObject = apingModels.getNew("video", this.getThisPlattformString());
+        var videoObject = apingModels.getNew("video", this.getThisPlatformString());
 
         //fill _item in videoObject
         $.extend(true, videoObject, {
@@ -349,7 +345,7 @@ jjtApingTumblr.service('apingTumblrHelper', ['apingModels', 'apingTimeHelper', '
     };
 
     this.getImageItemByJsonData = function (_item) {
-        var imageObject = apingModels.getNew("image", this.getThisPlattformString());
+        var imageObject = apingModels.getNew("image", this.getThisPlatformString());
 
         //fill _item in imageObject
         $.extend(true, imageObject, {

diff --git a/dist/aping-plugin-tumblr.min.js b/dist/aping-plugin-tumblr.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "aping-plugin-tumblr",
-  "version": "0.7.0",
-  "description": "tumblr plugin for apiNG",
+  "version": "0.7.6",
+  "description": "Tumblr plugin for apiNG",
   "main": "dist/aping-plugin-tumblr.min.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -19,12 +19,12 @@
     "json",
     "angular"
   ],
-  "author": "Jonathan Hornung",
+  "author": "Jonathan Hornung <jonathan.hornung@gmail.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/JohnnyTheTank/apiNG-plugin-tumblr/issues"
   },
-  "homepage": "https://github.com/JohnnyTheTank/apiNG-plugin-tumblr#readme",
+  "homepage": "https://github.com/JohnnyTheTank/apiNG-plugin-tumblr",
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-concat": "^0.5.1",