Changeset 874

Timestamp:

2008-03-12 02:36:44 (8 months ago)

Author:

MaierMan

Message:

#190: Allow to get (some) POST data
New action to save the target of forms.
Will work with GET/POST forms where the server accepts urlencoded input.

Files:

• trunk/chrome/content/common/overlayFunctions.js (modified) (3 diffs)
• trunk/chrome/content/dta/addurl.js (modified) (3 diffs)
• trunk/chrome/content/dta/manager.js (modified) (1 diff)
• trunk/chrome/content/integration/elements.js (modified) (4 diffs)
• trunk/chrome/content/integration/elements.xul (modified) (1 diff)
• trunk/chrome/locale/en-US/menu.dtd (modified) (1 diff)

trunk/chrome/content/common/overlayFunctions.js

@@ -314 +314 @@
-                        }
-                }
-.spec
+
-        },
-        
@@ -326 +326 @@
-                                }
-                                try {
-
+.spec
-                                }
-                                catch (ex) {
@@ -337 +337 @@
-        },      
-
-
+, postData
-                var item = {
-                        'url': url,

trunk/chrome/content/dta/addurl.js

@@ -41 +41 @@
-
-function QueueItem(url, num, desc, hash) {
-        if (!(url instanceof DTA_URL) || !DTA_AddingFunctions.isLinkOpenable(url)) {
-                throw new Components.Exception('invalid url');
-        }
-        this.url = url;
-        this.numIstance = num;
@@ -116 +113 @@
-
-function BatchGenerator(link) {
-        if (!(link instanceof DTA_URL)) {
-                throw new Components.Exception("invalid argument. Type not DTA_URL");
-        }
-        this.url = link.url;
-        var url = this.url;
@@ -275 +269 @@
-                                        // JS does not preserve types between windows (as each window gets an own sandbox)
-                                        // This hack makes our URL a DTA_URL again ;)
-new DTA_URL(a.url.url, a.url.charset)
+a.url
-                                        address.readOnly = true;
-                                        $('batcheslabel').style.display = 'none';

trunk/chrome/content/dta/manager.js

@@ -2507 +2507 @@
-                        d.hash = null; // to initialize prettyHash 
-                }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-                d.state = start ? QUEUED : PAUSED;

trunk/chrome/content/integration/elements.js

@@ -109 +109 @@
-                        if (!DTA_AddingFunctions.isLinkOpenable(src)) {
-                                try {
-
+.spec
-                                }
-                                catch (ex) {
@@ -355 +355 @@
-                }
-        },
+        findForm: function(turbo) {
+                try {
+                        var ctx = this.contextMenu;
+                        if (!('form' in ctx.target)) {
+                                throw new Components.Exception("No form");
+                        }
+                        var form = ctx.target.form;
+                        
+                        var action = DTA_AddingFunctions.composeURL(form.ownerDocument, form.action);
+                        if (!DTA_AddingFunctions.isLinkOpenable(action.spec)) {
+                                throw new Components.Exception('Unsupported URL');
+                        }
+                        action = action.QueryInterface(Components.interfaces.nsIURL);
+                        
+                        var charset = form.ownerDocument.characterSet;
+                        if (form.acceptCharset) {
+                                charset = form.acceptCharset;
+                        }
+                        if (charset.match(/utf-?(?:16|32)/i)) {
+                                charset = 'utf-8';
+                        }
+                                                
+                        var encoder = Components.classes['@mozilla.org/intl/texttosuburi;1']
+                                .getService(Components.interfaces.nsITextToSubURI);
+                        
+                        var values = []; 
+                        
+                        for (var i = 0; i < form.elements.length; ++i) {
+                                if (form.elements[i].name ==  '') {
+                                        continue;
+                                }
+                                var v = encoder.ConvertAndEscape(charset, form.elements[i].name) + "=";
+                                if (form.elements[i].value != '') {
+                                        v += encoder.ConvertAndEscape(charset, form.elements[i].value);
+                                }
+                                values.push(v); 
+                        }
+                        values = values.join("&");
+
+                        if (form.method.toLowerCase() == 'post') {
+                                var ss = Components.classes['@mozilla.org/io/string-input-stream;1']
+                                        .createInstance(Components.interfaces.nsIStringInputStream);
+                                ss.setData(values, -1);
+                                
+                                var ms = Components.classes['@mozilla.org/network/mime-input-stream;1']
+                                        .createInstance(Components.interfaces.nsIMIMEInputStream);
+                                ms.addContentLength = true;
+                                ms.addHeader('Content-Type', 'application/x-www-form-urlencoded');
+                                ms.setData(ss);
+                                
+                                var sis = Components.classes['@mozilla.org/scriptableinputstream;1']
+                                        .createInstance(Components.interfaces.nsIScriptableInputStream);
+                                sis.init(ms);
+                                var postData = '';
+                                var avail = 0;
+                                while ((avail = sis.available()) != 0) {
+                                        postData += sis.read(avail);
+                                }
+                                sis.close();
+                                ms.close();
+                                ss.close();
+                                
+                                action = new DTA_URL(action.spec, form.ownerDocument.characterSet);
+                                action.postData = postData;
+                        }
+                        else {
+                                action.query = values;
+                                action.ref = '';
+                                action = new DTA_URL(action.spec, form.ownerDocument.characterSet);
+                        }                       
+
+                        
+                        var ref = DTA_AddingFunctions.getRef(document.commandDispatcher.focusedWindow.document);
+                        var desc = this.extractDescription(form);
+                        
+                        if (turbo) {
+                                try {
+                                        DTA_AddingFunctions.saveSingleLink(true, action, ref, desc);
+                                        return;
+                                }
+                                catch (ex) {
+                                        DTA_debug.log('findSingleLink', ex);
+                                        DTA_alert(this.getString('error'), this.getString('errorinformation'));
+                                }
+                        }
+                        DTA_AddingFunctions.saveSingleLink(false, action, ref, desc);
+                }
+                catch (ex) {
+                        DTA_debug.log('findForm', ex);
+                }
+        },
-        
-        init: function() {
@@ -365 +456 @@
-                        var cont = document.getElementById('dtaCtxSubmenu');
-
-
+aveFormT', 'SaveForm', 'S
-                                function(id) {
-                                        this.compact[id] = document.getElementById('dtaCtx' + id);
@@ -470 +561 @@
-                                menu.SaveT.label = this.getString('turbosave' + (ctx.onLink ? 'link' : 'image'));
-                        }
+                        else if (
+                                ctx.target
+                                && ctx.target.localName.toLowerCase() == 'input'
+                                && ctx.target.hasAttribute('type')
+                                && ctx.target.getAttribute('type').toLowerCase() == 'submit'
+                                && 'form' in ctx.target
+                        ) {
+                                if (items[0]) {
+                                        show.push(menu.SaveForm);
+                                }
+                                if (items[1]) {
+                                        show.push(menu.SaveFormT);
+                                }               
+                        }                       
-                        // regular
-
+else 
-                                if (items[0]) {
-                                        show.push(menu.DTA);

trunk/chrome/content/integration/elements.xul

@@ -54 +54 @@
-                        <menuitem image="chrome://dta/skin/common/turbo.png" class="menuitem-iconic" id="dtaCtxSaveT" accesskey="o" oncommand="DTA_ContextOverlay.findSingleLink(true);"/>
-                        <menuitem image="chrome://dta/skin/common/dta.png" class="menuitem-iconic" id="dtaCtxSave" accesskey="n" oncommand="DTA_ContextOverlay.findSingleLink(false);"/>
+                        <menuitem image="chrome://dta/skin/common/turbo.png" class="menuitem-iconic" id="dtaCtxSaveFormT" label="&dta-form-save-turbo.label;" accesskey="o" oncommand="DTA_ContextOverlay.findForm(true);"/>
+                        <menuitem image="chrome://dta/skin/common/dta.png" class="menuitem-iconic" id="dtaCtxSaveForm" label="&dta-form-save.label;" accesskey="n" oncommand="DTA_ContextOverlay.findForm(false);"/>                    
-                        <menuseparator class="thin" id="dtaCtxSepPref"/>
-                        <menuitem image="chrome://dta/skin/common/prefs.png" class="menuitem-iconic" id="dtaCtxPref" label="&dta-pref.label;" oncommand="DTA_showPreferences();" />

trunk/chrome/locale/en-US/menu.dtd

@@ -5 +5 @@
-<!ENTITY dta-tb-all.label "All tabs">
-<!ENTITY dta-tb-single.label "Current tab">
+<!ENTITY dta-form-save.label "Save form target with DownThemAll!">
+<!ENTITY dta-form-save-turbo.label "Start saving form target with dTa OneClick!">