chore: bump version

JohnnyTheTank · Mar 12, 2016 · cf1313a · cf1313a
1 parent 424386e
commit cf1313a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 31 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <jonathan.hornung@gmail.com>"
   ],
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "Dailymotion plugin for apiNG",
   "main": "dist/aping-plugin-dailymotion.min.js",
   "moduleType": [],

diff --git a/dist/aping-plugin-dailymotion.js b/dist/aping-plugin-dailymotion.js
@@ -1,6 +1,6 @@
 /**
     @name: aping-plugin-dailymotion 
-    @version: 0.7.9 (02-02-2016) 
+    @version: 0.7.10 (12-03-2016) 
     @author: Jonathan Hornung <jonathan.hornung@gmail.com> 
     @url: https://github.com/JohnnyTheTank/apiNG-plugin-dailymotion#readme 
     @license: MIT
@@ -14,119 +14,97 @@ angular.module("jtt_aping_dailymotion", ['jtt_dailymotion'])
             restrict: 'A',
             replace: 'false',
             link: function (scope, element, attrs, apingController) {
-
                 var appSettings = apingController.getAppSettings();
-
                 var requests = apingUtilityHelper.parseJsonFromAttributes(attrs.apingDailymotion, apingDailymotionHelper.getThisPlattformString(), appSettings);
 
                 requests.forEach(function (request) {
-
                     //create helperObject for helper function call
                     var helperObject = {
                         model: appSettings.model,
                     };
-
                     if (angular.isDefined(appSettings.getNativeData)) {
                         helperObject.getNativeData = appSettings.getNativeData;
                     } else {
                         helperObject.getNativeData = false;
                     }
-
                     if (request.protocol === "http" || request.protocol === "https") {
                         helperObject.protocol = request.protocol + "://";
+                    } else  if (appSettings.protocol === "http" || appSettings.protocol === "https") {
+                        helperObject.protocol = appSettings.protocol + "://";
+                    } else {
+                        helperObject.protocol = "//";
                     }
-
-
                     //create requestObject for api request call
                     var requestObject = {};
-
                     if (angular.isDefined(request.items)) {
                         requestObject.limit = request.items;
                     } else {
                         requestObject.limit = appSettings.items;
                     }
-
                     if (requestObject.limit === 0 || requestObject.limit === '0') {
                         return false;
                     }
-
                     // -1 is "no explicit limit". same for NaN value
                     if (requestObject.limit < 0 || isNaN(requestObject.limit)) {
                         requestObject.limit = undefined;
                     }
-
                     // the api has a limit of 100 items per request
                     if (requestObject.limit > 100) {
                         requestObject.limit = 100;
                     }
-
                     if (angular.isDefined(request.search)) {
                         requestObject.search = request.search;
                     }
-
                     if (angular.isDefined(request.tags)) {
                         requestObject.tags = request.tags;
                     }
-
                     if (request.userId) {
-
                         requestObject.id = request.userId;
                         requestObject.sort = 'recent';
-
                         if (angular.isDefined(request.channelId)) {
                             requestObject.channel = request.channelId;
                         }
-
                         dailymotionFactory.getVideosFromUserById(requestObject)
                             .then(function (_data) {
                                 if (_data) {
                                     apingController.concatToResults(apingDailymotionHelper.getObjectByJsonData(_data, helperObject));
                                 }
                             });
                     } else if (request.channelId) {
-
                         requestObject.id = request.channelId;
                         requestObject.sort = 'recent';
-
                         dailymotionFactory.getVideosFromChannelById(requestObject)
                             .then(function (_data) {
                                 if (_data) {
                                     apingController.concatToResults(apingDailymotionHelper.getObjectByJsonData(_data, helperObject));
                                 }
                             });
                     } else if (request.playlistId) {
-
                         requestObject.id = request.playlistId;
                         requestObject.sort = 'recent';
-
                         dailymotionFactory.getVideosFromPlaylistById(requestObject)
                             .then(function (_data) {
                                 if (_data) {
                                     apingController.concatToResults(apingDailymotionHelper.getObjectByJsonData(_data, helperObject));
                                 }
                             });
                     } else {
-
                         if (angular.isDefined(request.genre)) {
                             requestObject.genre = request.genre;
                         }
-
                         if (angular.isDefined(request.country)) {
                             requestObject.country = request.country;
                         }
-
                         if (angular.isDefined(request.language)) {
                             requestObject.detected_language = request.language;
                         }
-
                         dailymotionFactory.getVideosByParams(requestObject)
                             .then(function (_data) {
                                 if (_data) {
                                     apingController.concatToResults(apingDailymotionHelper.getObjectByJsonData(_data, helperObject));
                                 }
                             });
                     }
-
                 });
             }
         }

diff --git a/dist/aping-plugin-dailymotion.min.js b/dist/aping-plugin-dailymotion.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aping-plugin-dailymotion",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "Dailymotion plugin for apiNG",
   "main": "dist/aping-plugin-dailymotion.min.js",
   "scripts": {