fix: fixed bug with attribute "items"

JohnnyTheTank · Nov 27, 2015 · 24d7441 · 24d7441
1 parent 77ca734
commit 24d7441
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -55,8 +55,9 @@
 
     <aping
             template-url="../bower_components/apiNG-design-default/dist/aping_design_default.html"
+            items="6"
             type="social"
-            aping-youtube="[{'search':'sunset'}]"
+            aping-youtube="[{'search':'sunset', 'items':3 }]"
             aping-instagram="[{'tag':'cakephp'}]"
             aping-facebook="[{'page':'namikamusik'}]"
             aping-codebird="[{'search':'ocean', 'result_type':'popular'}]">

diff --git a/dist/aping.min.js b/dist/aping.min.js
diff --git a/src/aping-helpers.js b/src/aping-helpers.js
@@ -49,7 +49,8 @@ apingApp.service('apingTimeHelper', function () {
         };
     })
     .service('apingUtilityHelper', ['apingInputObjects', function (apingInputObjects) {
-        this.parseJsonFromAttributes = function (_string, _platform) {
+        this.parseJsonFromAttributes = function (_string, _platform, _appSettings) {
+
             if (!(typeof _string === "string" && _string)) {
                 return [];
             }
@@ -61,13 +62,16 @@ apingApp.service('apingTimeHelper', function () {
             angular.forEach(tempArray, function (value, key) {
 
                 value.platform = _platform;
+                if(typeof value.items == "undefined" && _appSettings && typeof _appSettings.items != "undefined") {
+                    value.items = _appSettings.items;
+                }
+
 
                 var request = apingInputObjects.getNew("request", value);
                 requests.push(request);
 
             });
 
-
             return requests;
         };