From 1c9da2f52faf367bfc70696330a79d54409bf1e5 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Sat, 29 Nov 2014 11:39:24 +0000
Subject: [PATCH] update

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@2068 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                               |  2 +-
 webif/html/browse/assets.jim                  |  9 ++++
 webif/html/browse/index.jim                   |  2 +-
 webif/html/browse/script.js                   | 50 +++++++++++++++++--
 webif/html/lib/jquery.plugin/enadis/enadis.js |  6 ++-
 5 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 3b27225..99caeb6 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.17-9
+Version: 1.0.17-10
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.13),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.14),hmt(>=1.1.21),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),mongoose
diff --git a/webif/html/browse/assets.jim b/webif/html/browse/assets.jim
index cc67f2c..99d02fd 100755
--- a/webif/html/browse/assets.jim
+++ b/webif/html/browse/assets.jim
@@ -59,6 +59,15 @@ puts {
 
 	<li class=separator><a href=#rename>Rename</a></li>
 	<li><a href=#download>Download</a></li>
+}
+if {[llength $plugins(omenu)]} {
+	foreach plugin $plugins(omenu) {
+		lassign $plugin tag options
+		puts "<li class=$tag><a href=#$tag>$options(desc)</a></li>"
+	}
+}
+
+puts {
 </ul>
 
 <ul id=dooptmenu class=contextMenu style="width: 250px">
diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index 1ab9f9b..946465e 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -8,7 +8,7 @@ require ts.class pretty_size system.class settings.class escape browse.class \
 jqplugin contextMenu bar enadis
 jscss script.js style.css
 
-set plugins { dmenu {} menu {} }
+set plugins { dmenu {} menu {} omenu {} }
 eval_plugins browse
 
 header
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index b8af830..b9bac98 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -1,7 +1,11 @@
 
 var plugins = {
 	menu: {},
-	dmenu: {}
+	menu_prepare: {},
+	omenu: {},
+	omenu_prepare: {},
+	dmenu: {},
+	dmenu_prepare: {}
 };
 
 var dir;
@@ -339,6 +343,18 @@ function preparemenu(el, menu)
 		$(menu).disableContextMenuItems('#new');
 	}
 
+	$.each(plugins.menu_prepare, function(k,v) {
+		plugins.menu_prepare[k](el, menu);
+	});
+}
+
+function prepareomenu(el, menu)
+{
+	$(menu).enableContextMenuItems('#delete');
+
+	$.each(plugins.omenu_prepare, function(k,v) {
+		plugins.omenu_prepare[k](el, menu);
+	});
 }
 
 function fixdmenu(el, menu, flag, tag, descr, recurse)
@@ -388,6 +404,9 @@ function preparedmenu(el, menu)
 	fixdmenu(el, menu, 'autompg', '#mpg', 'Auto-mpg', 0);
 	fixdmenu(el, menu, 'automp3', '#mp3', 'Auto-audio', 0);
 	//fixdmenu(el, menu, 'autoexpire', '#expire', 'Auto-expire', 0);
+	$.each(plugins.dmenu_prepare, function(k,v) {
+		plugins.dmenu_prepare[k](el, menu);
+	});
 }
 
 function flagdir(file, flag, iconset, output, options)
@@ -529,6 +548,31 @@ var menuclick = function(action, el, pos)
 	}
 };
 
+var omenuclick = function(action, el, pos)
+{
+	switch (action)
+	{
+	    case 'delete':
+	    case 'copy':
+	    case 'cut':
+	    case 'rename':
+	    case 'download':
+		menuclick(action, el, pos);
+		break;
+
+	    default:
+		if (plugins.omenu[action])
+		{
+			var file = $(el).parent().prevAll('a.bf')
+			    .last().attr('file');
+			plugins.omenu[action](file);
+		}
+		else
+			alert('Unhandled action: ' + action);
+		break;
+	}
+};
+
 var dmenuclick = function(action, el, pos)
 {
 	var direl = $(el).parent().parent();
@@ -683,9 +727,9 @@ var dmenuclick = function(action, el, pos)
 		{
 			menu: 'ooptmenu',
 			leftButton: true,
-			beforeShow: preparemenu
+			beforeShow: prepareomenu
 		},
-		menuclick
+		omenuclick
 	);
 
 	$('img.dopt').contextMenu(
diff --git a/webif/html/lib/jquery.plugin/enadis/enadis.js b/webif/html/lib/jquery.plugin/enadis/enadis.js
index 216cf24..3e52cdd 100755
--- a/webif/html/lib/jquery.plugin/enadis/enadis.js
+++ b/webif/html/lib/jquery.plugin/enadis/enadis.js
@@ -7,7 +7,8 @@
 			    .removeClass('ui-state-disabled')
 			    .removeClass('ui-button-disabled')
 			    .prop('disabled', false)
-			    .removeAttr('aria-disabled');
+			    .removeAttr('aria-disabled')
+			    .disabled = false;
 		});
 	};
 
@@ -16,7 +17,8 @@
 		return this.each(function() {
 			$(this)
 			    .addClass('ui-state-disabled')
-			    .prop('disabled', true);
+			    .prop('disabled', true)
+			    .disabled = true;
 		});
 	};
 })(jQuery);