Skip to content

Commit

Permalink
small updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnnyTheTank
JohnnyTheTank committed Jan 10, 2016
1 parent cfed592 commit c91ea5c
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"authors": [
"Jonathan Hornung <jonathan.hornung@gmail.com>"
],
"version": "0.7.1",
"description": "dailymotion plugin for apiNG",
"version": "0.7.5",
"description": "Dailymotion plugin for apiNG",
"main": "dist/aping-plugin-dailymotion.min.js",
"moduleType": [],
"keywords": [
Expand Down
36 changes: 18 additions & 18 deletions dist/aping-plugin-dailymotion.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
@name: aping-plugin-dailymotion
@version: 0.7.1 (09-01-2016)
@author: Jonathan Hornung
@version: 0.7.5 (10-01-2016)
@author: Jonathan Hornung <jonathan.hornung@gmail.com>
@url: https://github.com/JohnnyTheTank/apiNG-plugin-dailymotion#readme
@license: MIT
*/
Expand All @@ -25,7 +25,7 @@ var jjtApingDailymotion = angular.module("jtt_aping_dailymotion", ['jtt_dailymot
var helperObject = {
model: appSettings.model,
};
if(typeof appSettings.getNativeData !== "undefined") {
if (typeof appSettings.getNativeData !== "undefined") {
helperObject.getNativeData = appSettings.getNativeData;
} else {
helperObject.getNativeData = false;
Expand All @@ -34,40 +34,40 @@ var jjtApingDailymotion = angular.module("jtt_aping_dailymotion", ['jtt_dailymot
//create requestObject for api request call
var requestObject = {};

if(typeof request.items !== "undefined") {
if (typeof request.items !== "undefined") {
requestObject.limit = request.items;
} else {
requestObject.limit = appSettings.items;
}

if(requestObject.limit == 0) {
if (requestObject.limit == 0) {
return false;
}

// -1 is "no explicit limit". same for NaN value
if(requestObject.limit < 0 || isNaN(requestObject.limit)) {
if (requestObject.limit < 0 || isNaN(requestObject.limit)) {
requestObject.limit = undefined;
}

// the api has a limit of 100 items per request
if(requestObject.limit > 100) {
if (requestObject.limit > 100) {
requestObject.limit = 100;
}

if(typeof request.search !== "undefined") {
if (typeof request.search !== "undefined") {
requestObject.search = request.search;
}

if(typeof request.tags !== "undefined") {
if (typeof request.tags !== "undefined") {
requestObject.tags = request.tags;
}

if(request.userId) {
if (request.userId) {

requestObject.id = request.userId;
requestObject.sort = 'recent';

if(typeof request.channelId !== "undefined") {
if (typeof request.channelId !== "undefined") {
requestObject.channel = request.channelId;
}

Expand Down Expand Up @@ -101,15 +101,15 @@ var jjtApingDailymotion = angular.module("jtt_aping_dailymotion", ['jtt_dailymot
});
} else {

if(typeof request.genre !== "undefined") {
if (typeof request.genre !== "undefined") {
requestObject.genre = request.genre;
}

if(typeof request.country !== "undefined") {
if (typeof request.country !== "undefined") {
requestObject.country = request.country;
}

if(typeof request.language !== "undefined") {
if (typeof request.language !== "undefined") {
requestObject.detected_language = request.language;
}

Expand Down Expand Up @@ -147,12 +147,12 @@ jjtApingDailymotion.service('apingDailymotionHelper', ['apingModels', 'apingTime

angular.forEach(_data.data.list, function (value, key) {
var tempResult;
if(_helperObject.getNativeData === true || _helperObject.getNativeData === "true") {
if (_helperObject.getNativeData === true || _helperObject.getNativeData === "true") {
tempResult = value;
} else {
tempResult = _this.getItemByJsonData(value, _helperObject.model);
}
if(tempResult) {
if (tempResult) {
requestResults.push(tempResult);
}
});
Expand Down Expand Up @@ -186,7 +186,7 @@ jjtApingDailymotion.service('apingDailymotionHelper', ['apingModels', 'apingTime
//fill _item in socialObject
$.extend(true, socialObject, {
"blog_name": _item['owner.screenname'] || undefined,
"blog_id": _item['owner.id'] || undefined,
"blog_id": _item['owner.id'] || undefined,
"blog_link": _item['owner.url'] || undefined,
"type": _item.item_type || _item.media_type || undefined,
"timestamp": _item.created_time * 1000,
Expand All @@ -212,7 +212,7 @@ jjtApingDailymotion.service('apingDailymotionHelper', ['apingModels', 'apingTime
//fill _item in videoObject
$.extend(true, videoObject, {
blog_name: _item['owner.screenname'] || undefined,
blog_id: _item['owner.id'] || undefined,
blog_id: _item['owner.id'] || undefined,
blog_link: _item['owner.url'] || undefined,
type: _item.item_type || _item.media_type || undefined,
timestamp: _item.created_time * 1000,
Expand Down
4 changes: 2 additions & 2 deletions dist/aping-plugin-dailymotion.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aping-plugin-dailymotion",
"version": "0.7.1",
"description": "dailymotion plugin for apiNG",
"version": "0.7.5",
"description": "Dailymotion plugin for apiNG",
"main": "dist/aping-plugin-dailymotion.min.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand All @@ -19,7 +19,7 @@
"json",
"angular"
],
"author": "Jonathan Hornung",
"author": "Jonathan Hornung <jonathan.hornung@gmail.com>",
"license": "MIT",
"bugs": {
"url": "https://github.com/JohnnyTheTank/apiNG-plugin-dailymotion/issues"
Expand Down
24 changes: 12 additions & 12 deletions src/aping-dailymotion-directive.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var jjtApingDailymotion = angular.module("jtt_aping_dailymotion", ['jtt_dailymot
var helperObject = {
model: appSettings.model,
};
if(typeof appSettings.getNativeData !== "undefined") {
if (typeof appSettings.getNativeData !== "undefined") {
helperObject.getNativeData = appSettings.getNativeData;
} else {
helperObject.getNativeData = false;
Expand All @@ -27,40 +27,40 @@ var jjtApingDailymotion = angular.module("jtt_aping_dailymotion", ['jtt_dailymot
//create requestObject for api request call
var requestObject = {};

if(typeof request.items !== "undefined") {
if (typeof request.items !== "undefined") {
requestObject.limit = request.items;
} else {
requestObject.limit = appSettings.items;
}

if(requestObject.limit == 0) {
if (requestObject.limit == 0) {
return false;
}

// -1 is "no explicit limit". same for NaN value
if(requestObject.limit < 0 || isNaN(requestObject.limit)) {
if (requestObject.limit < 0 || isNaN(requestObject.limit)) {
requestObject.limit = undefined;
}

// the api has a limit of 100 items per request
if(requestObject.limit > 100) {
if (requestObject.limit > 100) {
requestObject.limit = 100;
}

if(typeof request.search !== "undefined") {
if (typeof request.search !== "undefined") {
requestObject.search = request.search;
}

if(typeof request.tags !== "undefined") {
if (typeof request.tags !== "undefined") {
requestObject.tags = request.tags;
}

if(request.userId) {
if (request.userId) {

requestObject.id = request.userId;
requestObject.sort = 'recent';

if(typeof request.channelId !== "undefined") {
if (typeof request.channelId !== "undefined") {
requestObject.channel = request.channelId;
}

Expand Down Expand Up @@ -94,15 +94,15 @@ var jjtApingDailymotion = angular.module("jtt_aping_dailymotion", ['jtt_dailymot
});
} else {

if(typeof request.genre !== "undefined") {
if (typeof request.genre !== "undefined") {
requestObject.genre = request.genre;
}

if(typeof request.country !== "undefined") {
if (typeof request.country !== "undefined") {
requestObject.country = request.country;
}

if(typeof request.language !== "undefined") {
if (typeof request.language !== "undefined") {
requestObject.detected_language = request.language;
}

Expand Down
8 changes: 4 additions & 4 deletions src/aping-dailymotion-helper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jjtApingDailymotion.service('apingDailymotionHelper', ['apingModels', 'apingTime

angular.forEach(_data.data.list, function (value, key) {
var tempResult;
if(_helperObject.getNativeData === true || _helperObject.getNativeData === "true") {
if (_helperObject.getNativeData === true || _helperObject.getNativeData === "true") {
tempResult = value;
} else {
tempResult = _this.getItemByJsonData(value, _helperObject.model);
}
if(tempResult) {
if (tempResult) {
requestResults.push(tempResult);
}
});
Expand Down Expand Up @@ -60,7 +60,7 @@ jjtApingDailymotion.service('apingDailymotionHelper', ['apingModels', 'apingTime
//fill _item in socialObject
$.extend(true, socialObject, {
"blog_name": _item['owner.screenname'] || undefined,
"blog_id": _item['owner.id'] || undefined,
"blog_id": _item['owner.id'] || undefined,
"blog_link": _item['owner.url'] || undefined,
"type": _item.item_type || _item.media_type || undefined,
"timestamp": _item.created_time * 1000,
Expand All @@ -86,7 +86,7 @@ jjtApingDailymotion.service('apingDailymotionHelper', ['apingModels', 'apingTime
//fill _item in videoObject
$.extend(true, videoObject, {
blog_name: _item['owner.screenname'] || undefined,
blog_id: _item['owner.id'] || undefined,
blog_id: _item['owner.id'] || undefined,
blog_link: _item['owner.url'] || undefined,
type: _item.item_type || _item.media_type || undefined,
timestamp: _item.created_time * 1000,
Expand Down

0 comments on commit c91ea5c

Please sign in to comment.