From 2bf876262f1fe6c9118d12ac2498c1f458bd1f97 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Mon, 24 Mar 2014 21:07:32 +0000
Subject: [PATCH] checkbox fixes, glob removal
git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1825 2a923420-c742-0410-a762-8d5b09965624
---
CONTROL/control | 4 ++--
var/mongoose/cgi-bin/settings.js | 2 +-
var/mongoose/html/browse/crop/execute.jim | 9 +++++----
var/mongoose/html/browse/decrypt/execute.jim | 9 ++++-----
var/mongoose/html/browse/script.js | 8 ++++----
var/mongoose/html/browse/strip/execute.jim | 8 ++++----
var/mongoose/html/epg/service.js | 2 +-
.../iphone-style-checkboxes/iphone-style-checkboxes.js | 6 +++---
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/CONTROL/control b/CONTROL/control
index 0d219e3..3ee37f6 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,10 +1,10 @@
Package: webif
Priority: optional
Section: web
-Version: 1.0.10-1
+Version: 1.0.10-2
Architecture: mipsel
Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.1.9),mongoose(>=3.0.11),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,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)
+Depends: webif-channelicons(>=1.1.10),mongoose(>=3.0.11),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,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)
Suggests:
Description: An evolving web interface for the Humax.
Tags: http://hummy.tv/forum/threads/4723/
diff --git a/var/mongoose/cgi-bin/settings.js b/var/mongoose/cgi-bin/settings.js
index 527484d..91cbdd8 100644
--- a/var/mongoose/cgi-bin/settings.js
+++ b/var/mongoose/cgi-bin/settings.js
@@ -44,7 +44,7 @@ $(document).ready(function () {
$('.setting_toggle').change(function() {
var arg = '0';
var urlargs;
- if ($(this).attr('checked'))
+ if ($(this).prop('checked'))
arg = '1';
if ($(this).attr('invert'))
diff --git a/var/mongoose/html/browse/crop/execute.jim b/var/mongoose/html/browse/crop/execute.jim
index 0b54032..3614b72 100755
--- a/var/mongoose/html/browse/crop/execute.jim
+++ b/var/mongoose/html/browse/crop/execute.jim
@@ -34,10 +34,11 @@ if {[file exists "$origdir/$shname.ts"]} {
}
puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
- set tail [file tail $f]
- puts " $tail"
- file rename $f "$origdir/$tail"
+
+set tail [file tail $base]
+foreach ext $tsgroup {
+ puts " $tail.$ext"
+ file rename "$base.$ext" "${origdir}/$tail.$ext"
}
puts [exec /mod/bin/nicesplice \
diff --git a/var/mongoose/html/browse/decrypt/execute.jim b/var/mongoose/html/browse/decrypt/execute.jim
index 1bdc2cb..46dafff 100755
--- a/var/mongoose/html/browse/decrypt/execute.jim
+++ b/var/mongoose/html/browse/decrypt/execute.jim
@@ -42,11 +42,10 @@ exec wget -O "$rfile.decrypting" $url
puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
- if {[file extension $f] eq ".decrypting"} { continue }
- set tail [file tail $f]
- puts " $tail"
- file rename $f "${origdir}/$tail"
+set tail [file tail $base]
+foreach ext $tsgroup {
+ puts " $tail.$ext"
+ file rename "$base.$ext" "${origdir}/$tail.$ext"
}
file rename "$rfile.decrypting" $rfile
diff --git a/var/mongoose/html/browse/script.js b/var/mongoose/html/browse/script.js
index 15ffca2..e9ec5de 100755
--- a/var/mongoose/html/browse/script.js
+++ b/var/mongoose/html/browse/script.js
@@ -833,7 +833,7 @@ var dmenuclick = function(action, el, pos)
reloadclipboard();
// Uncheck everything
- $('input.fs:checked').attr('checked', false);
+ $('input.fs:checked').prop('checked', false);
// Buttons
@@ -861,11 +861,11 @@ var dmenuclick = function(action, el, pos)
$('#selectall').click(function(e) {
e.preventDefault();
- $('input.fs').attr('checked', true).trigger('change');
+ $('input.fs').prop('checked', true).trigger('change');
});
$('#deselectall').click(function(e) {
e.preventDefault();
- $('input.fs:checked').attr('checked', false).trigger('change');
+ $('input.fs:checked').prop('checked', false).trigger('change');
});
$('#join').button().disable()
@@ -936,7 +936,7 @@ var dmenuclick = function(action, el, pos)
'path': files
}, function() {
reloadclipboard();
- $('input.fs:checked').attr('checked', false);
+ $('input.fs:checked').prop('checked', false);
});
});
diff --git a/var/mongoose/html/browse/strip/execute.jim b/var/mongoose/html/browse/strip/execute.jim
index a524f5a..1a11736 100755
--- a/var/mongoose/html/browse/strip/execute.jim
+++ b/var/mongoose/html/browse/strip/execute.jim
@@ -28,10 +28,10 @@ if {[file exists "$origdir/$shname.ts"]} {
}
puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
- set tail [file tail $f]
- puts " $tail"
- file rename $f "$origdir/$tail"
+set tail [file tail $base]
+foreach ext $tsgroup {
+ puts " $tail.$ext"
+ file rename "$base.$ext" "${origdir}/$tail.$ext"
}
puts [exec /mod/bin/stripts \
diff --git a/var/mongoose/html/epg/service.js b/var/mongoose/html/epg/service.js
index a9d17bc..ffa1b95 100644
--- a/var/mongoose/html/epg/service.js
+++ b/var/mongoose/html/epg/service.js
@@ -7,7 +7,7 @@ $('#synopsis').iphoneStyle({
checkedLabel: 'YES',
uncheckedLabel: 'NO'
}).bind('change', function() {
- if ($(this).attr('checked'))
+ if ($(this).prop('checked'))
$('.synopsis').show();
else
$('.synopsis').hide();
diff --git a/var/mongoose/html/lib/jquery.plugin/iphone-style-checkboxes/iphone-style-checkboxes.js b/var/mongoose/html/lib/jquery.plugin/iphone-style-checkboxes/iphone-style-checkboxes.js
index a868bb3..14a9beb 100644
--- a/var/mongoose/html/lib/jquery.plugin/iphone-style-checkboxes/iphone-style-checkboxes.js
+++ b/var/mongoose/html/lib/jquery.plugin/iphone-style-checkboxes/iphone-style-checkboxes.js
@@ -116,10 +116,10 @@ $.extend($[iphoneStyle].prototype, {
var p = (x - $[iphoneStyle].dragStartPosition) / obj.rightSide;
checked = (p < 0) ? Math.abs(p) < 0.5 : p >= 0.5;
} else {
- checked = !obj.$elem.attr('checked');
+ checked = !obj.$elem.prop('checked');
}
- obj.$elem.attr('checked', checked);
+ obj.$elem.prop('checked', checked);
$[iphoneStyle].currentlyClicking = null;
$[iphoneStyle].dragging = null;
@@ -135,7 +135,7 @@ $.extend($[iphoneStyle].prototype, {
obj.container.removeClass(obj.disabledClass);
}
- var new_left = obj.$elem.attr('checked') ? obj.rightSide : 0;
+ var new_left = obj.$elem.prop('checked') ? obj.rightSide : 0;
obj.handle.animate({ left: new_left }, obj.duration);
obj.onLabel.animate({ width: new_left + 4 }, obj.duration);