[MERGE] FIX etherpad:When: a user access to the edit mode from a kanban view or list view, etherpad is dipslay on readonly mode but with the oe_editing class.

bzr revid: chm@openerp.com-20121221134227-1nbb922oz37ibjw5

1 files changed, 12 insertions, 4 deletions

diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 9e1b73e1f3b..b96047340ad 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -4,6 +4,13 @@ openerp.pad = function(instance) {
         template: 'FieldPad',
         configured: false,
         content: "",
+        start: function() {
+            this._super();
+            var self  = this;
+            this.on('change:effective_readonly',this,function(){
+                self.renderElement();
+            });
+        },
         render_value: function() {
             var self = this;
             var _super = _.bind(this._super, this);
@@ -27,6 +34,9 @@ openerp.pad = function(instance) {
         renderElement: function(){
             var self  = this;
             var value = this.get('value');
+            if (this.pad_loading_request) {
+                this.pad_loading_request.abort();
+            }
             if(!_.str.startsWith(value,'http')){
                 this.configured = false;
                 this.content = "";
@@ -36,7 +46,8 @@ openerp.pad = function(instance) {
                     this.content = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+this.session.username+'"></iframe>';
                 }else{
                     this.content = '<div class="oe_pad_loading">... Loading pad ...</div>';
-                    $.get(value+'/export/html').success(function(data){
+                    this.pad_loading_request = $.get(value+'/export/html')
+                    .done(function(data){
                         groups = /\<\s*body\s*\>(.*?)\<\s*\/body\s*\>/.exec(data);
                         data = (groups || []).length >= 2 ? groups[1] : '';
                         self.$('.oe_pad_content').html('<div class="oe_pad_readonly"><div>');
@@ -51,9 +62,6 @@ openerp.pad = function(instance) {
             this.$('.oe_pad_switch').click(function(){
                 self.$el.toggleClass('oe_pad_fullscreen');
             });
-            this.on('change:effective_readonly',this,function(){
-                self.renderElement();
-            });
         },
     });