[IMP] Cleaned a bit, fixed some global variables

bzr revid: fme@openerp.com-20110728122650-8305oh329y5y8a66

1 files changed, 188 insertions, 187 deletions

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 9a04dbf4c4e..50a08bc4f12 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -1,95 +1,98 @@
 openerp.base.data_export = function(openerp) {
 openerp.base.DataExport = openerp.base.Dialog.extend({
-    init: function(parent, dataset, views){
+    init: function(parent, dataset, views) {
         this._super(parent);
-        this.dataset = dataset
-        this.views = views
+        this.dataset = dataset;
+        this.views = views;
         this.views_id = {};
         for (var key in this.views) {
-            this.views_id[key] = this.views[key].view_id
+            this.views_id[key] = this.views[key].view_id;
         }
     },
-
     start: function() {
-        var self = this
+        var self = this;
         self._super(false);
         self.template = 'ExportTreeView';
-        self.dialog_title = "Export Data "
+        self.dialog_title = "Export Data";
         self.open({
-                    modal: true,
-                    width: '55%',
-                    height: 'auto',
-                    position: 'top',
-                    buttons : {
-                        "Close" : function() {
-                            self.close();
-                          },
-                        "Export To File" : function() {
-                            self.on_click_export_data();
-                          }
-                       },
-                    close: function(event, ui){ self.close();}
-                   });
+            modal: true,
+            width: '55%',
+            height: 'auto',
+            position: 'top',
+            buttons : {
+                "Close" : function() {
+                    self.close();
+                  },
+                "Export To File" : function() {
+                    self.on_click_export_data();
+                  }
+               },
+            close: function(event, ui){ self.close();}
+        });
         self.on_show_exists_export_list();
-        jQuery(self.$dialog).removeClass('ui-dialog-content ui-widget-content');
-        self.$element.find('#add_field').click(function(){
-            if($("#field-tree-structure tr.ui-selected")){
-                var fld = self.$element.find("#field-tree-structure tr.ui-selected").find('a');
-                for (var i=0;i<fld.length; i++){
-                    var id = $(fld[i]).attr('id').split("-")[1];
+        self.$element.removeClass('ui-dialog-content ui-widget-content');
+        self.$element.find('#add_field').click(function() {
+            if ($('#field-tree-structure tr.ui-selected')) {
+                var fld = self.$element.find('#field-tree-structure tr.ui-selected').find('a');
+                for (var i = 0; i < fld.length; i++) {
+                    var id = $(fld[i]).attr('id').split('-')[1];
                     var string = $(fld[i]).attr('string');
-                    self.add_field(id,string);
+                    self.add_field(id, string);
                 }
-                self.$element.find("#field-tree-structure tr").removeClass("ui-selected");
+                self.$element.find('#field-tree-structure tr').removeClass('ui-selected');
             }
         });
-        self.$element.find('#remove_field').click(function(){
-            self.$element.find("#fields_list option:selected").remove();
+        self.$element.find('#remove_field').click(function() {
+            self.$element.find('#fields_list option:selected').remove();
         });
-        self.$element.find('#remove_all_field').click(function(){
-            self.$element.find("#fields_list option").remove();
+        self.$element.find('#remove_all_field').click(function() {
+            self.$element.find('#fields_list option').remove();
         });
-        self.$element.find('#export_new_list').click(function(){
+        self.$element.find('#export_new_list').click(function() {
             self.on_show_save_list();
         });
-        import_comp = self.$element.find("#import_compat option:selected").val()
-        var params = {"import_compat":parseInt(import_comp), "views_id": self.views_id}
-        self.rpc("/base/export/get_fields", {"model": self.dataset.model, "params": params}, self.on_show_data);
+        var import_comp = self.$element.find('#import_compat option:selected').val(),
+            params = {
+                import_compat: parseInt(import_comp),
+                views_id: self.views_id
+            };
+        self.rpc('/base/export/get_fields', { model: self.dataset.model, params: params }, self.on_show_data);
 
-        self.$element.find("#import_compat").change(function(){
-            self.$element.find("#fields_list option").remove();
-            self.$element.find("#field-tree-structure").remove();
-            import_comp = self.$element.find("#import_compat option:selected").val();
-            if(import_comp){
-                var params = {"import_compat":parseInt(import_comp), "views_id": self.views_id}
-                self.rpc("/base/export/get_fields", {"model": self.dataset.model, "params": params}, self.on_show_data);
+        self.$element.find('#import_compat').change(function() {
+            self.$element.find('#fields_list option').remove();
+            self.$element.find('#field-tree-structure').remove();
+            var import_comp = self.$element.find("#import_compat option:selected").val();
+            if (import_comp) {
+                var params = {
+                    import_compat: parseInt(import_comp),
+                    views_id: self.views_id
+                }
+                self.rpc("/base/export/get_fields", { model: self.dataset.model, params: params}, self.on_show_data);
             }
         });
     },
-
-    on_show_exists_export_list: function(){
+    on_show_exists_export_list: function() {
         var self = this;
-        if(self.$element.find("#saved_export_list").is(":hidden")){
-            self.$element.find("#ExistsExportList").show();
-        }
-        else{
-            this.rpc("/base/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){
-                if(export_list.length){
-                    self.$element.find("#ExistsExportList").append(QWeb.render('Exists.ExportList', {'existing_exports':export_list}));
-                    self.$element.find("#saved_export_list").change(function(){
-                        self.$element.find("#fields_list option").remove();
-                        export_id = self.$element.find("#saved_export_list option:selected").val();
-                        if (export_id){
-                            self.rpc("/base/export/namelist", {"model": self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
+        if (self.$element.find('#saved_export_list').is(':hidden')) {
+            self.$element.find('#ExistsExportList').show();
+        } else {
+            this.rpc('/base/export/exist_export_lists', { 'model': this.dataset.model}, function(export_list) {
+                if (export_list.length) {
+                    self.$element.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list}));
+                    self.$element.find('#saved_export_list').change(function() {
+                        self.$element.find('#fields_list option').remove();
+                        var export_id = self.$element.find('#saved_export_list option:selected').val();
+                        if (export_id) {
+                            self.rpc('/base/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
                         }
                     });
-                    self.$element.find('#delete_export_list').click(function(){
-                        select_exp = self.$element.find("#saved_export_list option:selected")
-                        if (select_exp.val()){
-                            self.rpc("/base/export/delete_export", {"export_id": parseInt(select_exp.val())}, {});
+                    self.$element.find('#delete_export_list').click(function() {
+                        var select_exp = self.$element.find('#saved_export_list option:selected');
+                        if (select_exp.val()) {
+                            self.rpc('/base/export/delete_export', { export_id: parseInt(select_exp.val())}, {});
                             select_exp.remove();
-                            if(self.$element.find("#saved_export_list option").length <= 1){
-                                self.$element.find("#ExistsExportList").hide();
+                            if (self.$element.find('#saved_export_list option').length <= 1) {
+                                self.$element.find('#ExistsExportList').hide();
                             }
                         }
                     });
@@ -97,77 +100,66 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             });
         }
     },
-
-    do_load_export_field: function(field_list){
+    do_load_export_field: function(field_list) {
         var export_node = this.$element.find("#fields_list");
         for (var key in field_list) {
             export_node.append(new Option(field_list[key], key));
         }
     },
-
-    on_show_save_list: function(){
+    on_show_save_list: function() {
         var self = this;
         var current_node = self.$element.find("#savenewlist");
-        if(!(current_node.find("label")).length){
+        if (!(current_node.find("label")).length) {
             current_node.append(QWeb.render('ExportNewList'));
-            current_node.find("#add_export_list").click(function(){
+            current_node.find("#add_export_list").click(function() {
                 var value = current_node.find("#savelist_name").val();
-                if (value){
+                if (value) {
                     self.do_save_export_list(value);
-                }
-                else{
+                } else {
                     alert("Pleae Enter Save Field List Name");
                 }
             });
-        }
-        else{
-            if (current_node.is(':hidden')){
+        } else {
+            if (current_node.is(':hidden')) {
                 current_node.show();
-                current_node.find("#savelist_name").val("")
-            }
-            else{
+                current_node.find("#savelist_name").val("");
+            } else {
                current_node.hide();
             }
         }
     },
-
-    do_save_export_list: function(value){
+    do_save_export_list: function(value) {
         var self = this;
-        var export_field = self.get_fields()
-        if(export_field.length){
-            self.rpc("/base/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id){
-                if(exp_id){
-                    if(self.$element.find("#saved_export_list").length > 0){
-                        self.$element.find("#saved_export_list").append( new Option(value, exp_id));
-                    }
-                    else{
+        var export_field = self.get_fields();
+        if (export_field.length) {
+            self.rpc("/base/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id) {
+                if (exp_id) {
+                    if (self.$element.find("#saved_export_list").length > 0) {
+                        self.$element.find("#saved_export_list").append(new Option(value, exp_id));
+                    } else {
                         self.on_show_exists_export_list();
                     }
-                    if(self.$element.find("#saved_export_list").is(":hidden")){
+                    if (self.$element.find("#saved_export_list").is(":hidden")) {
                         self.on_show_exists_export_list();
                     }
                 }
             });
-            self.on_show_save_list()
+            self.on_show_save_list();
             self.$element.find("#fields_list option").remove();
         }
     },
-
     on_click: function(id, result) {
-        var self = this
+        var self = this;
         self.field_id = id.split("-")[1];
-        var model = ''
-        var prefix = ''
-        var name = ''
         var is_loaded = 0;
         _.each(result, function(record) {
-            if(record['id'] == self.field_id && (record['children']).length >= 1){
-                model = record['params']['model']
-                prefix = record['params']['prefix']
-                name = record['params']['name']
-                $(record['children']).each (function(e, childid) {
-                    if (self.$element.find("tr[id='treerow-" + childid +"']").length > 0) {
-                        if (self.$element.find("tr[id='treerow-" + childid +"']").is(':hidden')) {
+            if (record['id'] == self.field_id && (record['children']).length >= 1) {
+                var model = record['params']['model'],
+                    prefix = record['params']['prefix'],
+                    name = record['params']['name'];
+                $(record['children']).each(function(e, childid) {
+                    if (self.$element.find("tr[id='treerow-" + childid + "']").length > 0) {
+                        if (self.$element.find("tr[id='treerow-" + childid + "']").is(':hidden')) {
                             is_loaded = -1;
                         } else {
                             is_loaded++;
@@ -175,11 +167,21 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                     }
                 });
                 if (is_loaded == 0) {
-                    if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') {
-                        if (model){
-                            import_comp = self.$element.find("#import_compat option:selected").val()
-                            var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']}
-                            self.rpc("/base/export/get_fields", {"model": model, "prefix": prefix, "name": name,  "field_parent" : self.field_id, "params":params}, function (results) {
+                    if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') {
+                        if (model) {
+                            var import_comp = self.$element.find("#import_compat option:selected").val();
+                            var params = {
+                                import_compat: parseInt(import_comp),
+                                views_id: self.views_id,
+                                parent_field_type : record['field_type']
+                            }
+                            self.rpc("/base/export/get_fields", {
+                                model: model,
+                                prefix: prefix,
+                                name: name,
+                                field_parent : self.field_id,
+                                params: params
+                            }, function(results) {
                                 self.on_show_data(results);
                             });
                         }
@@ -192,50 +194,48 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             }
         });
     },
-
     on_show_data: function(result) {
         var self = this;
         var imp_cmpt = parseInt(self.$element.find("#import_compat option:selected").val());
         var current_tr = self.$element.find("tr[id='treerow-" + self.field_id + "']");
-        if (current_tr.length >= 1){
+        if (current_tr.length >= 1) {
             current_tr.find('img').attr('src','/base/static/src/img/collapse.gif');
             current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result}));
-        }
-        else{
-            self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary',  {'fields': result}));
+        } else {
+            self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result}));
         }
         _.each(result, function(record) {
-            if((record.field_type == "one2many") && imp_cmpt){
+            if ((record.field_type == "one2many") && imp_cmpt) {
                 var o2m_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 o2m_fld.addClass("oe_export_readonlyfield");
             }
-            if ((record.required == true) || record.required == "True"){
+            if ((record.required == true) || record.required == "True") {
                 var required_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 required_fld.addClass("oe_export_requiredfield");
             }
-            self.$element.find("img[id='parentimg-" + record.id +"']").click(function(){
+            self.$element.find("img[id='parentimg-" + record.id +"']").click(function() {
                 self.on_click(this.id, result);
             });
 
-            self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e){
-                if (e.shiftKey == true){
-                    var frst_click,scnd_click = '';
-                    if (self.row_index == 0){
+            self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e) {
+                if (e.shiftKey == true) {
+                    var frst_click, scnd_click = '';
+                    if (self.row_index == 0) {
                         self.row_index = this.rowIndex;
                         frst_click = self.$element.find("tr[id^='treerow-']")[self.row_index-1];
                         $(frst_click).addClass("ui-selected");
-                    }else{
-                        if (this.rowIndex >=self.row_index){
+                    } else {
+                        if (this.rowIndex >=self.row_index) {
                             for (i = (self.row_index-1); i < this.rowIndex; i++) {
                                 scnd_click = self.$element.find("tr[id^='treerow-']")[i];
-                                if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
+                                if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
-                        }else{
+                        } else {
                             for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
                                 scnd_click = self.$element.find("tr[id^='treerow-']")[i];
-                                if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
+                                if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
@@ -244,88 +244,88 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 }
                 self.row_index = this.rowIndex;
 
-                self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function (e) {
-                        self.row_index = 0;
+                self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function(e) {
+                    self.row_index = 0;
                 });
                 var o2m_selection = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
-                if ($(o2m_selection).hasClass("oe_export_readonlyfield")){
+                if ($(o2m_selection).hasClass("oe_export_readonlyfield")) {
                     return false;
                 }
                 var selected = self.$element.find("tr.ui-selected");
-                if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)){
+                if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
                     $(this).find('a').blur();
                     $(this).removeClass("ui-selected");
-                }else if($(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)){
+                } else if ($(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
                     selected.find('a').blur();
                     selected.removeClass("ui-selected");
                     $(this).find('a').focus();
                     $(this).addClass("ui-selected");
-                }else if(!$(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)){
+                } else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
                     selected.find('a').blur();
                     selected.removeClass("ui-selected");
                     $(this).find('a').focus();
                     $(this).addClass("ui-selected");
-                }else if(!$(this).hasClass("ui-selected") && (e.ctrlKey == true)){
+                } else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
                     $(this).find('a').focus();
                     $(this).addClass("ui-selected");
                 }
                 return false;
             });
 
-            self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function (e) {
+            self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function(e) {
                 var keyCode = e.keyCode || e.which;
                 arrow = {left: 37, up: 38, right: 39, down: 40 };
                 switch (keyCode) {
                     case arrow.left:
-                        if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){
+                        if ($(this).find('img').attr('src') === '/base/static/src/img/collapse.gif') {
                             self.on_click(this.id, result);
                         }
-                    break;
+                        break;
                     case arrow.up:
                         var elem = this;
                         $(elem).removeClass("ui-selected");
-                        while($(elem).prev().is(":visible") == false){
+                        while ($(elem).prev().is(":visible") == false) {
                             elem = $(elem).prev();
                         }
-                        if(!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")){
+                        if (!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")) {
                             $(elem).prev().addClass("ui-selected");
                         }
                         $(elem).prev().find('a').focus();
-                    break;
+                        break;
                     case arrow.right:
-                        if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){
+                        if ($(this).find('img').attr('src') == '/base/static/src/img/expand.gif') {
                             self.on_click(this.id, result);
                         }
-                    break;
+                        break;
                     case arrow.down:
                         var elem = this;
                         $(elem).removeClass("ui-selected");
-                        while($(elem).next().is(":visible") == false){
+                        while($(elem).next().is(":visible") == false) {
                             elem = $(elem).next();
                         }
-                        if(!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")){
+                        if (!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")) {
                             $(elem).next().addClass("ui-selected");
                         }
                         $(elem).next().find('a').focus();
-                    break;
+                        break;
                 }
             });
-            self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function (e) {
-                var o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
-                if (! $(o2m_selection).hasClass("oe_export_readonlyfield")){
-                    var field_id =  $(this).find("a").attr("id");
-                    if(field_id){
-                       self.add_field(field_id.split('-')[1], $(this).find("a").attr("string"))
+            self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function(e) {
+                var $o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
+                if (!$o2m_selection.hasClass("oe_export_readonlyfield")) {
+                    var field_id = $(this).find("a").attr("id");
+                    if (field_id) {
+                       self.add_field(field_id.split('-')[1], $(this).find("a").attr("string"));
                    }
                 }
             });
         });
-        self.$element.find('#fields_list').mouseover(function(event){
-            if(event.relatedTarget){
-                if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']){
-                    field_id = event.relatedTarget.attributes["id"]["value"]
-                    if (field_id && field_id.split("-")[0] == 'export'){
-                        if(!self.$element.find("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")){
+        self.$element.find('#fields_list').mouseover(function(event) {
+            if (event.relatedTarget) {
+                if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']) {
+                    var field_id = event.relatedTarget.attributes["id"]["value"];
+                    if (field_id && field_id.split("-")[0] === 'export') {
+                        if (!self.$element.find("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")) {
                             self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]);
                         }
                     }
@@ -333,77 +333,78 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             }
         });
     },
-
-    // show & hide the contents
-    showcontent: function (id, flag) {
-        var first_child = this.$element.find("tr[id='treerow-" + id + "']").find('img')
+    showcontent: function(id, flag) {
+        // show & hide the contents
+        var first_child = this.$element.find("tr[id='treerow-" + id + "']").find('img');
         if (flag) {
             first_child.attr('src', '/base/static/src/img/expand.gif');
         }
         else {
             first_child.attr('src', '/base/static/src/img/collapse.gif');
         }
-        var child_field = this.$element.find("tr[id^='treerow-" + id +"/']")
-        var child_len = (id.split("/")).length + 1
+        var child_field = this.$element.find("tr[id^='treerow-" + id +"/']");
+        var child_len = (id.split("/")).length + 1;
         for (var i = 0; i < child_field.length; i++) {
             if (flag) {
                 $(child_field[i]).hide();
-            }
-            else {
-                if(child_len ==  (child_field[i].id.split("/")).length){
-                    if( jQuery(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif'){
-                        jQuery(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif')
+            } else {
+                if (child_len == (child_field[i].id.split("/")).length) {
+                    if ($(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif') {
+                        $(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif');
                     }
                     $(child_field[i]).show();
                 }
             }
         }
     },
-
     add_field: function(field_id, string) {
-        var field_list = this.$element.find('#fields_list')
-        if ( this.$element.find("#fields_list option[value='" + field_id + "']") && !this.$element.find("#fields_list option[value='" + field_id + "']").length){
-            field_list.append( new Option(string, field_id));
+        var field_list = this.$element.find('#fields_list');
+        if (this.$element.find("#fields_list option[value='" + field_id + "']") && !this.$element.find("#fields_list option[value='" + field_id + "']").length) {
+            field_list.append(new Option(string, field_id));
         }
     },
-
-    get_fields: function (){
+    get_fields: function() {
         var export_field = [];
-        this.$element.find("#fields_list option").each(function(){
-            export_field.push(jQuery(this).val());
+        this.$element.find("#fields_list option").each(function() {
+            export_field.push($(this).val());
         });
-        if (! export_field.length){
+        if (!export_field.length) {
             alert('Please select fields to save export list...');
         }
         return export_field;
     },
-    on_click_export_data: function(){
+    on_click_export_data: function() {
         var self = this;
         var export_field = {};
         var flag = true;
-        self.$element.find("#fields_list option").each(function(){
-            export_field[jQuery(this).val()] = jQuery(this).text();
+        self.$element.find("#fields_list option").each(function() {
+            export_field[$(this).val()] = $(this).text();
             flag = false;
         });
-        if (flag){
+        if (flag) {
             alert('Please select fields to export...');
             return;
         }
 
-        import_comp = self.$element.find("#import_compat option:selected").val()
-        export_format = self.$element.find("#export_format").val()
+        var import_comp = self.$element.find("#import_compat option:selected").val(),
+            export_format = self.$element.find("#export_format").val();
 
-        self.rpc("/base/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp), "export_format" :export_format}, function(data){
-            window.location="data:text/csv/excel;charset=utf8," + data
+        self.rpc("/base/export/export_data", {
+            model: self.dataset.model,
+            fields: export_field,
+            ids: self.dataset.ids,
+            domain: self.dataset.domain,
+            import_compat: parseInt(import_comp),
+            export_format: export_format
+        }, function(data) {
+            window.location = "data:text/csv/excel;charset=utf8," + data;
             self.close();
         });
     },
-
     close: function() {
-        jQuery(this.$dialog).remove();
+        $(this.$dialog).remove();
         this._super();
-    },
-
+    }
 });
 
 };