impr: implemented new video model properties

JohnnyTheTank · Dec 24, 2015 · 2c005ac · 2c005ac
1 parent d570bc9
commit 2c005ac
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <[email protected]>"
   ],
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "facebook plugin for apiNG",
   "main": "dist/angular-plugin-facebook.min.js",
   "moduleType": [],

diff --git a/demo/index.html b/demo/index.html
@@ -17,7 +17,7 @@
 <body ng-app="app">
 
 <aping
-    model="social"
+    model="video"
     items="20"
     aping-facebook="[{'page':'freundevonniemand'}]">
 </aping>

diff --git a/dist/aping-plugin-facebook.min.js b/dist/aping-plugin-facebook.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aping-plugin-facebook",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "facebook plugin for apiNG",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/aping-facebook-directive.js b/src/aping-facebook-directive.js
@@ -14,8 +14,6 @@ var jjtApingFacebook = angular.module("jtt_aping_facebook", ['jtt_facebook'])
             replace: 'false',
             link: function (scope, element, attrs, apingController) {
 
-                var platform = "facebook";
-
                 var appSettings = apingController.getAppSettings();
 
                 var requests = apingUtilityHelper.parseJsonFromAttributes(attrs.apingFacebook, apingFacebookHelper.getThisPlattformString(), appSettings);

diff --git a/src/aping-facebook-helper.js b/src/aping-facebook-helper.js
@@ -15,6 +15,34 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
         return "https://facebook.com/";
     };
 
+    /**
+     * returns object with attributes "width" and "height" of video
+     *
+     * @param _format {Object}
+     * @returns {Object}
+     */
+    this.getRatioFromFormatObject = function (_format) {
+        var ratio = {
+            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") {
+                            ratio.width = value.width;
+                        }
+                        if(typeof value.height !== "undefined") {
+                            ratio.height = value.height;
+                        }
+                    }
+                }
+            });
+            return ratio;
+        }
+    };
+
     this.getObjectByJsonData = function (_data, _helperObject) {
         var requestResults = [];
         if (_data) {
@@ -148,12 +176,22 @@ jjtApingFacebook.service('apingFacebookHelper', ['apingModels', 'apingTimeHelper
 
         videoObject.date_time = new Date(videoObject.timestamp);
 
-        if (_item.format.length > 0) {
+        if(typeof _item.format !== "undefined") {
+            if (_item.format.length > 0) {
 
-            if (_item.format.length >= 3) {
-                videoObject.img_url = _item.format[2].picture;
-            } else {
-                videoObject.img_url = _item.format[_item.format.length - 1].picture;
+                if (_item.format.length >= 3) {
+                    videoObject.img_url = _item.format[2].picture;
+                } else {
+                    videoObject.img_url = _item.format[_item.format.length - 1].picture;
+                }
+
+                var ratio = this.getRatioFromFormatObject(_item.format);
+                if(typeof ratio.width !== "undefined") {
+                    videoObject.width = ratio.width;
+                }
+                if(typeof ratio.height !== "undefined") {
+                    videoObject.height = ratio.height;
+                }
             }
         }