]> git.joonet.de Git - adminer.git/commitdiff
No AJAX for non-HTML output
authorJakub Vrana <jakub@vrana.cz>
Mon, 6 Dec 2010 00:12:55 +0000 (01:12 +0100)
committerJakub Vrana <jakub@vrana.cz>
Mon, 6 Dec 2010 00:12:55 +0000 (01:12 +0100)
adminer/static/functions.js

index 7bcc235cd7dd8b3bc368685f6da0cf98995e6b68..197c0581f5399364c6ede34073015749c329369b 100644 (file)
@@ -384,12 +384,12 @@ function bodyClick(event, db, ns) {
        if (/^a$/i.test(el.parentNode.tagName)) {
                el = el.parentNode;
        }
-       if (/^a$/i.test(el.tagName) && !/^https?:|#/i.test(el.getAttribute('href')) && /[&?]username=/.exec(el.href)) {
+       if (/^a$/i.test(el.tagName) && !/^https?:|#|&download=/i.test(el.getAttribute('href')) && /[&?]username=/.exec(el.href)) {
                var match = /&db=([^&]*)/.exec(el.href);
                var match2 = /&ns=([^&]*)/.exec(el.href);
                return !(db == (match ? match[1] : '') && ns == (match2 ? match2[1] : '') && ajaxMain(el.href, '', event));
        }
-       if (/^input$/i.test(el.tagName) && /submit|image/.test(el.type) && el.name != 'logout' && !/&(database|scheme|create|view|sql|user)=/.test(location.href)) {
+       if (/^input$/i.test(el.tagName) && /submit|image/.test(el.type) && el.name != 'logout' && !/&(database|scheme|create|view|sql|user|dump)=/.test(location.href)) {
                return !ajaxForm(el.form, (el.name ? encodeURIComponent(el.name) + '=1' : ''));
        }
        return true;