From fefdda6bcfde597dac30b4f18341a0598cff98c1 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 9 Dec 2008 03:14:28 +0000 Subject: Fixed an XHTML issue, finished confirmation Javascript, and finally enhanced Test script. --- Cydia.app/Test | 10 +++++--- Cydia.app/confirm.html | 12 ++++++--- Cydia.app/confirm.js | 66 ++++++++++++++++++++++++++++++++++---------------- Cydia.app/loading.html | 2 +- 4 files changed, 60 insertions(+), 30 deletions(-) (limited to 'Cydia.app') diff --git a/Cydia.app/Test b/Cydia.app/Test index ad27eeb..5bfd090 100755 --- a/Cydia.app/Test +++ b/Cydia.app/Test @@ -1,6 +1,8 @@ #!/bin/bash +killall Cydia_ set -e -Cydia=$(dirname "$0") -rsync -SPaz saurik@carrier.saurik.com:menes/cydia/Cydia "${Cydia}"/Cydia_ -chmod +s "${Cydia}"/Cydia_ -#NSZombieEnabled=YES su -c "${Cydia}"/Cydia_ mobile +rsync -SPaz --copy-links saurik@carrier.saurik.com:menes/cydia/cydia_iphoneos-arm.deb . +dpkg -i cydia_iphoneos-arm.deb +touch /tmp/cydia.log +openURL "${1-cydia://}" +exec tail /tmp/cydia.log -fn0 diff --git a/Cydia.app/confirm.html b/Cydia.app/confirm.html index 55fec23..b1fc0dc 100644 --- a/Cydia.app/confirm.html +++ b/Cydia.app/confirm.html @@ -6,11 +6,15 @@ - - + + - -
+
+

Note: The requested modifications cannot be applied due to required dependencies or conflicts that cannot be automatically found or fixed.

+
+ + +
diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js index 09a121c..9210295 100644 --- a/Cydia.app/confirm.js +++ b/Cydia.app/confirm.js @@ -1,28 +1,52 @@ $(function () { - var downloading = sizes[0]; - if (downloading == "0.0 B") - $(".downloading").remove(); - else - $("#downloading").html($.xml(downloading)); + if (issues == null) { + $(".issues").remove(); - var resuming = sizes[1]; - if (resuming == "0.0 B") - $(".resuming").remove(); - else + var downloading = sizes[0]; + if (downloading == "0.0 B") + $(".downloading").remove(); + else + $("#downloading").html($.xml(downloading)); + + var resuming = sizes[1]; + if (resuming == "0.0 B") + $(".resuming").remove(); + else $("#resuming").html($.xml(resuming)); - var size = sizes[2]; - var negative; + var size = sizes[2]; + var negative; - if (size.charAt(0) != '-') - negative = false; - else { - negative = true; - size = size.substr(1); - } + if (size.charAt(0) != '-') + negative = false; + else { + negative = true; + size = size.substr(1); + } + + $("#disk-key").html(negative ? "Disk Freeing" : "Disk Using"); + $("#disk-value").html($.xml(size)); + } else for (var i = 0; i != issues.length; ++i) { + $("._issues").remove(); - $("#disk-key").html(negative ? "Disk Freeing" : "Disk Using"); - $("#disk-value").html($.xml(size)); + var issue = issues[i]; + + $("#issues").append( + "" + + "
" + ); + + for (var j = 1; j != issue.length; ++j) { + var entry = issue[j]; + var type = entry[0]; + if (type == "PreDepends") + type = "Depends"; + $("#i" + i).append("
" + + "" + + "
" + entry[1] + " " + entry[3] + "
" + + "
"); + } + } var keys = [ "Install", @@ -39,7 +63,7 @@ $(function () { if (length != 0) { $("#modifications").append("
" + "" + - "
" + + "
" + "
"); var value = ""; @@ -49,7 +73,7 @@ $(function () { value += $.xml(list[j]); } - $("#i" + i).html(value); + $("#c" + i).html(value); } } }); diff --git a/Cydia.app/loading.html b/Cydia.app/loading.html index 85cc4c5..33b2637 100644 --- a/Cydia.app/loading.html +++ b/Cydia.app/loading.html @@ -7,7 +7,7 @@
- +
Loading... -- cgit v1.2.3