dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spring cleanup

Browse Source
This commit is contained in:
Ruud
2014-03-29 23:44:14 +01:00
parent 83c5d701b3
commit 99e77e409a
98 changed files with 469 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/static/scripts/page/home.js
+1 -1
View File
@@ -67,7 +67,7 @@ Page.Home = new Class({
// Force update after search
self.available_list.update();
App.off('movie.searcher.ended', after_search);
}
};
App.on('movie.searcher.ended', after_search);
}
couchpotato/static/scripts/page/manage.js
+4 -4
View File
@@ -105,7 +105,7 @@ Page.Manage = new Class({
}
else {
// Capture progress so we can use it in our *each* closure
var progress = json.progress
var progress = json.progress;
// Don't add loader when page is loading still
if(!self.list.navigation)
@@ -116,15 +116,15 @@ Page.Manage = new Class({
self.progress_container.empty();
var sorted_table = self.parseProgress(json.progress)
var sorted_table = self.parseProgress(json.progress);
sorted_table.each(function(folder){
var folder_progress = progress[folder]
var folder_progress = progress[folder];
new Element('div').adopt(
new Element('span.folder', {'text': folder +
(folder_progress.eta > 0 ? ', ' + new Date ().increment('second', folder_progress.eta).timeDiffInWords().replace('from now', 'to go') : '')
}),
new Element('span.percentage', {'text': folder_progress.total ? (((folder_progress.total-folder_progress.to_go)/folder_progress.total)*100).round() + '%' : '0%'})
new Element('span.percentage', {'text': folder_progress.total ? Math.round(((folder_progress.total-folder_progress.to_go)/folder_progress.total)*100) + '%' : '0%'})
).inject(self.progress_container)
});
couchpotato/static/scripts/page/settings.js
+4 -3
View File
@@ -370,7 +370,7 @@ var OptionBase = new Class({
createTooltip(self.options.description[1]).inject(hint, 'top');
}
else {
var hint = new Element('p.formHint', {
new Element('p.formHint', {
'html': self.options.description || ''
}).inject(self.el)
}
@@ -1312,8 +1312,9 @@ Option.Combined = new Class({
var head = new Element('div.head').inject(self.combined_list);
Object.each(self.inputs, function(input, name){
var _in = input.getNext();
self.labels[name] = input.getPrevious().get('text');
self.descriptions[name] = (_in = input.getNext()) ? _in.get('text') : '';
self.descriptions[name] = _in ? _in.get('text') : '';
new Element('abbr', {
'class': name,
@@ -1465,4 +1466,4 @@ var createTooltip = function(description){
);
return tip;
}
};
couchpotato/static/scripts/page/wanted.js
+5 -5
View File
@@ -73,7 +73,7 @@ Page.Wanted = new Class({
}
else {
var progress = json.movie;
self.manual_search.set('text', 'Searching.. (' + (((progress.total-progress.to_go)/progress.total)*100).round() + '%)');
self.manual_search.set('text', 'Searching.. (' + Math.round(((progress.total-progress.to_go)/progress.total)*100) + '%)');
}
}
});
@@ -87,7 +87,7 @@ Page.Wanted = new Class({
var self = this;
var options = {
'name': 'Scan_folder'
}
};
if(!self.folder_browser){
self.folder_browser = new Option['Directory']("Scan", "folder", "", options);
@@ -96,9 +96,9 @@ Page.Wanted = new Class({
var folder = self.folder_browser.getValue();
Api.request('renamer.scan', {
'data': {
'base_folder': folder,
},
});
'base_folder': folder
}
});
};
self.folder_browser.inject(self.el, 'top');