Skip to content

Commit

Permalink
small changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnnyTheTank
JohnnyTheTank committed Jan 10, 2016
1 parent 94dfd28 commit aef2cad
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 78 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 <[email protected]>"
],
"version": "0.7.0",
"description": "facebook plugin for apiNG",
"version": "0.7.t",
"description": "Facebook plugin for apiNG",
"main": "dist/angular-plugin-facebook.min.js",
"moduleType": [],
"keywords": [
Expand Down
68 changes: 32 additions & 36 deletions dist/aping-plugin-facebook.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
@name: aping-plugin-facebook
@version: 0.7.0 (09-01-2016)
@version: 0.7.5 (10-01-2016)
@author: Jonathan Hornung
@url: https://github.com/JohnnyTheTank/apiNG-plugin-facebook#readme
@url: https://github.com/JohnnyTheTank/apiNG-plugin-facebook
@license: MIT
*/
"use strict";
Expand All @@ -16,7 +16,6 @@ var jjtApingFacebook = angular.module("jtt_aping_facebook", ['jtt_facebook'])
link: function (scope, element, attrs, apingController) {

var appSettings = apingController.getAppSettings();

var requests = apingUtilityHelper.parseJsonFromAttributes(attrs.apingFacebook, apingFacebookHelper.getThisPlattformString(), appSettings);

requests.forEach(function (request) {
Expand Down Expand Up @@ -145,7 +144,6 @@ var jjtApingFacebook = angular.module("jtt_aping_facebook", ['jtt_facebook'])
apingController.concatToResults(apingFacebookHelper.getObjectByJsonData(_data, appSettings));
}
});

});
} else {
facebookFactory.getEventsFromPageById(requestObject)
Expand All @@ -157,9 +155,7 @@ var jjtApingFacebook = angular.module("jtt_aping_facebook", ['jtt_facebook'])
}
break;
}

}

});
}
}
Expand All @@ -182,17 +178,17 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
*/
this.getRatioFromFormatObject = function (_format) {
var ratio = {
width:undefined,
height:undefined,
width: undefined,
height: undefined,
};
if (typeof _format !== "undefined" && _format.constructor === Array) {
angular.forEach(_format, function (value, key) {
if(typeof value.filter !== "undefined") {
if(value.filter === "native") {
if(typeof value.width !== "undefined") {
if (typeof value.filter !== "undefined") {
if (value.filter === "native") {
if (typeof value.width !== "undefined") {
ratio.width = value.width;
}
if(typeof value.height !== "undefined") {
if (typeof value.height !== "undefined") {
ratio.height = value.height;
}
}
Expand All @@ -210,7 +206,7 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
* @returns {number}
*/
this.getDifference = function (_int1, _int2) {
if(_int1 > _int2) {
if (_int1 > _int2) {
return _int1 - _int2;
} else {
return _int2 - _int1;
Expand Down Expand Up @@ -241,13 +237,13 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper

if (_array.constructor === Array) {
angular.forEach(_array, function (value, key) {
if(typeof value.source !== "undefined") {
if(typeof returnObject.thumb_url === "undefined") {
if (typeof value.source !== "undefined") {
if (typeof returnObject.thumb_url === "undefined") {
returnObject.thumb_url = value.source;
returnObject.thumb_width = value.width;
returnObject.thumb_height = value.height;
} else {
if(
if (
that.getDifference(returnObject.thumb_width, 200) > that.getDifference(value.width, 200)
&&
value.width >= 200
Expand All @@ -258,12 +254,12 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
}
}

if(typeof returnObject.img_url === "undefined") {
if (typeof returnObject.img_url === "undefined") {
returnObject.img_url = value.source;
returnObject.img_width = value.width;
returnObject.img_height = value.height;
} else {
if(
if (
that.getDifference(returnObject.img_width, 700) > that.getDifference(value.width, 700)
) {
returnObject.img_url = value.source;
Expand All @@ -272,12 +268,12 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
}
}

if(typeof returnObject.native_url === "undefined") {
if (typeof returnObject.native_url === "undefined") {
returnObject.native_url = value.source;
returnObject.native_width = value.width;
returnObject.native_height = value.height;
} else {
if(
if (
value.width > returnObject.native_width
) {
returnObject.native_url = value.source;
Expand All @@ -302,12 +298,12 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper

angular.forEach(_data.data.data, 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);
}
if(tempResult) {
if (tempResult) {
requestResults.push(tempResult);
}
});
Expand Down Expand Up @@ -351,7 +347,7 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
intern_type: _item.type,
intern_id: _item.id,
img_url: _item.full_picture,
timestamp: apingTimeHelper.getTimestampFromDateString(_item.created_time, 1000, 3600*1000)
timestamp: apingTimeHelper.getTimestampFromDateString(_item.created_time, 1000, 3600 * 1000)
});

socialObject.date_time = new Date(socialObject.timestamp);
Expand Down Expand Up @@ -406,7 +402,7 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
}

if ((_helperObject.showAvatar === true || _helperObject.showAvatar === "true") && !socialObject.img_url) {
if(facebookPagesImages[_item.from.id]) {
if (facebookPagesImages[_item.from.id]) {
socialObject.img_url = facebookPagesImages[_item.from.id];
}
}
Expand All @@ -424,19 +420,19 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
blog_link: this.getThisPlattformLink() + _item.from.id + "/",
intern_id: _item.id,
post_url: _item.permalink_url,
timestamp: apingTimeHelper.getTimestampFromDateString(_item.created_time, 1000, 3600*1000),
timestamp: apingTimeHelper.getTimestampFromDateString(_item.created_time, 1000, 3600 * 1000),
text: _item.description,
markup: _item.embed_html || undefined,
source: _item.source || undefined,
});

videoObject.date_time = new Date(videoObject.timestamp);

if(typeof _item.length !== "undefined") {
if (typeof _item.length !== "undefined") {
videoObject.length = _item.length;
}

if(typeof _item.format !== "undefined") {
if (typeof _item.format !== "undefined") {
if (_item.format.length > 0) {

if (_item.format.length >= 3) {
Expand All @@ -446,17 +442,17 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
}

var ratio = this.getRatioFromFormatObject(_item.format);
if(typeof ratio.width !== "undefined") {
if (typeof ratio.width !== "undefined") {
videoObject.width = ratio.width;
}
if(typeof ratio.height !== "undefined") {
if (typeof ratio.height !== "undefined") {
videoObject.height = ratio.height;
}
}
}

if ((_helperObject.showAvatar === true || _helperObject.showAvatar === "true") && !videoObject.img_url) {
if(facebookPagesImages[_item.from.id]) {
if (facebookPagesImages[_item.from.id]) {
videoObject.img_url = facebookPagesImages[_item.from.id];
}
}
Expand All @@ -473,7 +469,7 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
blog_link: this.getThisPlattformLink() + _item.from.id + "/",
intern_id: _item.id,
post_url: _item.link,
timestamp: apingTimeHelper.getTimestampFromDateString(_item.created_time, 1000, 3600*1000),
timestamp: apingTimeHelper.getTimestampFromDateString(_item.created_time, 1000, 3600 * 1000),
text: _item.name || undefined,
source: _item.images || undefined,
});
Expand All @@ -500,17 +496,17 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
intern_id: _item.id,
event_url: this.getThisPlattformLink() + _item.owner.id + "_" + _item.id + "/",
ticket_url: _item.ticket_uri || undefined,
start_timestamp: apingTimeHelper.getTimestampFromDateString(_item.start_time, 1000, 3600*1000),
end_timestamp: _item.end_time ? apingTimeHelper.getTimestampFromDateString(_item.end_time, 1000, 3600*1000) : undefined,
start_timestamp: apingTimeHelper.getTimestampFromDateString(_item.start_time, 1000, 3600 * 1000),
end_timestamp: _item.end_time ? apingTimeHelper.getTimestampFromDateString(_item.end_time, 1000, 3600 * 1000) : undefined,
caption: _item.name || undefined,
text: _item.description || undefined,
img_url: _item.cover ? _item.cover.source : undefined,
});

if(eventObject.start_timestamp) {
if (eventObject.start_timestamp) {
eventObject.start_date_time = new Date(eventObject.start_timestamp);
}
if(eventObject.end_timestamp) {
if (eventObject.end_timestamp) {
eventObject.end_date_time = new Date(eventObject.end_timestamp);
}

Expand All @@ -528,7 +524,7 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
}

if ((_helperObject.showAvatar === true || _helperObject.showAvatar === "true") && !eventObject.img_url) {
if(facebookPagesImages[_item.from.id]) {
if (facebookPagesImages[_item.from.id]) {
eventObject.img_url = facebookPagesImages[_item.from.id];
}
}
Expand Down
Loading

0 comments on commit aef2cad

Please sign in to comment.