Code cleanup, refactoring and bug fixes:
- Fixed first time running warnings about missing packages.json / desc files - Fixed bug preventing Select All from being able to be clicked - Fixed bug in select all and dependent checkboxes / race condition - Eliminated vertical space gap between page header and table
This commit is contained in:
Eric Schultz
@ -1,153 +1,132 @@
|
||||
$(function(){
|
||||
// "uninstall package" switch and cookie
|
||||
$('#uninstallpkg')
|
||||
.switchButton({
|
||||
labels_placement: "left",
|
||||
on_label: 'unInstall On',
|
||||
off_label: 'unInstall Off',
|
||||
checked: $.cookie('nerdpack_packages_uninstall') == '--uninstall'
|
||||
})
|
||||
.change(function () {
|
||||
$.cookie('nerdpack_packages_uninstall', $('#uninstallpkg').prop('checked') ? '--uninstall' : '', { expires: 3650 });
|
||||
// tablesorter options
|
||||
$("#tblPackages").tablesorter({
|
||||
sortList: [[0,1]],
|
||||
widgets: ["saveSort", "filter", "stickyHeaders"],
|
||||
widgetOptions: {
|
||||
stickyHeaders_filteredToTop: true,
|
||||
filter_hideEmpty: true,
|
||||
filter_liveSearch: true,
|
||||
filter_saveFilters: true,
|
||||
filter_reset: "button.reset",
|
||||
filter_functions: {
|
||||
".filter-version": true,
|
||||
".filter-downloaded": true,
|
||||
".filter-installed": true
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// "uninstall package" switch and cookie
|
||||
$("#uninstallpkg")
|
||||
.switchButton({
|
||||
labels_placement: "left",
|
||||
on_label: "unInstall On",
|
||||
off_label: "unInstall Off",
|
||||
checked: $.cookie("nerdpack_packages_uninstall") == "--uninstall"
|
||||
})
|
||||
.change(function () {
|
||||
$.cookie("nerdpack_packages_uninstall", $(this).prop("checked") ? "--uninstall" : "", { expires: 3650 });
|
||||
});
|
||||
|
||||
// "delete package" switch and cookie
|
||||
$('#deletepkg')
|
||||
.switchButton({
|
||||
labels_placement: "left",
|
||||
on_label: 'delete On',
|
||||
off_label: 'delete Off',
|
||||
checked: $.cookie('nerdpack_packages_delete') == '--delete'
|
||||
})
|
||||
.change(function () {
|
||||
$.cookie('nerdpack_packages_delete', $('#deletepkg').prop('checked') ? '--delete' : '', { expires: 3650 });
|
||||
});
|
||||
$("#deletepkg")
|
||||
.switchButton({
|
||||
labels_placement: "left",
|
||||
on_label: "delete On",
|
||||
off_label: "delete Off",
|
||||
checked: $.cookie("nerdpack_packages_delete") == "--delete"
|
||||
})
|
||||
.change(function () {
|
||||
$.cookie("nerdpack_packages_delete", $(this).prop("checked") ? "--delete" : "", { expires: 3650 });
|
||||
});
|
||||
|
||||
// select all packages switch
|
||||
$('#checkall')
|
||||
$("#checkall")
|
||||
.switchButton({
|
||||
labels_placement: "right",
|
||||
on_label: 'Select All',
|
||||
off_label: 'Select All',
|
||||
checked: $.cookie('nerdpack_checkall') == 'yes'
|
||||
on_label: "Select All",
|
||||
off_label: "Select All",
|
||||
checked: $.cookie("nerdpack_checkall") == "yes"
|
||||
})
|
||||
.change(function() { //on change
|
||||
if(this.checked) { // check select status
|
||||
$('.pkgcheckbox').each(function() { //loop through each checkbox
|
||||
$(this).switchButton({checked: true});
|
||||
});
|
||||
$('.pkgvalue').each(function() { //loop through each value
|
||||
$(this).val('yes');
|
||||
});
|
||||
}else{
|
||||
$('.pkgcheckbox').each(function() { //loop through each checkbox
|
||||
$(this).switchButton({checked: false});
|
||||
});
|
||||
$('.pkgvalue').each(function() { //loop through each value
|
||||
$(this).val('no');
|
||||
});
|
||||
}
|
||||
});
|
||||
.change(function () {
|
||||
var myval = $(this).prop("checked");
|
||||
$.cookie("nerdpack_checkall", myval ? "yes" : "no", { expires: 3650 });
|
||||
$(".pkgcheckbox").each(function() { // loop through each checkbox
|
||||
$(this).switchButton({checked: myval});
|
||||
});
|
||||
$(".pkgvalue").each(function() { // loop through each value
|
||||
$(this).val(myval ? "yes": "no");
|
||||
});
|
||||
});
|
||||
|
||||
// set cookie on apply button press
|
||||
$('#btnApply').click(function(event) {
|
||||
$.cookie('nerdpack_checkall', $('#checkall').prop('checked') ? 'yes' : 'no', { expires: 3650 });
|
||||
packageManager();
|
||||
// set cookie on apply button press
|
||||
$("#btnApply").click(function() {
|
||||
checkDepends();
|
||||
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/update.php",
|
||||
data: $("#package_form").serializeArray(),
|
||||
success: function() {
|
||||
openBox("/plugins/NerdPack/scripts/packagemanager&arg1=--download"+
|
||||
"&arg2="+$.cookie("nerdpack_packages_uninstall")+
|
||||
"&arg3="+$.cookie("nerdpack_packages_delete"),
|
||||
"Package Manager", 600, 900, true);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
packageQuery();
|
||||
});
|
||||
|
||||
function packageManager() {
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : "/update.php",
|
||||
data : $('#package_form').serializeArray(),
|
||||
success: function() {
|
||||
openBox('/plugins/NerdPack/scripts/packagemanager&arg1=--download'+
|
||||
'&arg2='+$.cookie('nerdpack_packages_uninstall')+
|
||||
'&arg3='+$.cookie('nerdpack_packages_delete'),
|
||||
'Package Manager',600,900,true);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
//list all available packages in a table
|
||||
function packageQuery() {
|
||||
$("#tblPackages tbody").empty();
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
dataType: "json",
|
||||
url: "/plugins/NerdPack/include/PackageQuery.php",
|
||||
success: function(data) {
|
||||
for( i in data ) {
|
||||
var Update;
|
||||
if (data[i].downloadeq == data[i].downloaded && data[i].installeq == data[i].installed )
|
||||
Update = "<span style=\"color:#44B012;white-space:nowrap;\"><i class=\"fa fa-check\"></i> up-to-date</span>";
|
||||
else
|
||||
Update = "<span style=\"white-space:nowrap;\"><i class=\"fa fa-cloud-download\"></i><a> update ready<a></span>";
|
||||
$.getJSON("/plugins/NerdPack/include/PackageQuery.php", function(data) {
|
||||
for (var i in data) {
|
||||
var Update;
|
||||
if (data[i].downloadeq == data[i].downloaded && data[i].installeq == data[i].installed)
|
||||
Update = "<span style=\"color:#44B012;white-space:nowrap;\"><i class=\"fa fa-check\"></i> up-to-date</span>";
|
||||
else
|
||||
Update = "<span style=\"white-space:nowrap;\"><a><i class=\"fa fa-cloud-download\"></i> update ready</a></span>";
|
||||
|
||||
$("#tblPackages tbody").append(
|
||||
"<tr>"+
|
||||
"<td class='package' title='"+data[i].desc+"'>"+data[i].name+"</td>"+ //package name
|
||||
"<td>"+Update+"</td>"+ //package status
|
||||
"<td>"+data[i].size+"</td>"+ //package size
|
||||
"<td>"+data[i].downloaded+"</td>"+ //package installed
|
||||
"<td>"+data[i].installed+"</td>"+ //package installed
|
||||
"<td><input class='pkgcheckbox' id='"+data[i].pkgname+"' type='checkbox'>"+
|
||||
"<input class='pkgvalue' type='hidden' id='"+data[i].pkgname+"_value' name='"+
|
||||
data[i].pkgnver+"' value='"+data[i].config+"'></td>"+
|
||||
"</tr>");
|
||||
|
||||
$('#'+data[i].pkgname)
|
||||
$("#tblPackages tbody").append(
|
||||
"<tr>"+
|
||||
"<td class='package' title='"+data[i].desc+"'>"+data[i].name+"</td>"+ // package name
|
||||
"<td>"+Update+"</td>"+ // package status
|
||||
"<td>"+data[i].size+"</td>"+ // package size
|
||||
"<td>"+data[i].downloaded+"</td>"+ // package installed
|
||||
"<td>"+data[i].installed+"</td>"+ // package installed
|
||||
"<td><input class='pkgcheckbox' id='"+data[i].pkgname+"' type='checkbox'>"+
|
||||
"<input class='pkgvalue' type='hidden' id='"+data[i].pkgname+"_value' name='"+data[i].pkgnver+"' value='"+data[i].config+"'></td>"+
|
||||
"</tr>");
|
||||
|
||||
$("#"+data[i].pkgname)
|
||||
.switchButton({
|
||||
labels_placement: 'right',
|
||||
on_label: 'On',
|
||||
off_label: 'Off',
|
||||
labels_placement: "right",
|
||||
on_label: "On",
|
||||
off_label: "Off",
|
||||
checked: data[i].config == "yes"
|
||||
})
|
||||
.change(function() {
|
||||
var par = $(this).parent().parent();
|
||||
if(this.checked)
|
||||
par.find('.pkgvalue').val("yes");
|
||||
else
|
||||
par.find('.pkgvalue').val("no");
|
||||
$(this).parent().parent().find(".pkgvalue").val(this.checked ? "yes": "no");
|
||||
if (this.checked)
|
||||
checkDepends();
|
||||
$("#btnApply").prop("disabled", false);
|
||||
checkDepends();
|
||||
});
|
||||
}
|
||||
$("#tblPackages").trigger("update");
|
||||
|
||||
//tablesorter options
|
||||
$('#tblPackages').tablesorter({
|
||||
sortList: [[0,1]],
|
||||
widgets: ['saveSort', 'filter', 'stickyHeaders'],
|
||||
widgetOptions: {
|
||||
stickyHeaders_filteredToTop: true,
|
||||
filter_hideEmpty : true,
|
||||
filter_liveSearch : true,
|
||||
filter_saveFilters : true,
|
||||
filter_reset : 'button.reset',
|
||||
filter_functions: {
|
||||
'.filter-version' : true,
|
||||
'.filter-downloaded' : true,
|
||||
'.filter-installed' : true
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
error: function () {
|
||||
}
|
||||
$("#tblPackages").trigger("update");
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
function checkDepends() {
|
||||
if ($('#screen').prop('checked') == true){
|
||||
$('#utempter').switchButton({checked: true});
|
||||
$('#utempter','.pkgvalue').val('yes');
|
||||
if ($("#screen").prop("checked")) {
|
||||
$("#utempter").switchButton({checked: true});
|
||||
$("#utempter", ".pkgvalue").val("yes");
|
||||
}
|
||||
if ($('#iotop').prop('checked') == true){
|
||||
$('#python').switchButton({checked: true});
|
||||
$('#python','.pkgvalue').val('yes');
|
||||
if ($("#iotop").prop("checked")) {
|
||||
$("#python").switchButton({checked: true});
|
||||
$("#python", ".pkgvalue").val("yes");
|
||||
}
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user