dockeruser
/
CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[TV] Improved episode actions drop-down (releases)

pull/3730/merge
Dean Gardiner 11 years ago
parent
d79556f36f
commit
43275297e9
3 changed files with 71 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      couchpotato/core/media/show/_base/static/episode.actions.js
  2. 11
      couchpotato/core/media/show/_base/static/episode.js
  3. 27
      couchpotato/core/media/show/_base/static/show.css

54
couchpotato/core/media/show/_base/static/episode.actions.js
View File

@ -102,10 +102,12 @@ EA.Release = new Class({
self.el = new Element('a.releases.download', {
'title': 'Show the releases that are available for ' + self.getTitle(),
'events': {
'click': self.open.bind(self)
'click': self.toggle.bind(self)
}
});
self.options = new Element('div.episode-options').inject(self.episode.el);
if(!self.episode.data.releases || self.episode.data.releases.length == 0)
self.el.hide();
else
@ -123,8 +125,19 @@ EA.Release = new Class({
},
toggle: function(e){
var self = this;
if(self.options && self.options.hasClass('expanded')) {
self.close();
} else {
self.open();
}
},
open: function(e){
var self = this;
if(e)
(e).preventDefault();
@ -132,11 +145,23 @@ EA.Release = new Class({
},
close: function(e) {
var self = this;
if(e)
(e).preventDefault();
self.options.setStyle('height', 0)
.removeClass('expanded');
},
createReleases: function(){
var self = this;
if(!self.releases_container){
self.releases_container = new Element('div.releases.table').inject(self.episode.el);
if(!self.releases_table){
self.options.adopt(
self.releases_table = new Element('div.releases.table')
);
// Header
new Element('div.item.head').adopt(
@ -147,7 +172,7 @@ EA.Release = new Class({
new Element('span.age', {'text': 'Age'}),
new Element('span.score', {'text': 'Score'}),
new Element('span.provider', {'text': 'Provider'})
).inject(self.releases_container);
).inject(self.releases_table);
if(self.episode.data.releases)
self.episode.data.releases.each(function(release){
@ -174,7 +199,7 @@ EA.Release = new Class({
'id': 'release_'+release._id
}).adopt(
new Element('span.name', {'text': release_name, 'title': release_name}),
new Element('span.status', {'text': release.status, 'class': 'release_status '+release.status}),
new Element('span.status', {'text': release.status, 'class': 'status '+release.status}),
new Element('span.quality', {'text': quality.label + (release.is_3d ? ' 3D' : '') || 'n/a'}),
new Element('span.size', {'text': info['size'] ? Math.floor(self.get(release, 'size')) : 'n/a'}),
new Element('span.age', {'text': self.get(release, 'age')}),
@ -201,7 +226,7 @@ EA.Release = new Class({
}
}
})
).inject(self.releases_container);
).inject(self.releases_table);
if(release.status == 'ignored' || release.status == 'failed' || release.status == 'snatched'){
if(!self.last_release || (self.last_release && self.last_release.status != 'snatched' && release.status == 'snatched'))
@ -237,14 +262,14 @@ EA.Release = new Class({
});
if(self.last_release)
self.releases_container.getElements('#release_'+self.last_release._id).addClass('last_release');
self.releases_table.getElements('#release_'+self.last_release._id).addClass('last_release');
if(self.next_release)
self.releases_container.getElements('#release_'+self.next_release._id).addClass('next_release');
self.releases_table.getElements('#release_'+self.next_release._id).addClass('next_release');
if(self.next_release || (self.last_release && ['ignored', 'failed'].indexOf(self.last_release.status) === false)){
self.trynext_container = new Element('div.buttons.try_container').inject(self.releases_container, 'top');
self.trynext_container = new Element('div.buttons.try_container').inject(self.releases_table, 'top');
var nr = self.next_release,
lr = self.last_release;
@ -282,13 +307,12 @@ EA.Release = new Class({
self.next_release = null;
self.episode.el.addEvent('outerClick', function(){
console.log('outerClick');
self.releases_container.removeClass('expanded');
self.close();
});
}
self.releases_container.addClass('expanded');
self.options.setStyle('height', self.releases_table.getSize().y)
.addClass('expanded');
},
@ -349,7 +373,7 @@ EA.Release = new Class({
download: function(release){
var self = this;
var release_el = self.releases_container.getElement('#release_'+release._id),
var release_el = self.releases_table.getElement('#release_'+release._id),
icon = release_el.getElement('.download.icon2');
if(icon)
@ -442,7 +466,7 @@ EA.Refresh = new Class({
Api.request('media.refresh', {
'data': {
'id': self.show.get('_id')
'id': self.episode.get('_id')
}
});
}

11
couchpotato/core/media/show/_base/static/episode.js
View File

@ -31,7 +31,16 @@ var Episode = new Class({
new Element('span.name', {'text': self.getTitle()}),
new Element('span.firstaired', {'text': self.data.info.firstaired}),
self.quality = new Element('span.quality'),
self.quality = new Element('span.quality', {
'events': {
'click': function(e){
var releases = self.detail.getElement('.episode-actions .releases');
if(releases.isVisible())
releases.fireEvent('click', [e])
}
}
}),
self.actions = new Element('div.episode-actions')
);

27
couchpotato/core/media/show/_base/static/show.css
View File

@ -708,19 +708,36 @@
bottom: auto;
}
.shows .list .episodes .episode-options {
display: block;
width: 100%;
height: 0;
min-height: 0;
padding: 0;
transition: all 0.6s cubic-bezier(0.9,0,0.1,1);
transition-property: width, height;
overflow: hidden;
}
.shows .list .episodes .releases.table {
display: none;
width: 100%;
height: auto;
padding: 0;
background: rgba(0,0,0,.2);
}
.shows .list .episodes .releases.table.expanded {
display: block;
}
.shows .list .episodes .releases.table span.name {
width: 300px;
}
.shows .list .episodes .releases.table span.status {
width: 85px;
}
.shows .list .episodes .episode-actions {
position: absolute;

Write Preview
Loading…
Cancel
Save