From d1ddc1ee7824dd571ac564359883198a73a747b5 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 14 Dec 2011 18:18:11 +0100 Subject: [PATCH] [IMP] factorise View.do_show do_hide bzr revid: al@openerp.com-20111214171811-c4bka4nwylp3wn21 --- addons/web/static/src/js/view_form.js | 4 ++-- addons/web/static/src/js/view_list.js | 4 ++-- addons/web/static/src/js/views.js | 15 ++++++++++----- addons/web_calendar/static/src/js/calendar.js | 2 +- addons/web_diagram/static/src/js/diagram.js | 8 -------- addons/web_gantt/static/src/js/gantt.js | 8 -------- addons/web_graph/static/src/js/graph.js | 6 ------ addons/web_kanban/static/src/js/kanban.js | 6 ------ 8 files changed, 15 insertions(+), 38 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0ac70e64a67..79732296816 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -125,14 +125,14 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# } else { promise = this.dataset.read_index(_.keys(this.fields_view.fields)).pipe(this.on_record_loaded); } - this.$element.show(); + this._super(); if (this.sidebar) { this.sidebar.$element.show(); } return promise; }, do_hide: function () { - this.$element.hide(); + this._super(); if (this.sidebar) { this.sidebar.$element.hide(); } diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index bf423434ecc..ad253586591 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -402,13 +402,13 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# }, this)); }, do_show: function () { - this.$element.show(); + this._super(); if (this.sidebar) { this.sidebar.$element.show(); } }, do_hide: function () { - this.$element.hide(); + this._super(); if (this.sidebar) { this.sidebar.$element.hide(); } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 116d7da3aef..30b3cff6c96 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1065,19 +1065,26 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ this.embedded_view = embedded_view; this.options.sidebar = false; }, + do_show: function () { + this.$element.show(); + }, + do_hide: function () { + this.$element.hide(); + }, /** * Switches to a specific view type * * @param {String} view view type to switch to */ - do_switch_view: function(view) { }, + do_switch_view: function(view) { + }, /** * Cancels the switch to the current view, switches to the previous one */ - do_prev_view: function () { }, + do_prev_view: function () { + }, do_search: function(view) { }, - set_common_sidebar_sections: function(sidebar) { sidebar.add_default_sections(); }, @@ -1146,10 +1153,8 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ sidebar_context: function () { return $.Deferred().resolve({}).promise(); }, - do_push_state: function(state, overwrite) { }, - do_load_state: function(state) { } }); diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index aac3dcb4f3b..1e253fc8f44 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -394,7 +394,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({ }); }, do_hide: function () { - this.$element.hide(); + this._super(); if (this.sidebar) { this.sidebar.$element.hide(); } diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 08617efd073..7c2619cd5b9 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -298,14 +298,6 @@ openerp.web.DiagramView = openerp.web.View.extend({ } $pager.find('span.oe_pager_index').html(index); $pager.find('span.oe_pager_count').html(this.dataset.count); - }, - - do_show: function () { - this.$element.show(); - }, - - do_hide: function () { - this.$element.hide(); } }); }; diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 71dba5da093..ccf2ac07bfb 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -459,14 +459,6 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ } }, - do_show: function () { - this.$element.show(); - }, - - do_hide: function () { - this.$element.hide(); - }, - convert_str_date: function (str) { if (typeof str == 'string') { if (str.length == 19) { diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 6cf9998fdda..acab0b73f5e 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -37,12 +37,6 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ } this._super(); }, - do_show: function () { - this.$element.show(); - }, - do_hide: function () { - this.$element.hide(); - }, start: function() { var self = this; this._super(); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 84e1a341942..0b67fdb3f66 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -258,12 +258,6 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ }); } }, - do_show: function () { - this.$element.show(); - }, - do_hide: function () { - this.$element.hide(); - }, compute_groups_width: function() { var unfolded = 0; _.each(this.groups, function(group) {