Changeset 326

Timestamp:

2007-05-23 22:22:51 (2 years ago)

Author:

MaierMan

Message:

Add an URL composer for embeds.
Fixed: #170

Files:

• trunk/chrome/content/common/overlayFunctions.js (modified) (1 diff)
• trunk/chrome/content/integration/menu.js (modified) (2 diffs)

trunk/chrome/content/common/overlayFunctions.js

@@ -396 +396 @@
-                }
-                catch (ex) {
+                        // no op!
-                }
-                return false;
+        },
+        
+        composeURL: function UM_compose(doc, rel) {
+                // find <base href>
+                var base = doc.location.href;
+                var bases = doc.getElementsByTagName('base');
+                for (var i = 0; i < bases.length; ++i) {
+                        if (bases[i].hasAttribute('href')) {
+                                base = bases[i].getAttribute('href');
+                                break;
+                        }
+                }
+                return this.ios.newURI(rel, doc.characterSet, this.ios.newURI(base, doc.characterSet, null)).spec;
-        },
-

trunk/chrome/content/integration/menu.js

@@ -81 +81 @@
-
-                for (var i = 0; i<lnks.length; ++i) {
+                        var src = lnks[i].src;
+                        if (!DTA_AddingFunctions.isLinkOpenable(src)) {
+                                try {
+                                        src = DTA_AddingFunctions.composeURL(doc, src);
+                                }
+                                catch (ex) {
+                                        DTA_debug.dump("failed to compose: " + src, ex);
+                                        continue;
+                                }
+                        }
-                        // if it's valid and it's new
-
+
+
-                                // add to array
-                                var desc = '';
@@ -91 +102 @@
-                                }
-                                images[lnks[i].src] = {
-lnks[i].
+
-                                        'refPage': ref,
-                                        'description': desc