X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fview%2Fsystem.software.js;h=9f208d3255dd1cd1e7f096d3f21ed22512a614bf;hb=90469275848f4b6fc1a8d73371e8bb2e8c4fb129;hp=7526e01986b150be78133ed6e677fcedbac41a57;hpb=2f0e65dd27549ef4fde5b18588083968a59b66bd;p=project%2Fluci2%2Fui.git

diff --git a/luci2/htdocs/luci2/view/system.software.js b/luci2/htdocs/luci2/view/system.software.js
index 7526e01..9f208d3 100644
--- a/luci2/htdocs/luci2/view/system.software.js
+++ b/luci2/htdocs/luci2/view/system.software.js
@@ -1,7 +1,7 @@
 L.ui.view.extend({
 	updateDiskSpace: function()
 	{
-		return L.system.getInfo(function(info) {
+		return L.system.getDiskInfo().then(function(info) {
 			$('#package_space').empty().append(
 				new L.ui.progress({
 					value:  info.root.used / 1024,
@@ -11,16 +11,12 @@ L.ui.view.extend({
 		});
 	},
 
-	installRemovePackage: function(name)
+	installRemovePackage: function(pkgname, installed)
 	{
-		if (typeof(name) != 'string')
-			name = undefined;
-
-		var pkgname   = (name || this.getAttribute('name')).replace(/^.*\//, '');
-		var installed = name ? false : !!this.getAttribute('installed');
+		var dspname   = pkgname.replace(/^.+\//, '');
 		var action    = installed ? L.opkg.removePackage : L.opkg.installPackage;
-		var title     = (installed ? L.tr('Removing package "%s" …') : L.tr('Installing package "%s" …')).format(pkgname);
-		var confirm   = (installed ? L.tr('Really remove package "%h" ?') : L.tr('Really install package "%h" ?')).format(pkgname);
+		var title     = (installed ? L.tr('Removing package "%s" …') : L.tr('Installing package "%s" …')).format(dspname);
+		var confirm   = (installed ? L.tr('Really remove package "%h" ?') : L.tr('Really install package "%h" ?')).format(dspname);
 
 		var self = this;
 
@@ -29,8 +25,8 @@ L.ui.view.extend({
 			confirm: function() {
 				L.ui.dialog(title, L.tr('Waiting for package manager …'), { style: 'wait' });
 
-				action(name || pkgname).then(function(res) {
-					self.fetchInstalledList().then(function() { return fetchPackageList(); }).then(function() {
+				action(pkgname).then(function(res) {
+					self.fetchInstalledList().then(function() { return self.fetchPackageList(); }).then(function() {
 						var output = [ ];
 
 						if (res.stdout)
@@ -54,11 +50,11 @@ L.ui.view.extend({
 	fetchInstalledList: function()
 	{
 		var self = this;
-		return L.opkg.installedPackages(0, 0, '*', function(list) {
+		return L.opkg.installedPackages(0, 0, '*').then(function(list) {
 			self.installedList = { };
 			for (var i = 0; i < list.length; i++)
 				self.installedList[list[i][0]] = true;
-		})
+		});
 	},
 
 	fetchPackageList: function(offset, interactive)
@@ -92,7 +88,7 @@ L.ui.view.extend({
 		var install_disabled = $('#package_install').attr('disabled');
 		var self = this;
 
-		return action(offset, 100, pattern, function(list) {
+		return action(offset, 100, pattern).then(function(list) {
 			var packageTable = new L.ui.table({
 				placeholder: L.tr('No matching packages found.'),
 				columns: [ {
@@ -116,12 +112,14 @@ L.ui.view.extend({
 						return $('<button />')
 							.css('width', '100%')
 							.attr('disabled', install_disabled)
-							.attr('name', list[n][0])
+							.attr('pkgname', list[n][0])
 							.attr('installed', inst)
 							.addClass('cbi-button')
 							.addClass(inst ? 'cbi-button-apply' : 'cbi-button-reset')
 							.text(inst ? L.trc('Package state', 'Installed') : L.trc('Package state', 'Not installed'))
-							.click(self.installRemovePackage);
+							.click(function() {
+								self.installRemovePackage(this.getAttribute('pkgname'), this.getAttribute('installed') == 'true');
+							});
 					}
 				} ]
 			});
@@ -162,7 +160,7 @@ L.ui.view.extend({
 		$('#package_update, #package_url, #package_install').attr('disabled', !this.options.acls.software);
 
 		return $.when(
-			L.opkg.getConfig(function(config) {
+			L.opkg.getConfig().then(function(config) {
 				$('textarea')
 					.attr('rows', (config.match(/\n/g) || [ ]).length + 1)
 					.val(config);
@@ -171,7 +169,7 @@ L.ui.view.extend({
 					.click(function() {
 						var data = ($('textarea').val() || '').replace(/\r/g, '').replace(/\n?$/, '\n');
 						L.ui.loading(true);
-						L.opkg.setConfig(data, function() {
+						L.opkg.setConfig(data).then(function() {
 							$('textarea')
 								.attr('rows', (data.match(/\n/g) || [ ]).length + 1)
 								.val(data);
@@ -221,18 +219,18 @@ L.ui.view.extend({
 				ev.preventDefault();
 
 				if (this.value)
-					self.installRemovePackage(this.value);
+					self.installRemovePackage(this.value, false);
 			});
 
 			$('#package_install').click(function(ev) {
 				var name = $('#package_url').val();
 				if (name)
-					self.installRemovePackage(name);
+					self.installRemovePackage(name, false);
 			});
 
 			$('#package_update').click(function(ev) {
 				L.ui.dialog(L.tr('Updating package lists'), L.tr('Waiting for package manager …'), { style: 'wait' });
-				L.opkg.updateLists(function(res) {
+				L.opkg.updateLists().then(function(res) {
 					var output = [ ];
 
 					if (res.stdout)