diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-08-25 09:59:45 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-09-01 20:05:20 +0200 |
| commit | 23f0c49bbeed80d17699200a98abc14c29fc3677 (patch) | |
| tree | c768fd99f74b23a5d3252d70d119de07fb837fab /addons/web/static/src/js | |
| parent | 4989033fe0495b74d57050de96b680a46d139649 (diff) | |
[REF] web: backport some classnames renaming
oe_form_binary_form -> o_form_binary_form
oe_form_binary_file -> o_form_input_file
Required for new design compatibility (classnames accessed in addon mail)
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/views/form_relational_widgets.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 14 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/sidebar.js | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js index b5cd0e723ef..5085b284689 100644 --- a/addons/web/static/src/js/views/form_relational_widgets.js +++ b/addons/web/static/src/js/views/form_relational_widgets.js @@ -1460,7 +1460,7 @@ var FieldMany2ManyBinaryMultiFiles = AbstractManyField.extend(common.Reinitializ $(window).on(this.fileupload_id, _.bind(this.on_file_loaded, this)); }, initialize_content: function() { - this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change ); + this.$el.on('change', 'input.o_form_input_file', this.on_file_change ); }, get_file_url: function (attachment) { return '/web/content/' + attachment.id + '?download=true'; @@ -1492,7 +1492,7 @@ var FieldMany2ManyBinaryMultiFiles = AbstractManyField.extend(common.Reinitializ self.$('.oe_placeholder_files, .oe_attachments').replaceWith( render ); // reinit input type file - var $input = self.$('input.oe_form_binary_file'); + var $input = self.$('input.o_form_input_file'); $input.after($input.clone(true)).remove(); self.$(".oe_fileupload").show(); @@ -1530,7 +1530,7 @@ var FieldMany2ManyBinaryMultiFiles = AbstractManyField.extend(common.Reinitializ // TODO : unactivate send on wizard and form // submit file - this.$('form.oe_form_binary_form').submit(); + this.$('form.o_form_binary_form').submit(); this.$(".oe_fileupload").hide(); // add file on data result this.data[0] = { diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 54c57c6fd8c..69731122f61 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -1134,11 +1134,11 @@ var FieldBinary = common.AbstractField.extend(common.ReinitializeFieldMixin, { }, initialize_content: function() { var self= this; - this.$el.find('input.oe_form_binary_file').change(this.on_file_change); - this.$el.find('button.oe_form_binary_file_save').click(this.on_save_as); - this.$el.find('.oe_form_binary_file_clear').click(this.on_clear); - this.$el.find('.oe_form_binary_file_edit').click(function(event){ - self.$el.find('input.oe_form_binary_file').click(); + this.$('input.o_form_input_file').change(this.on_file_change); + this.$('button.oe_form_binary_file_save').click(this.on_save_as); + this.$('.oe_form_binary_file_clear').click(this.on_clear); + this.$('.oe_form_binary_file_edit').click(function() { + self.$('input.o_form_input_file').click(); }); }, on_file_change: function(e) { @@ -1160,8 +1160,8 @@ var FieldBinary = common.AbstractField.extend(common.ReinitializeFieldMixin, { self.on_file_uploaded(file.size, file.name, file.type, data); }; } else { - this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id); - this.$el.find('form.oe_form_binary_form').submit(); + this.$el.find('form.o_form_binary_form input[name=session_id]').val(this.session.session_id); + this.$el.find('form.o_form_binary_form').submit(); } this.$el.find('.oe_form_binary_progress').show(); this.$el.find('.oe_form_binary').hide(); diff --git a/addons/web/static/src/js/widgets/sidebar.js b/addons/web/static/src/js/widgets/sidebar.js index 90ec1024d7c..bdb74703934 100644 --- a/addons/web/static/src/js/widgets/sidebar.js +++ b/addons/web/static/src/js/widgets/sidebar.js @@ -184,13 +184,13 @@ var Sidebar = Widget.extend({ }); this.items.files = attachments; this.redraw(); - this.$('.oe_sidebar_add_attachment .oe_form_binary_file').change(this.on_attachment_changed); + this.$('.oe_sidebar_add_attachment .o_form_input_file').change(this.on_attachment_changed); this.$el.find('.oe_sidebar_delete_item').click(this.on_attachment_delete); }, on_attachment_changed: function(e) { var $e = $(e.target); if ($e.val() !== '') { - this.$el.find('form.oe_form_binary_form').submit(); + this.$el.find('form.o_form_binary_form').submit(); $e.parent().find('input[type=file]').prop('disabled', true); $e.parent().find('button').prop('disabled', true).find('img, span').toggle(); this.$('.oe_sidebar_add_attachment a').text(_t('Uploading...')); |
