Skip to content

Commit 909de73

Browse files
RJASeoudRJASeoud
authored
Merge pull request #56 from sandeepchhapola/master
Implemented hide feed image feature in design section and used it in …
2 parents db38538 + fbb5fec commit 909de73

File tree

9 files changed

+59
-17
lines changed

9 files changed

+59
-17
lines changed

‎control/design/controllers/design.home.controller.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
(function (angular) {
44
angular
55
.module('mediaCenterRSSPluginDesign')
6-
.controller('DesignHomeCtrl', ['$scope', 'DataStore', 'ImageLibrary', 'TAG_NAMES', 'LAYOUTS', '$timeout',
7-
function ($scope, DataStore, ImageLibrary, TAG_NAMES, LAYOUTS, $timeout) {
6+
.controller('DesignHomeCtrl', ['$scope', 'DataStore', 'ImageLibrary', 'TAG_NAMES', 'LAYOUTS', '$timeout','FEED_IMAGES',
7+
function ($scope, DataStore, ImageLibrary, TAG_NAMES, LAYOUTS, $timeout,FEED_IMAGES) {
88
/*
99
* Private variables
1010
*
@@ -32,6 +32,8 @@
3232
}
3333
, tmrDelay = null;
3434

35+
DesignHome.FEED_IMAGES = FEED_IMAGES;
36+
3537
/*
3638
* DesignHome.isSaved is used to show/hide Success alert message when data saved successfully. Its default value is false.
3739
* @type {boolean}
@@ -127,9 +129,12 @@
127129
if (DesignHome.data && DesignHome.data.design && !DesignHome.data.design.itemDetailsLayout) {
128130
DesignHome.data.design.itemDetailsLayout = DesignHome.layouts.itemDetailsLayouts[0].name;
129131
}
130-
updateMasterItem(DesignHome.data);
132+
if (!DesignHome.data.design.showImages)
133+
DesignHome.data.design.showImages = FEED_IMAGES.YES;
134+
135+
updateMasterItem(DesignHome.data);
131136
if (tmrDelay)clearTimeout(tmrDelay);
132-
}
137+
}
133138
, error = function (err) {
134139
console.error('Error while getting data', err);
135140
if (tmrDelay)clearTimeout(tmrDelay);

‎control/design/enums.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,10 @@
4848
{name: "Feed_Layout_1"},
4949
{name: "Feed_Layout_2"}
5050
]
51-
});
51+
})
52+
53+
.constant('FEED_IMAGES', {
54+
YES: 'Yes',
55+
NO: 'No'
56+
})
5257
})(window.angular);

‎control/design/templates/home.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,23 @@
9292
</div>
9393
</div>
9494
</div>
95+
<hr>
96+
<div class="item clearfix row">
97+
<div class="labels col-md-3 padding-right-zero pull-left">
98+
<span>Show feed images</span>
99+
</div>
100+
<div class="main pull-right col-md-9 padding-left-zero row">
101+
<div class="radio radio-primary radio-inline">
102+
<input id="yes" type="radio" ng-model="DesignHome.data.design.showImages"
103+
ng-value="DesignHome.FEED_IMAGES.YES"
104+
name="feedImages" ng-se="">
105+
<label for="yes">Yes</label>
106+
</div>
107+
<div class="radio radio-primary radio-inline">
108+
<input id="no" type="radio" ng-model="DesignHome.data.design.showImages"
109+
ng-value="DesignHome.FEED_IMAGES.NO"
110+
name="feedImages">
111+
<label for="no">No</label>
112+
</div>
113+
</div>
114+
</div>

‎widget/controllers/widget.home.controller.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
(function (angular) {
44
angular
55
.module('mediaCenterRSSPluginWidget')
6-
.controller('WidgetHomeCtrl', ['$scope', 'DataStore', 'Buildfire', 'FeedParseService', 'TAG_NAMES', 'ItemDetailsService', 'Location', '$filter', 'Underscore', '$rootScope',
7-
function ($scope, DataStore, Buildfire, FeedParseService, TAG_NAMES, ItemDetailsService, Location, $filter, Underscore, $rootScope) {
6+
.controller('WidgetHomeCtrl', ['$scope', 'DataStore', 'Buildfire', 'FeedParseService', 'TAG_NAMES', 'ItemDetailsService', 'Location', '$filter', 'Underscore', '$rootScope','FEED_IMAGES',
7+
function ($scope, DataStore, Buildfire, FeedParseService, TAG_NAMES, ItemDetailsService, Location, $filter, Underscore, $rootScope,FEED_IMAGES) {
88

99
$rootScope.deviceHeight = window.innerHeight;
1010
$rootScope.deviceWidth = window.innerWidth || 320;
@@ -187,9 +187,14 @@
187187
$rootScope.backgroundImageItem = WidgetHome.data.design.itemDetailsBgImage;
188188
console.log('$rootScope.backgroundImage', $rootScope.backgroundImage);
189189
console.log('$rootScope.backgroundImageItem', $rootScope.backgroundImageItem);
190+
console.log('--------------', WidgetHome.data.design.showImages);
190191
if (WidgetHome.view && event.data.content && event.data.content.carouselImages) {
191192
WidgetHome.view.loadItems(event.data.content.carouselImages);
192193
}
194+
if(!WidgetHome.data.design)
195+
WidgetHome.data.design = {};
196+
if(!WidgetHome.data.design.showImages)
197+
WidgetHome.data.design.showImages = FEED_IMAGES.YES;
193198
if (WidgetHome.data.content && WidgetHome.data.content.rssUrl) {
194199
if (WidgetHome.data.content.rssUrl !== currentRssUrl) {
195200
currentRssUrl = WidgetHome.data.content.rssUrl;
@@ -221,10 +226,12 @@
221226
currentRssUrl = WidgetHome.data.content.rssUrl;
222227
getFeedData(WidgetHome.data.content.rssUrl);
223228
}
224-
/*if (WidgetHome.data.content.carouselImages) {
225-
$rootScope.$emit("Carousel:LOADED");
226-
}*/
227-
}
229+
if(!WidgetHome.data.design)
230+
WidgetHome.data.design = {};
231+
232+
if (!WidgetHome.data.design.showImages)
233+
WidgetHome.data.design.showImages = FEED_IMAGES.YES;
234+
}
228235
, error = function (err) {
229236
console.error('Error while getting data', err);
230237
};

‎widget/enums.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,10 @@
3737
AUDIO: 'AUDIO',
3838
IMAGE: 'IMAGE',
3939
OTHER: 'OTHER'
40-
});
40+
})
41+
42+
.constant('FEED_IMAGES', {
43+
YES: 'Yes',
44+
NO: 'No'
45+
})
4146
})(window.angular);

‎widget/templates/List_Layout_1.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
ng-if="$index % 2 == 0">
2222
<div class="list-item col-xs-6 pull-left"
2323
ng-click="WidgetHome.goToItem($index)">
24-
<div
24+
<div ng-if="WidgetHome.data.design.showImages == 'Yes'"
2525
class="list-item-media text-center border-radius-three overflow-hidden">
2626
<div class="list-media-holder" style="cursor: pointer">
2727
<img
@@ -45,7 +45,7 @@
4545
</div>
4646
<div class="list-item col-xs-6 pull-left"
4747
ng-click="WidgetHome.goToItem($index+1)">
48-
<div
48+
<div ng-if="WidgetHome.data.design.showImages == 'Yes'"
4949
class="list-item-media text-center border-radius-three overflow-hidden">
5050
<div class="list-media-holder" style="cursor: pointer">
5151
<img

‎widget/templates/List_Layout_2.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ng-repeat="item in WidgetHome.items" trigger-ng-repeat-render=""
1919
ng-click="WidgetHome.goToItem($index)" style="cursor: pointer">
2020
<div class="list-item-media text-left overflow-hidden">
21-
<div ng-if="item.imageSrcUrl" class="list-media-holder pull-left">
21+
<div ng-if="item.imageSrcUrl && WidgetHome.data.design.showImages == 'Yes'" class="list-media-holder pull-left">
2222
<img load-image="16x9"
2323
crop-width="220" crop-height="120" crop-type="crop"
2424
data-final-src="{{item.imageSrcUrl}}">

‎widget/templates/List_Layout_3.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
data-infinite-container=".infinite-scroll-parent">
1515
<div ng-show="WidgetHome.isItems" ng-repeat="item in WidgetHome.items"
1616
trigger-ng-repeat-render="" ng-click="WidgetHome.goToItem($index)" style="cursor: pointer">
17-
<div class="plugin-banner clearfix border-bottom-grey">
17+
<div class="plugin-banner clearfix border-bottom-grey" ng-if="WidgetHome.data.design.showImages == 'Yes'">
1818
<div class="plugin-slide text-center" ng-if="item.imageSrcUrl">
1919
<img load-image="16x9"
2020
crop-width="340" crop-height="192" crop-type="crop"

‎widget/templates/List_Layout_4.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div ng-show="WidgetHome.isItems" ng-click="WidgetHome.goToItem($index)" class="list-item col-xs-6 pull-left"
1717
ng-repeat="item in WidgetHome.items"
1818
ng-class-even="list-item-even" ng-class-odd="list-item-odd" trigger-ng-repeat-render="">
19-
<div class="list-item-media text-center overflow-hidden">
19+
<div class="list-item-media text-center overflow-hidden" ng-if="WidgetHome.data.design.showImages == 'Yes'">
2020
<div class="list-media-holder" style="cursor: pointer">
2121
<img ng-if="item.imageSrcUrl" load-image="1x1"
2222
crop-width="200" crop-height="200" crop-type="crop"

0 commit comments

Comments
 (0)