Skip to content

Commit 506fe37

Browse files
DanielHindiDanielHindi
committed
Merge pull request #44 from sandeepchhapola/master
Media player and placeholder fixes
2 parents 822cffd + 0eb5fcf commit 506fe37

File tree

10 files changed

+394
-330
lines changed

10 files changed

+394
-330
lines changed

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

Lines changed: 317 additions & 304 deletions
Large diffs are not rendered by default.

‎control/design/templates/home.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</a>
1313
</div>
1414
<div class="screen layoutgrid pull-right margin-left-zero border-grey border-radius-three">
15-
<a ng-repeat="listLayout in DesignHome.layouts.itemListLayouts"
15+
<a ng-repeat="listLayout in DesignHome.layouts.itemListLayouts" data-number="{{$index + 1}}"
1616
class="layouticon border-grey border-radius-three default-background-hover text-center"
1717
ng-click="DesignHome.changeListLayout(this.listLayout.name)">
1818
<img ng-src="../../resources/{{listLayout.name}}.png">
@@ -34,7 +34,8 @@
3434
</a>
3535
</div>
3636
<div class="screen layoutgrid pull-right margin-left-zero border-grey border-radius-three">
37-
<a ng-repeat="itemDetailsLayout in DesignHome.layouts.itemDetailsLayouts"
37+
<a
38+
ng-repeat="itemDetailsLayout in DesignHome.layouts.itemDetailsLayouts" data-number="{{$index + 1}}"
3839
class="layouticon border-grey border-radius-three default-background-hover text-center"
3940
ng-click="DesignHome.changeItemDetailsLayout(this.itemDetailsLayout.name)">
4041
<img ng-src="../../resources/{{itemDetailsLayout.name}}.png">

‎widget/app.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,13 @@
5858
Location.goTo('#/');
5959
}
6060
else if (reg1.test($location.path())) {
61-
$rootScope.showFeed = false;
62-
Location.goTo('#/item');
61+
if($rootScope.playlist){
62+
$rootScope.playlist=false;
63+
}
64+
else{
65+
$rootScope.showFeed = false;
66+
Location.goTo('#/item');
67+
}
6368
}
6469
else {
6570
buildfire.navigation._goBackOne();

‎widget/assets/css/style.css‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,4 +1119,43 @@ input.volume-button[type=range]:focus::-ms-fill-upper {
11191119
.media-player-button-selected{
11201120
border-bottom: 1px solid;
11211121
padding-bottom: 3px;
1122+
}
1123+
1124+
.list-layout.has-btns .list-item{
1125+
position:relative;
1126+
}
1127+
.ecommerce-plugin .list-layout.has-cart .list-item-copy,
1128+
.list-layout.has-btns .list-item-copy{
1129+
padding-right:88px !important;
1130+
}
1131+
.list-layout.has-cart .add-to-cart,
1132+
.list-layout.has-btns .btns{
1133+
position:absolute;
1134+
top:50%;
1135+
margin-top:-16px;
1136+
right:18px;
1137+
}
1138+
.list-layout.has-btns .btns{
1139+
margin-top:-18px;
1140+
}
1141+
.holder .list-layout .add-to-cart,
1142+
.list-layout.has-btns .btns{
1143+
padding:5px;
1144+
display:inline-block;
1145+
width:32px;
1146+
height:32px;
1147+
}
1148+
.holder .media-layout .add-to-cart{
1149+
padding:4px;
1150+
width:30px;
1151+
height:30px;
1152+
}
1153+
.holder .list-layout .add-to-cart .icon,
1154+
.holder .media-layout .add-to-cart .icon{
1155+
font-size:18px;
1156+
vertical-align:middle;
1157+
}
1158+
.list-layout.has-btns .btns .icon{
1159+
font-size:24px;
1160+
color:#fff;
11221161
}

‎widget/controllers/widget.media.controller.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,10 @@
307307
var onUpdateCallback = function (event) {
308308
if (event && event.tag === TAG_NAMES.RSS_FEED_INFO) {
309309
WidgetMedia.data = event.data;
310-
$rootScope.backgroundImage = WidgetMedia.data.design.itemListBgImage;
311-
$rootScope.backgroundImageItem = WidgetMedia.data.design.itemDetailsBgImage;
310+
if(WidgetMedia.data.design){
311+
$rootScope.backgroundImage = WidgetMedia.data.design.itemListBgImage;
312+
$rootScope.backgroundImageItem = WidgetMedia.data.design.itemDetailsBgImage;
313+
}
312314
console.log('$rootScope.backgroundImage',$rootScope.backgroundImage);
313315
console.log('$rootScope.backgroundImageItem',$rootScope.backgroundImageItem);
314316
if (WidgetMedia.data.content && (!WidgetMedia.data.content.rssUrl || WidgetMedia.data.content.rssUrl !== currentRssUrl)) {
@@ -328,10 +330,12 @@
328330
var success = function (result) {
329331
$rootScope.showFeed = false;
330332
WidgetMedia.data = result.data;
333+
if(WidgetMedia.data.design){
331334
$rootScope.backgroundImage = WidgetMedia.data.design.itemListBgImage;
332335
$rootScope.backgroundImageItem = WidgetMedia.data.design.itemDetailsBgImage;
333336
console.log('$rootScope.backgroundImage',$rootScope.backgroundImage);
334337
console.log('$rootScope.backgroundImageItem',$rootScope.backgroundImageItem);
338+
}
335339
currentRssUrl = WidgetMedia.data.content.rssUrl;
336340
}
337341
, error = function (err) {

‎widget/controllers/widget.nowplaying.controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
}
162162
});
163163
NowPlaying.openMoreInfo = false;
164-
NowPlaying.openPlaylist = true;
164+
$rootScope.playlist=true;
165165
};
166166
NowPlaying.changeTime = function (time) {
167167
audioPlayer.setTime(time);
@@ -191,7 +191,7 @@
191191
NowPlaying.openSettings = false;
192192
};
193193
NowPlaying.closePlayListOverlay = function () {
194-
NowPlaying.openPlaylist = false;
194+
$rootScope.playlist = false;
195195
};
196196
NowPlaying.closeMoreInfoOverlay = function () {
197197
NowPlaying.openMoreInfo = false;

‎widget/templates/List_Layout_1.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
<div
2626
class="list-item-media text-center border-radius-three overflow-hidden">
2727
<div class="list-media-holder" style="cursor: pointer">
28-
<img ng-if="WidgetHome.items[$index].imageSrcUrl"
29-
ng-src="{{WidgetHome.items[$index].imageSrcUrl| getImageUrl:240:135}}">
28+
<img
29+
ng-if="WidgetHome.items[$index].imageSrcUrl" load-image="16x9"
30+
data-final-src="{{WidgetHome.items[$index].imageSrcUrl| getImageUrl:240:135}}">
3031
<img ng-if="!WidgetHome.items[$index].imageSrcUrl"
31-
src="assets/.images/placeholder16x9.png">
32+
src='../../../styles/media/holder-16x9.png'>
3233
</div>
3334
</div>
3435
<div class="list-item-copy text-left" style="cursor: pointer">
@@ -47,10 +48,11 @@
4748
<div
4849
class="list-item-media text-center border-radius-three overflow-hidden">
4950
<div class="list-media-holder" style="cursor: pointer">
50-
<img ng-if="WidgetHome.items[$index+1].imageSrcUrl"
51-
ng-src="{{WidgetHome.items[$index+1].imageSrcUrl| getImageUrl:240:135}}">
51+
<img
52+
ng-if="WidgetHome.items[$index+1].imageSrcUrl" load-image="16x9"
53+
data-final-src="{{WidgetHome.items[$index+1].imageSrcUrl| getImageUrl:240:135}}">
5254
<img ng-if="!WidgetHome.items[$index+1].imageSrcUrl"
53-
src="assets/.images/placeholder16x9.png">
55+
src='../../../styles/media/holder-16x9.png'>
5456
</div>
5557
</div>
5658
<div class="list-item-copy text-left" style="cursor: pointer">

‎widget/templates/List_Layout_2.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
ng-repeat="item in WidgetHome.items" trigger-ng-repeat-render=""
2121
ng-click="WidgetHome.goToItem($index)" style="cursor: pointer">
2222
<div class="list-item-media text-left overflow-hidden">
23-
<div ng-if="item.imageSrcUrl" class="list-media-holder pull-left">
24-
<img load-image="16x9"
25-
data-final-src="{{item.imageSrcUrl| getImageUrl:220:120}}">
26-
</div>
23+
<div ng-if="item.imageSrcUrl" class="list-media-holder pull-left">
24+
<img load-image="16x9"
25+
data-final-src="{{item.imageSrcUrl| getImageUrl:220:120}}">
26+
</div>
2727
<div ng-if="!item.imageSrcUrl" class="list-media-holder pull-left">
28-
<img src='../../../styles/media/holder-16x9.png'>
29-
</div>
28+
<img src='../../../styles/media/holder-16x9.png'>
29+
</div>
3030
<div class="list-item-copy text-left padding-left-ten padding-right-ten">
3131
<p class="ellipsis margin-zero text-primary"><a ng-click="WidgetHome.goToItem($index)"
3232
class="text-primary">{{WidgetHome.getTitle(item)}}</a>

‎widget/templates/List_Layout_3.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
<div ng-show="WidgetHome.isItems" ng-repeat="item in WidgetHome.items"
1818
trigger-ng-repeat-render="" ng-click="WidgetHome.goToItem($index)" style="cursor: pointer">
1919
<div class="plugin-banner clearfix border-bottom-grey">
20-
<div class="plugin-slide text-center" ng-if="item.imageSrcUrl">
21-
<img load-image="16x9"
22-
data-final-src="{{item.imageSrcUrl| getImageUrl:340:192}}">
23-
</div>
20+
<div class="plugin-slide text-center" ng-if="item.imageSrcUrl">
21+
<img load-image="16x9"
22+
data-final-src="{{item.imageSrcUrl| getImageUrl:340:192}}">
23+
</div>
2424
<div class="plugin-slide text-center" ng-if="!item.imageSrcUrl">
25-
<img src='../../../styles/media/holder-16x9.png'>
25+
<img src='../../../styles/media/holder-16x9.png'>
2626
</div>
2727
</div>
2828
<div class="padded text-left ellipsis">

‎widget/templates/now-playing.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ <h4 class="margin-zero ellipsis whiteTheme">{{NowPlaying.currentTrack.title}}</h
7575
</div>
7676

7777
<!-- Playlist Overlay -->
78-
<div ng-if="NowPlaying.openPlaylist" class="overlay"
78+
<div ng-if="playlist" class="overlay"
7979
style="position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.8);">
8080
<div class="overlay-content" style="postiion:absolute; top:0; left:0; height:100%; width: 100%; overflow:auto;">
8181
<div class="media-player-list-layout layout3">

0 commit comments

Comments
 (0)