Browse Source

Failed trailer search, don't show trailer container

fix #5283
pull/5291/head
Ruud 10 years ago
parent
commit
c987313c8c
  1. 19
      couchpotato/core/media/movie/_base/static/movie.actions.js
  2. 4
      couchpotato/core/media/movie/_base/static/movie.scss
  3. 16
      couchpotato/static/scripts/combined.plugins.min.js
  4. 1
      couchpotato/static/style/combined.min.css

19
couchpotato/core/media/movie/_base/static/movie.actions.js

@ -400,12 +400,17 @@ MA.Trailer = new Class({
new Request.JSONP({
'url': url,
'onComplete': function(json){
self.video_id = json.items[0].id.videoId;
self.container.grab(new Element('div.background', {
'styles': {
'background-image': 'url('+json.items[0].snippet.thumbnails.high.url+')'
}
}));
if(json.items.length > 0){
self.video_id = json.items[0].id.videoId;
self.container.grab(new Element('div.background', {
'styles': {
'background-image': 'url('+json.items[0].snippet.thumbnails.high.url+')'
}
}));
}
else {
self.container.getParent('.section').addClass('no_trailer');
}
}
}).send();
}
@ -416,13 +421,13 @@ MA.Trailer = new Class({
watch: function(){
var self = this;
self.container.set('html', '<iframe src="https://www.youtube-nocookie.com/embed/'+self.video_id+'?rel=0&showinfo=0&autoplay=1&showsearch=0&iv_load_policy=3&vq=hd720" />');
}
});
MA.Category = new Class({
Extends: MovieAction,

4
couchpotato/core/media/movie/_base/static/movie.scss

@ -1000,6 +1000,10 @@ $mass_edit_height: 44px;
}
.section_trailer.no_trailer {
display: none;
}
.trailer_container {
$play-size: 110px;

16
couchpotato/static/scripts/combined.plugins.min.js

@ -1310,12 +1310,16 @@ MA.Trailer = new Class({
new Request.JSONP({
url: url,
onComplete: function(json) {
self.video_id = json.items[0].id.videoId;
self.container.grab(new Element("div.background", {
styles: {
"background-image": "url(" + json.items[0].snippet.thumbnails.high.url + ")"
}
}));
if (json.items.length > 0) {
self.video_id = json.items[0].id.videoId;
self.container.grab(new Element("div.background", {
styles: {
"background-image": "url(" + json.items[0].snippet.thumbnails.high.url + ")"
}
}));
} else {
self.container.getParent(".section").addClass("no_trailer");
}
}
}).send();
}

1
couchpotato/static/style/combined.min.css

@ -337,6 +337,7 @@
.page.movie_details .releases .provider{min-width:110px;max-width:110px}
.page.movie_details .releases .provider:before{content:"Provider:"}
.page.movie_details .releases .actions{min-width:80px;max-width:80px}
.page.movie_details .section_trailer.no_trailer{display:none}
.page.movie_details .trailer_container{background:#000;position:relative;padding-bottom:56.25%;height:0;overflow:hidden;max-width:100%;cursor:pointer}
.alph_nav .menus .button,.alph_nav .menus .counter{line-height:80px;padding:0 10px}
.page.movie_details .trailer_container .background{opacity:.3;transition:all 300ms;-webkit-transform:scale(1.05) rotateY(360deg);transform:scale(1.05) rotateY(360deg);background:center no-repeat;background-size:cover;position:absolute;top:0;right:0;bottom:0;left:0;z-index:1}

Loading…
Cancel
Save