]> git.saurik.com Git - cydia.git/commitdiff
projects / cydia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c65611b)
Use HTML5 Offline for confirm.html.
authorJay Freeman (saurik) <saurik@saurik.com>
Thu, 10 Feb 2011 12:44:25 +0000 (04:44 -0800)
committerJay Freeman (saurik) <saurik@saurik.com>
Sun, 13 Feb 2011 02:23:15 +0000 (18:23 -0800)
MobileCydia.app/confirm.html [deleted file] patch | blob | blame | history
MobileCydia.app/confirm.js [deleted file] patch | blob | blame | history
MobileCydia.mm patch | blob | blame | history

diff --git a/MobileCydia.app/confirm.html b/MobileCydia.app/confirm.html
deleted file mode 100644 (file)
index dbc6043..0000000
--- a/MobileCydia.app/confirm.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-16"?>
-<html><head>
-    <title localize="CONFIRM"></title>
-    <meta name="viewport" content="width=320, minimum-scale=1.0, maximum-scale=1.0"/>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" type="text/css" href="menes/style.css"/>
-    <script type="text/javascript" src="menes/menes.js"></script>
-    <script type="text/javascript" src="confirm.js"></script>
-    <script type="text/javascript" src="localize.js"></script>
-    <base target="_blank"/>
-</head><body class="pinstripe">
-<panel id="issues">
-
-<fieldset class="issues">
-    <div><p><span style="color: red; font-weight: bold" localize="NOTE"></span>: <span localize="CANNOT_COMPLY_EX"></span></p></div>
-</fieldset>
-
-<label class="_issues statistics" localize="STATISTICS"></label>
-<fieldset class="_issues statistics">
-    <div class="downloading"><div>
-        <label localize="DOWNLOADING"></label>
-        <label id="downloading"></label>
-    </div></div>
-
-    <div class="resuming"><div>
-        <label localize="RESUMING_AT"></label>
-        <label id="resuming"></label>
-    </div></div>
-</fieldset>
-
-<label localize="MODIFICATIONS"></label>
-<fieldset id="modifications">
-</fieldset>
-
-<fieldset class="queue" style="margin-top: 25px;">
-<a href="javascript:queue();" style="text-align: center; color: #2a3f70; font-size: 15px; background-image: none;">
-    <label localize="CONTINUE_QUEUING"></label>
-</div></a>
-</fieldset>
-
-</panel>
-</body></html>
diff --git a/MobileCydia.app/confirm.js b/MobileCydia.app/confirm.js
deleted file mode 100644 (file)
index 4c74b43..0000000
--- a/MobileCydia.app/confirm.js
+++ /dev/null
@@ -1,80 +0,0 @@
-$(function () {
-    if (issues == null) {
-        $(".issues").remove();
-        var removed = 0;
-
-        var downloading = sizes[0];
-        if (downloading == "0.0 B") {
-            $(".downloading").remove();
-            removed += 1;
-        } else {
-            $("#downloading").html($.xml(downloading));
-        }
-
-        var resuming = sizes[1];
-        if (resuming == "0.0 B") {
-            $(".resuming").remove();
-            removed += 1;
-        } else {
-            $("#resuming").html($.xml(resuming));
-        }
-
-        if (removed >= 2) $(".statistics").remove();
-    } else for (var i = 0; i != issues.length; ++i) {
-        document.title = cydia.localize("CANNOT_COMPLY");
-
-        $(".queue").remove();
-
-        $("._issues").remove();
-
-        var issue = issues[i];
-
-        $("#issues").append(
-            "<label style=\"color: #704d4d\">" + $.xml(issue[0]) + "</label>" +
-            "<fieldset style=\"background-color: #dddddd\" class=\"clearfix\" id=\"i" + i + "\"></fieldset>"
-        );
-
-        for (var j = 1; j != issue.length; ++j) {
-            var entry = issue[j];
-            var type = entry[0];
-            if (type == "PreDepends")
-                type = "Depends";
-            var version = entry[1];
-            if (entry.length >= 4)
-                version += " " + entry[3];
-            $("#i" + i).append("<div class=\"clearfix\"><div>" +
-                "<label>" + $.xml(type) + "</label>" +
-                "<label>" + $.xml(version) + "</label>" +
-            "</div></div>");
-        }
-    }
-
-    var keys = [
-        "INSTALL",
-        "REINSTALL",
-        "UPGRADE",
-        "DOWNGRADE",
-        "REMOVE"
-    ];
-
-    for (var i = 0; i != 5; ++i) {
-        var list = changes[i];
-        var length = list.length;
-
-        if (length != 0) {
-            $("#modifications").append("<div class=\"clearfix\"><div>" +
-                "<label>" + cydia.localize($.xml(keys[i])) + "</label>" +
-                "<label id=\"c" + i + "\"></label>" +
-            "</div></div>");
-
-            var value = "";
-            for (var j = 0; j != length; ++j) {
-                if (j != 0)
-                    value += "<br/>";
-                value += $.xml(list[j]);
-            }
-
-            $("#c" + i).html(value);
-        }
-    }
-});
diff --git a/MobileCydia.mm b/MobileCydia.mm
index fe48f96980f2b6569bcf69bf9a7ac83c31eba10b..47b1d49d06f1e5a9673f509ad49e101f78de5aa7 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -4321,7 +4321,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             SizeString([database_ fetcher].PartialPresent()),
         nil];
 
-        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]];
+        [self loadURL:[NSURL URLWithString:CydiaURL(@"ui/confirm/")]];
 
         [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
             initWithTitle:UCLocalize("CANCEL")
Cydia Installer