Changeset 474

Timestamp:

2007-07-05 20:49:31 (2 years ago)

Author:

MaierMan

Message:

return of Thunderbird support (closing source tab not yet handled)
features a fix for url lists not really unique

Files:

• trunk/chrome.manifest (modified) (2 diffs)
• trunk/chrome/content/common/internalFunctions.js (modified) (2 diffs)
• trunk/chrome/content/common/overlayFunctions.js (modified) (7 diffs)
• trunk/chrome/content/integration/elements.js (modified) (15 diffs)
• trunk/chrome/content/integration/firefox.xul (modified) (1 diff)
• trunk/chrome/content/integration/thunderbird.xul (added)
• trunk/install.rdf (modified) (2 diffs)

trunk/chrome.manifest

@@ -26 +26 @@
-overlay chrome://browser/content/sanitize.xul   chrome://dta/content/privacy/overlaySanitizeUI.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-overlay chrome://browser/content/sanitize.xul   chrome://dta/content/privacy/overlaySanitizeCode.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+overlay chrome:///content/downloads/unknownContentType.xul      chrome://dta/content/integration/saveas.xul
-
-## Seamonkey ##
@@ -33 +34 @@
-style   chrome://navigator/content/navigator.xul chrome://dta/skin/integration/style.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-
+## Thunderbird ##
+overlay chrome://messenger/content/messenger.xul chrome://dta/content/integration/thunderbird.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+overlay chrome://messenger/content/messageWindow.xul chrome://dta/content/integration/thunderbird.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+overlay chrome://dta/content/integration/thunderbird.xul chrome://dta/content/integration/elements.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+style   chrome://messenger/content/messenger.xul chrome://dta/skin/integration/style.css application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+style   chrome://messenger/content/messageWindow.xul chrome://dta/skin/integration/style.css application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+style   chrome://global/content/customizeToolbar.xul chrome://dta/skin/integration/style.css application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+
-## toolkit ##
-overlay chrome://mozapps/content/downloads/unknownContentType.xul       chrome://dta/content/integration/saveas.xul

trunk/chrome/content/common/internalFunctions.js

@@ -310 +310 @@
-                }
-                
-'TB','GB','MB','KB'
+['TB', 3], ['GB', 2], ['MB', 2], ['KB', 1]
-                var unit;
-                
@@ -318 +318 @@
-                }
-                
-2) + " " + unit
+unit[1]) + " " + unit[0]
-        },
-        

trunk/chrome/content/common/overlayFunctions.js

@@ -329 +329 @@
-DTA_DropProcessor.prototype = {
-        getSupportedFlavours: function() {
- 
+
-                flavours.appendFlavour("text/x-moz-url");
-                return flavours;
-        },
-
-
+
-        onDrop: function (evt,dropdata,session) {
-                if (!dropdata) {
-                        return;
-                }
-
+
+
+
+
+
+
-                var doc = document.commandDispatcher.focusedWindow.document;
-                url = new DTA_URL(url, doc.characterSet);
-
-
-
-
+
-                this.func(url, ref);
-        }
@@ -421 +422 @@
-                return this.ios.newURI(rel, doc.characterSet, this.ios.newURI(base, doc.characterSet, null)).spec;
-        },
+        
+        getRef: function(doc) {
+                var ref = doc.URL;
+                if (!this.isLinkOpenable(ref)) {
+                        var b = doc.getElementsByTagName('base');
+                        for (var i = 0; i < b.length; ++i) {
+                                if (!b[i].hasAttribute('href')) {
+                                        continue;
+                                }
+                                try {
+                                        ref = this.composeURL(doc, b[i].getAttribute('href'));
+                                }
+                                catch (ex) {
+                                        continue;
+                                }
+                                break;
+                        }
+                }
+                return this.isLinkOpenable(ref) ? ref: '';
+        },      
-
-        saveSingleLink : function(turbo, url, referrer, description) {
@@ -540 +561 @@
-        openManager : function (quite) {
-                try {
-
+ByUrl
-                        if (win) {
-                                if (!quite) {
@@ -552 +573 @@
-                                "chrome, centerscreen, resizable=yes, dialog=no, all, modal=no, dependent=no"
-                        );
-
+ByUrl
-                } catch(ex) {
-                        DTA_debug.dump("openManager():", ex);
@@ -560 +581 @@
-
-        sendToDown : function(notQueue, links) {
-
+ByUrl
-                if (win) {
-                        win.self.startnewDownloads(notQueue, links);
@@ -577 +598 @@
-
-        getMostRecent: function(name)   {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (!url) {
-                        return null;
@@ -602 +630 @@
-                }
-                return null;
+        },
+        getAllByType: function(type) {
+                var rv = [];
+                var enumerator = this._m.getEnumerator(type);
+                while (enumerator.hasMoreElements()) {
+                        rv.push(enumerator.getNext());
+                }
+                return rv;
-        },
-        openTab: function WM_openTab(url, ref) {

trunk/chrome/content/integration/elements.js

@@ -58 +58 @@
-        
-        addLinksToArray: function(lnks, urls, doc) {
-
-
+
-                        return;
-                }
-
+
+
+
-                for (var i = 0; i < lnks.length; ++i) {
-                        // remove anchor from url
@@ -68 +69 @@
-                        var plink = link.href.replace(/#.*$/gi, "");
-                        // if it's valid and it's new
- || plink in known
+
-                                continue;
-                        }
@@ -85 +86 @@
-                                'hash': DTA_getLinkPrintHash(link.hash)
-                        });
-                        known[plink] = null;
-                        
-                        var ml = DTA_getLinkPrintMetalink(link.hash);
@@ -96 +96 @@
-                                        'metalink': true
-                                });
-                                known[ml] = null;
-                        }
-                }
@@ -102 +101 @@
-        
-        addImagesToArray: function(lnks, images, doc)   {
-                var ref = doc.URL;
-                
-                if (!lnks || !lnks.length) {
-                        return;
-                }
-
-
+
+
+
-                for (var i = 0; i < lnks.length; ++i) {
-                        var src = lnks[i].src;
@@ -122 +120 @@
-                        // if it's valid and it's new
-                        // better double check :p
- || src in known
+
-                                continue;
-                        }
@@ -137 +135 @@
-                                'description': desc
-                        });
-                        known[src] = null;
-                }
-        },
@@ -171 +168 @@
-                        var sel = aWin.getSelection();
-                        if (honorSelection && sel && !sel.isCollapsed) {
-
+
+
-                                        function(e) {
-e =
+return
-                                        }
-                                );
@@ -203 +201 @@
-        },
-        
+        findWindowsNavigator: function(all) {
+                var windows = [];
+                if (!all) {
+                        var sel = document.commandDispatcher.focusedWindow.getSelection();
+                        if (sel.isCollapsed) {
+                                windows.push(DTA_Mediator.getMostRecent().getBrowser().selectedBrowser.contentWindow.top);
+                        }
+                        else {
+                                windows.push(document.commandDispatcher.focusedWindow);
+                        }
+                }
+                else {
+                        var win = DTA_Mediator.getMostRecent().getBrowser();
+                        win.browsers.forEach(
+                                function(e) {
+                                        windows.push(e.contentWindow.top);
+                                }
+                        );
+                }
+                return windows;
+        },
+        findWindowsMail: function(all) {
+                var windows = [];
+                if (document.documentElement.getAttribute('windowtype') == 'mail:3pane') {
+                        windows.push(document.getElementById('messagepane').contentWindow);
+                }
+                else if (!all) {
+                        windows.push(document.commandDispatcher.focusedWindow);
+                }
+                else {
+                        windows = DTA_Mediator
+                                .getAllByType('mail:messageWindow')
+                                .map(function(w) {
+                                        return w.content;
+                                });
+                }
+                return windows;
+        },
+        
-        findLinks: function(turbo, all) {
-                try {
+                        
+                        function makeUnique(i) {
+                                var known = {};
+                                return i.filter(
+                                        function(e) {
+                                                var url = e.url.url;
+                                                if (url in known) {
+                                                        return false;
+                                                }
+                                                known[url] = null;
+                                                return true;
+                                        }
+                                );
+                        }               
+                        
-                        if (turbo) {
-                                DTA_debug.dump("findLinks(): DtaOneClick request from the user");
@@ -211 +263 @@
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                        var urls = [];
-                        var images = [];
@@ -239 +278 @@
-                                this
-                        );
+                        urls = makeUnique(urls);
+                        images = makeUnique(images);
+
-                        if (!urls.length && !images.length) {
-                                DTA_alert(this.getString('error'), this.getString('errornolinks'));
@@ -265 +307 @@
-                        var cur = gContextMenu.target;
-                        
-
-
-
-
-
+
+
-                        while (!("tagName" in cur) || !tofind.test(cur.tagName)) {
-                                cur = cur.parentNode;
-                        }
-                        
-                        var url = gContextMenu.onLink ? cur.href : cur.src;
-                        
@@ -282 +320 @@
-                        
-                        url = new DTA_URL(url, win.document.characterSet);
-document.commandDispatcher.focusedWindow.document.URL
+DTA_AddingFunctions.getRef(document.commandDispatcher.focusedWindow.document)
-                        var desc = this.extractDescription(cur);
-                        if (turbo) {
@@ -394 +432 @@
-                        
-                        // general setup
-'context-sep-selectall'
+this.ctxBase.getAttribute('insertafter')
-                        if (compact) {
-                                this.ctxBase.hidden = false;
@@ -411 +449 @@
-                                if (compact) {
-                                        this.ctxMenu.insertBefore(cur, this.ctxMenu.firstChild);
-
+
+
-                                        base.parentNode.insertBefore(cur, base);
-                                        base = cur;

trunk/chrome/content/integration/firefox.xul

@@ -13 +13 @@
-
-        <popup id="contentAreaContextMenu">
- 
+
-        </popup>
-

trunk/install.rdf

@@ -25 +25 @@
-                        <rdf:Description>
-                                <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
-.
+
-                                <maxVersion>3.0.*</maxVersion>
-                        </rdf:Description>
@@ -37 +37 @@
-                                <maxVersion>3.0</maxVersion>
-                        </rdf:Description>
-
+
+
+
+
+
+
+
+
+
+
-
-        </rdf:Description>