From 5ff910baa6dfc683c40f566808a0b80fc4c62821 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 6 Aug 2012 23:01:50 -0500 Subject: [PATCH] LOAD can do upload with new jQuery? --- VERSION | 2 +- applications/admin/static/js/web2py.js | 8 ++++++-- applications/examples/static/js/web2py.js | 8 ++++++-- applications/welcome/static/js/web2py.js | 8 ++++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index e59ff10e..34374077 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-06 21:24:31) dev +Version 2.00.0 (2012-08-06 23:01:45) dev diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index eb1e3b09..bba5610f 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -98,8 +98,12 @@ function web2py_ajax_page(method, action, data, target) { eval(decodeURIComponent(command)); if(flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); - } - }); + }, + // the three options below should allow multipart uploads but not in IE + 'cache': false, + 'contentType': false, + 'processData': false + }); } function web2py_component(action, target, timeout, times){ diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js index eb1e3b09..bba5610f 100644 --- a/applications/examples/static/js/web2py.js +++ b/applications/examples/static/js/web2py.js @@ -98,8 +98,12 @@ function web2py_ajax_page(method, action, data, target) { eval(decodeURIComponent(command)); if(flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); - } - }); + }, + // the three options below should allow multipart uploads but not in IE + 'cache': false, + 'contentType': false, + 'processData': false + }); } function web2py_component(action, target, timeout, times){ diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index eb1e3b09..bba5610f 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -98,8 +98,12 @@ function web2py_ajax_page(method, action, data, target) { eval(decodeURIComponent(command)); if(flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); - } - }); + }, + // the three options below should allow multipart uploads but not in IE + 'cache': false, + 'contentType': false, + 'processData': false + }); } function web2py_component(action, target, timeout, times){