diff --git a/control/design/controllers/design.home.controller.js b/control/design/controllers/design.home.controller.js index 305d36d..d00a77e 100644 --- a/control/design/controllers/design.home.controller.js +++ b/control/design/controllers/design.home.controller.js @@ -3,8 +3,8 @@ (function (angular) { angular .module('mediaCenterRSSPluginDesign') - .controller('DesignHomeCtrl', ['$scope', 'DataStore', 'ImageLibrary', 'TAG_NAMES', 'LAYOUTS', '$timeout', - function ($scope, DataStore, ImageLibrary, TAG_NAMES, LAYOUTS, $timeout) { + .controller('DesignHomeCtrl', ['$scope', 'DataStore', 'ImageLibrary', 'TAG_NAMES', 'LAYOUTS', '$timeout','FEED_IMAGES', + function ($scope, DataStore, ImageLibrary, TAG_NAMES, LAYOUTS, $timeout,FEED_IMAGES) { /* * Private variables * @@ -32,6 +32,8 @@ } , tmrDelay = null; + DesignHome.FEED_IMAGES = FEED_IMAGES; + /* * DesignHome.isSaved is used to show/hide Success alert message when data saved successfully. Its default value is false. * @type {boolean} @@ -127,9 +129,12 @@ if (DesignHome.data && DesignHome.data.design && !DesignHome.data.design.itemDetailsLayout) { DesignHome.data.design.itemDetailsLayout = DesignHome.layouts.itemDetailsLayouts[0].name; } - updateMasterItem(DesignHome.data); + if (!DesignHome.data.design.showImages) + DesignHome.data.design.showImages = FEED_IMAGES.YES; + + updateMasterItem(DesignHome.data); if (tmrDelay)clearTimeout(tmrDelay); - } + } , error = function (err) { console.error('Error while getting data', err); if (tmrDelay)clearTimeout(tmrDelay); diff --git a/control/design/enums.js b/control/design/enums.js index c59cbd9..0130289 100644 --- a/control/design/enums.js +++ b/control/design/enums.js @@ -48,5 +48,10 @@ {name: "Feed_Layout_1"}, {name: "Feed_Layout_2"} ] - }); + }) + + .constant('FEED_IMAGES', { + YES: 'Yes', + NO: 'No' + }) })(window.angular); \ No newline at end of file diff --git a/control/design/templates/home.html b/control/design/templates/home.html index 927139a..66409fc 100644 --- a/control/design/templates/home.html +++ b/control/design/templates/home.html @@ -92,3 +92,23 @@ +
+
+
+ Show feed images +
+
+
+ + +
+
+ + +
+
+
diff --git a/widget/controllers/widget.home.controller.js b/widget/controllers/widget.home.controller.js index c1d863c..f1fef1a 100644 --- a/widget/controllers/widget.home.controller.js +++ b/widget/controllers/widget.home.controller.js @@ -3,8 +3,8 @@ (function (angular) { angular .module('mediaCenterRSSPluginWidget') - .controller('WidgetHomeCtrl', ['$scope', 'DataStore', 'Buildfire', 'FeedParseService', 'TAG_NAMES', 'ItemDetailsService', 'Location', '$filter', 'Underscore', '$rootScope', - function ($scope, DataStore, Buildfire, FeedParseService, TAG_NAMES, ItemDetailsService, Location, $filter, Underscore, $rootScope) { + .controller('WidgetHomeCtrl', ['$scope', 'DataStore', 'Buildfire', 'FeedParseService', 'TAG_NAMES', 'ItemDetailsService', 'Location', '$filter', 'Underscore', '$rootScope','FEED_IMAGES', + function ($scope, DataStore, Buildfire, FeedParseService, TAG_NAMES, ItemDetailsService, Location, $filter, Underscore, $rootScope,FEED_IMAGES) { $rootScope.deviceHeight = window.innerHeight; $rootScope.deviceWidth = window.innerWidth || 320; @@ -187,9 +187,14 @@ $rootScope.backgroundImageItem = WidgetHome.data.design.itemDetailsBgImage; console.log('$rootScope.backgroundImage', $rootScope.backgroundImage); console.log('$rootScope.backgroundImageItem', $rootScope.backgroundImageItem); + console.log('--------------', WidgetHome.data.design.showImages); if (WidgetHome.view && event.data.content && event.data.content.carouselImages) { WidgetHome.view.loadItems(event.data.content.carouselImages); } + if(!WidgetHome.data.design) + WidgetHome.data.design = {}; + if(!WidgetHome.data.design.showImages) + WidgetHome.data.design.showImages = FEED_IMAGES.YES; if (WidgetHome.data.content && WidgetHome.data.content.rssUrl) { if (WidgetHome.data.content.rssUrl !== currentRssUrl) { currentRssUrl = WidgetHome.data.content.rssUrl; @@ -221,10 +226,12 @@ currentRssUrl = WidgetHome.data.content.rssUrl; getFeedData(WidgetHome.data.content.rssUrl); } - /*if (WidgetHome.data.content.carouselImages) { - $rootScope.$emit("Carousel:LOADED"); - }*/ - } + if(!WidgetHome.data.design) + WidgetHome.data.design = {}; + + if (!WidgetHome.data.design.showImages) + WidgetHome.data.design.showImages = FEED_IMAGES.YES; + } , error = function (err) { console.error('Error while getting data', err); }; diff --git a/widget/enums.js b/widget/enums.js index 7c3d325..a7f0d65 100644 --- a/widget/enums.js +++ b/widget/enums.js @@ -37,5 +37,10 @@ AUDIO: 'AUDIO', IMAGE: 'IMAGE', OTHER: 'OTHER' - }); + }) + + .constant('FEED_IMAGES', { + YES: 'Yes', + NO: 'No' + }) })(window.angular); \ No newline at end of file diff --git a/widget/templates/List_Layout_1.html b/widget/templates/List_Layout_1.html index ceaf4b7..4298926 100644 --- a/widget/templates/List_Layout_1.html +++ b/widget/templates/List_Layout_1.html @@ -21,7 +21,7 @@ ng-if="$index % 2 == 0">
-
-
-
+
diff --git a/widget/templates/List_Layout_3.html b/widget/templates/List_Layout_3.html index 00753a5..e442721 100644 --- a/widget/templates/List_Layout_3.html +++ b/widget/templates/List_Layout_3.html @@ -14,7 +14,7 @@ data-infinite-container=".infinite-scroll-parent">
-
+
-
+