diff options
| author | Olivier Dony <odo@openerp.com> | 2013-07-31 09:29:14 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-07-31 09:29:14 +0200 |
| commit | cf9d7aaa5f35fd15d894eeb5d830cf66b83924b8 (patch) | |
| tree | f6527a3dcc0160ac523806a298efa4617ee726b6 /addons/web/static/src/js/coresetup.js | |
| parent | 658c021df8bb71075dc8eabb117105b8257b4db3 (diff) | |
| parent | c46331a3ca36f9e6a9504d1d2c2e4b7171bfb665 (diff) | |
[MERGE] Forward-port of latest bugfixes from 7.0 up to rev 4007 (launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81)
bzr revid: dle@openerp.com-20130627115936-iw2x6yjejabkc8ys
bzr revid: chs@openerp.com-20130702141958-zxkppo4c6zvpo0uf
bzr revid: odo@openerp.com-20130731072914-0uk62hnao5x502hh
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 6fc837333b6..7d37dc2261d 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -283,6 +283,16 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess CHECK_INTERVAL = 1000, id = _.uniqueId('get_file_frame'), remove_form = false; + + // iOS devices doesn't allow iframe use the way we do it, + // opening a new window seems the best way to workaround + if (navigator.userAgent.match(/(iPod|iPhone|iPad)/)) { + var params = _.extend({}, options.data || {}, {token: token}); + var url = this.url(options.url, params); + instance.web.unblockUI(); + return window.open(url); + } + var $form, $form_data = $('<div>'); var complete = function () { |