Merge lp:~openerp-dev/openerp-web/7.0-opw-587404-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of default_focus="1" not working for widget TextHtml.

Also added monkey patch as focus called after timeout, editor.$frame[0].contentWindow comes undefined when it is called after specified time interval so it was breaking and throwing error(to face this issue remove patch of library and go to view where TextHtml has default focus and just reload whole page, it will throw error as editor.$frame[0].contentWindow is undefined).

Thanks.

Unmerged revisions

3905. By Mohammed Shekha<email address hidden> on 2013-04-19

[FIX]Fixed the issue of focus on cleditor.

=== modified file 'addons/web/static/lib/cleditor/jquery.cleditor.js'
--- addons/web/static/lib/cleditor/jquery.cleditor.js	2013-01-09 16:46:26 +0000
+++ addons/web/static/lib/cleditor/jquery.cleditor.js	2013-04-19 10:50:51 +0000
@@ -742,6 +742,8 @@
   // focus - sets focus to either the textarea or iframe
   function focus(editor) {
     setTimeout(function() {
+      //Monkey patch: Focus breaks on reload whole page
+      if(!(sourceMode(editor) || editor.$frame[0].contentWindow)) return;
       if (sourceMode(editor)) editor.$area.focus();
       else editor.$frame[0].contentWindow.focus();
       refreshButtons(editor);

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-04-11 16:32:38 +0000
+++ addons/web/static/src/js/view_form.js	2013-04-19 10:50:51 +0000
@@ -2720,6 +2720,9 @@
             });
         }
     },
+    focus: function() {
+        this.$cleditor.focus();
+    },
     render_value: function() {
         if (! this.get("effective_readonly")) {
             this.$textarea.val(this.get('value') || '');