diff options
| -rw-r--r-- | Cydia.app/menes/menes.js | 9 | ||||
| -rw-r--r-- | Cydia.app/package.html | 5 | ||||
| -rw-r--r-- | Cydia.app/package.js | 40 | ||||
| -rw-r--r-- | Cydia.mm | 17 | ||||
| -rw-r--r-- | control | 2 |
5 files changed, 54 insertions, 19 deletions
diff --git a/Cydia.app/menes/menes.js b/Cydia.app/menes/menes.js index 2ca5d7d..b5f457b 100644 --- a/Cydia.app/menes/menes.js +++ b/Cydia.app/menes/menes.js @@ -466,14 +466,19 @@ $.xhr = function (url, method, headers, data, events) { events = {}; xhr.onreadystatechange = function () { + console.log(xhr.readyState); if (xhr.readyState == 4) { var status = xhr.status; var text = xhr.responseText; if (events.response != null) events.response(status, text); - if (events.success != null) - if (status == 200) + if (status == 200) { + if (events.success != null) events.success(text); + } else { + if (events.failure != null) + events.failure(status); + } } }; diff --git a/Cydia.app/package.html b/Cydia.app/package.html index f9ec648..ae602b7 100644 --- a/Cydia.app/package.html +++ b/Cydia.app/package.html @@ -159,6 +159,7 @@ <div id="latest"></div> <iframe + onload="rating_()" class="rating" id="rating" frameborder="0" @@ -226,7 +227,7 @@ width="320" height="0" target="_top" - onLoad_="loaded()" + onload_="loaded()" ></iframe></div> <!--hr id="lower-bar" class="depiction"/--> @@ -244,7 +245,7 @@ <fieldset class="installed"> <div> <img class="icon" src="version.png"/><div> - <label> </label> + <label>Version</label> <label id="installed"></label> </div></div> diff --git a/Cydia.app/package.js b/Cydia.app/package.js index 3e7c9ca..679d183 100644 --- a/Cydia.app/package.js +++ b/Cydia.app/package.js @@ -34,6 +34,35 @@ function space(selector, html, max) { } } +var rated = 0; + +var rating = function () { + var rating = package.rating; + if (rating == null) + $(".rating").remove(); + else { + rating = 'fail.html'; + $.xhr('_' + rating, 'GET', {}, null, { + success: function (value) { + document.getElementById("rating").contentWindow.document.write(value); + }, + + failure: function (status) { + $(".rating").remove(); + } + }); + } +}; + +var rating_ = function() { + if (rated == 0) + rated = 1; + else if (rated == 1) { + rating(); + rated = -1; + } +}; + $(function () { var id = package.id; var idc = encodeURIComponent(id); @@ -46,16 +75,7 @@ $(function () { $("#name").html(name); space("#latest", package.latest, 93); - var rating = package.rating; - if (rating == null) - $(".rating").remove(); - else { - $.xhr(rating, 'GET', {}, null, { - success: function (value) { - document.getElementById("rating").contentWindow.document.write(value); - } - }); - } + rating_(); $("#settings").href("cydia://package-settings/" + idc); @@ -257,7 +257,7 @@ extern NSString * const kCAFilterNearest; #define lprintf(args...) fprintf(stderr, args) -#define ForRelease 1 +#define ForRelease 0 #define ForSaurik (1 && !ForRelease) #define IgnoreInstall (0 && !ForRelease) #define RecycleWebViews 0 @@ -6976,6 +6976,7 @@ id Dealloc_(id self, SEL selector) { }*/ int main(int argc, char *argv[]) { _pooled + _trace(); class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16"); bool substrate(false); @@ -7062,11 +7063,15 @@ int main(int argc, char *argv[]) { _pooled Indices_ = [[NSMutableDictionary alloc] init];*/ Indices_ = [NSMutableDictionary dictionaryWithObjectsAndKeys: - //@"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/server/rating/@", @"Rating", + @"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/rating/@", @"Rating", //@"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/repotag/@", @"RepoTag", nil]; - if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL) + _trace(); + Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]; + _trace(); + + if (Metadata_ == NULL) Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2]; else { Settings_ = [Metadata_ objectForKey:@"Settings"]; @@ -7103,8 +7108,11 @@ int main(int argc, char *argv[]) { _pooled /*if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0) dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);*/ - if (access("/User", F_OK) != 0) + if (access("/User", F_OK) != 0) { + _trace(); system("/usr/libexec/cydia/firmware.sh"); + _trace(); + } _assert([[NSFileManager defaultManager] createDirectoryAtPath:@"/var/cache/apt/archives/partial" @@ -7129,6 +7137,7 @@ int main(int argc, char *argv[]) { _pooled UIApplicationUseLegacyEvents(YES); UIKeyboardDisableAutomaticAppearance(); + _trace(); int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia"); CGColorSpaceRelease(space_); @@ -4,7 +4,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) <saurik@saurik.com> Architecture: iphoneos-arm -Version: 1.0.2677-38 +Version: 1.0.2678-38 Replaces: com.sosiphone.addcydia Depends: apt, darwintools, pcre, shell-cmds Conflicts: com.sosiphone.addcydia |