Merge lp:~therp-nl/ocb-web/6.1-lp1197783-file_upload_firefox_22 into lp:ocb-web/6.1

[Stefan Rijnhart (Opener)]

Same as https://code.launchpad.net/~therp-nl/openerp-web/6.1-lp1197783-file_upload_firefox_22/+merge/173033

OpenERP 6.1 stores the callback function on the iframe that loads the code that calls the callback function. In Firefox 22, when the callback is called, it is no longer present on the iframe.

My suggestion in this branch is to use a seemingly unused input field that is already named 'callback'. In order to retrieve it from the iframe, I am assigning it an id.

Tested in Firefox 21, 22 and Chromium 28.0.1500.52

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2012-11-04 19:25:08 +0000
+++ addons/web/controllers/main.py	2013-07-04 15:20:40 +0000
@@ -1481,7 +1481,7 @@
         try:
             out = """<script language="javascript" type="text/javascript">
                         var win = window.top.window,
-                            callback = win[%s];
+                            callback = win[%s + '_callback'];
                         if (typeof(callback) === 'function') {
                             callback.apply(this, %s);
                         } else {

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-04-10 11:56:57 +0000
+++ addons/web/static/src/js/view_form.js	2013-07-04 15:20:40 +0000
@@ -832,7 +832,7 @@
         this.$element.find('.oe-sidebar-attachment-delete').click(this.on_attachment_delete);
     },
     on_attachment_changed: function(e) {
-        window[this.element_id + '_iframe'] = this.do_update;
+        window[this.element_id + '_iframe_callback'] = this.do_update;
         var $e = $(e.target);
         if ($e.val() != '') {
             this.$element.find('form.oe-binary-form').submit();
@@ -3490,7 +3490,7 @@
         // TODO: on modern browsers, we could directly read the file locally on client ready to be used on image cropper
         // http://www.html5rocks.com/tutorials/file/dndfiles/
         // http://deepliquid.com/projects/Jcrop/demos.php?demo=handler
-        window[this.iframe] = this.on_file_uploaded;
+        window[this.iframe + '_callback'] = this.on_file_uploaded;
         if ($(e.target).val() != '') {
             this.$element.find('form.oe-binary-form input[name=session_id]').val(this.session.session_id);
             this.$element.find('form.oe-binary-form').submit();

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2012-08-31 13:12:29 +0000
+++ addons/web/static/src/xml/base.xml	2013-07-04 15:20:40 +0000
@@ -769,7 +769,8 @@
             <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
                 method="post" enctype="multipart/form-data" t-att-action='_s + "/web/binary/upload_attachment"'>
                 <input type="hidden" name="session_id" t-att-value="session.session_id"/>
-                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
+                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe_callback"
+                       t-attf-id="#{element_id}_iframe_callback"/>
                 <input type="hidden" name="model" t-att-value="view.dataset.model"/>
                 <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
                 <button class="oe_button" type="button">
@@ -1158,7 +1159,8 @@
                             <form class="oe-binary-form" t-att-target="widget.iframe"
                                 method="post" enctype="multipart/form-data" t-att-action='_s + "/web/binary/upload"'>
                                 <input type="hidden" name="session_id" value=""/>
-                                <input type="hidden" name="callback" t-att-value="widget.iframe"/>
+                                <input type="hidden" name="callback" t-att-value="widget.iframe"
+                                       t-att-id='widget.iframe + "_callback"'/>
                                 <button class="oe_button" type="button" title="Set Image">
                                     <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
                                 </button>
@@ -1201,7 +1203,8 @@
                         <form class="oe-binary-form" t-att-target="widget.iframe"
                             method="post" enctype="multipart/form-data" t-att-action='_s + "/web/binary/upload"'>
                             <input type="hidden" name="session_id" value=""/>
-                            <input type="hidden" name="callback" t-att-value="widget.iframe"/>
+                            <input type="hidden" name="callback" t-att-value="widget.iframe"
+                                   t-att-id='widget.iframe + "_callback"'/>
                             <button class="oe_button oe_field_button" type="button" title="Set Image">
                                 <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
                                 <span>Select</span>