Browse Source

Indentation cleanup

pull/2497/merge
Ruud 12 years ago
parent
commit
0065ff5086
  1. 36
      couchpotato/static/scripts/page/manage.js

36
couchpotato/static/scripts/page/manage.js

@ -102,8 +102,8 @@ Page.Manage = new Class({
} }
} }
else { else {
// Capture progress so we can use it in our *each* closure // 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 // Don't add loader when page is loading still
if(!self.list.navigation) if(!self.list.navigation)
@ -114,10 +114,10 @@ Page.Manage = new Class({
self.progress_container.empty(); self.progress_container.empty();
var sorted_table = self.parseProgress(json.progress) var sorted_table = self.parseProgress(json.progress)
sorted_table.each(function(folder){ sorted_table.each(function(folder){
var folder_progress = progress[folder] var folder_progress = progress[folder]
new Element('div').adopt( new Element('div').adopt(
new Element('span.folder', {'text': folder}), new Element('span.folder', {'text': folder}),
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 ? (((folder_progress.total-folder_progress.to_go)/folder_progress.total)*100).round() + '%' : '0%'})
@ -129,21 +129,17 @@ Page.Manage = new Class({
}) })
}, 1000); }, 1000);
}, },
parseProgress: function (progress_object) { parseProgress: function (progress_object) {
var folder, temp_array = []; var folder, temp_array = [];
/* Sort the properties on the progress object into an alphabetic array, ensuring that our folders display in appropriate alphabetic order. for (folder in progress_object) {
if (progress_object.hasOwnProperty(folder)) {
Bugfix for https://github.com/RuudBurger/CouchPotatoServer/issues/1578 temp_array.push(folder)
*/ }
for (folder in progress_object) { }
if (progress_object.hasOwnProperty(folder)) { return temp_array.stableSort()
temp_array.push(folder) }
}
}
return temp_array.stableSort()
}
}); });

Loading…
Cancel
Save