Some minor popup fixes for mailto URLs.

diff --git a/Cydia.app/package.html b/Cydia.app/package.html
index fdbc835ec6260a58e8a4b5661daa82c0fbc14c21..6fcc77c18f3676a6a8e9e0fc2affefa7c82de8d3 100644 (file)
--- a/Cydia.app/package.html
+++ b/Cydia.app/package.html
@@ -227,7 +227,7 @@
         <label>Change Package Settings</label>
     </div></a>
 
         <label>Change Package Settings</label>
     </div></a>
 

-    <a id="author-href" class="author">
+    <a id="author-href" class="author" target="_popup">

         <img id="author-icon" class="icon" src="email.png"/><div>
         <label>Author</label>
         <label id="author"></label>
         <img id="author-icon" class="icon" src="email.png"/><div>
         <label>Author</label>
         <label id="author"></label>


@@ -335,7 +335,7 @@
         <label id="size"></label>
     </div></div>
 
         <label id="size"></label>
     </div></div>
 

-    <a id="maintainer-href" class="maintainer">
+    <a id="maintainer-href" class="maintainer" target="_popup">

         <img id="maintainer-icon" class="icon" src="email.png"/><div>
         <label>Contact</label>
         <label id="maintainer"></label>
         <img id="maintainer-icon" class="icon" src="email.png"/><div>
         <label>Contact</label>
         <label id="maintainer"></label>

diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m
index 3a4b77937c0bed76524132249dd376f57d7d1b8a..5cfc3d0cd311beaff9ca9f7482898cd1d22f28bd 100644 (file)
--- a/UICaboodle/BrowserView.m
+++ b/UICaboodle/BrowserView.m
@@ -567,25 +567,30 @@
         } else if ([name isEqualToString:@"_open"])
             [delegate_ openURL:url];
         else if ([name isEqualToString:@"_popup"]) {
         } else if ([name isEqualToString:@"_open"])
             [delegate_ openURL:url];
         else if ([name isEqualToString:@"_popup"]) {

-            RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
-            [book setHook:indirect_];
-
-            RVPage *page([delegate_ pageForURL:url hasTag:NULL]);
-            if (page == nil) {
-                /* XXX: call createWebViewWithRequest instead? */
+            NSString *scheme([[url scheme] lowercaseString]);
+            if ([scheme isEqualToString:@"mailto"])
+                [delegate_ openMailToURL:url];
+            else {
+                RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
+                [book setHook:indirect_];
+
+                RVPage *page([delegate_ pageForURL:url hasTag:NULL]);
+                if (page == nil) {
+                    /* XXX: call createWebViewWithRequest instead? */
+
+                    [self setBackButtonTitle:title_];
+
+                    BrowserView *browser([[[BrowserView alloc] initWithBook:book] autorelease]);
+                    [browser loadURL:url];
+                    page = browser;
+                }

 
 

-                [self setBackButtonTitle:title_];
+                [book setDelegate:delegate_];
+                [page setDelegate:delegate_];

 
 

-                BrowserView *browser([[[BrowserView alloc] initWithBook:book] autorelease]);
-                [browser loadURL:url];
-                page = browser;
+                [book setPage:page];
+                [book_ pushBook:book];

             }
             }

-
-            [book setDelegate:delegate_];
-            [page setDelegate:delegate_];
-
-            [book setPage:page];
-            [book_ pushBook:book];

         } else goto unknown;
 
         [listener ignore];
         } else goto unknown;
 
         [listener ignore];