From 7ce1aad7ecbbe66f99bd345fa6b0028e64b65386 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 25 Jan 2012 09:53:10 +0100 Subject: [PATCH] [IMP] terminate statements, remove extraneous statement terminations bzr revid: xmo@openerp.com-20120125085310-zzwjrll47n61hw8w --- addons/web/static/src/js/core.js | 6 +-- addons/web/static/src/js/view_editor.js | 37 +++++++++---------- addons/web/static/src/js/view_form.js | 8 ++-- addons/web_calendar/static/src/js/calendar.js | 2 +- .../web_dashboard/static/src/js/dashboard.js | 4 +- addons/web_gantt/static/src/js/gantt.js | 15 +++----- addons/web_kanban/static/src/js/kanban.js | 6 +-- .../web_mobile/static/src/js/chrome_mobile.js | 2 +- addons/web_process/static/src/js/process.js | 2 +- 9 files changed, 38 insertions(+), 44 deletions(-) diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index fb22b46adf8..500cf58d05f 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -1223,7 +1223,7 @@ openerp.web.qweb.default_dict = { '_' : _, '_t' : openerp.web._t }; -openerp.web.qweb.format_text_node = function(s) { +openerp.web.qweb.format_text_node = function (s) { // Note that 'this' is the Qweb Node of the text var translation = this.node.parentNode.attributes['t-translation']; if (translation && translation.value === 'off') { @@ -1235,13 +1235,13 @@ openerp.web.qweb.format_text_node = function(s) { } var tr = openerp.web._t(ts); return tr === ts ? s : tr; -} +}; /** Jquery extentions */ $.Mutex = (function() { function Mutex() { this.def = $.Deferred().resolve(); - }; + } Mutex.prototype.exec = function(action) { var current = this.def; var next = this.def = $.Deferred(); diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index f506d63a677..26376f24da2 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -4,8 +4,8 @@ var QWeb = openerp.web.qweb; openerp.web.ViewEditor = openerp.web.OldWidget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); - this.element_id = element_id - this.parent = parent + this.element_id = element_id; + this.parent = parent; this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null), this.model = dataset.model; this.xml_element_id = 0; @@ -107,7 +107,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ type_widget.dirty = true; } type_widget.start(); - type_widget.set_value(value) + type_widget.set_value(value); self.create_view_widget.push(type_widget); }); }, @@ -177,7 +177,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ 'att_list': [], 'name': this.add_node_name(node), 'child_id': [] - } + }; ViewNode.att_list.push(node.tagName.toLowerCase()); _.each(node.attributes, function(att) { ViewNode.att_list.push([att.nodeName, att.nodeValue]); @@ -576,7 +576,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ var check = _.detect(one_object , function(obj) { return id == obj.id; }); - if (check) {result.push(check);}; + if (check) {result.push(check);} _.each(one_object, function(obj) { self.get_object_by_id(id,obj.child_id, result); }); @@ -817,7 +817,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ values.push(''); values.sort(); _PROPERTIES_ATTRIBUTES['widget']['selection'] = values; - var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function(property){ return _.include(properties, property.name)}) + var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function (property) { return _.include(properties, property.name)}); _.each(widgets, function(widget) { var type_widget = new (self.property.get_any([widget.type])) (self.edit_node_dialog, widget); var value = _.detect(arch_val[0]['att_list'],function(res) { @@ -842,24 +842,23 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ var group_ids = [], group_names = {}, groups = []; var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null), model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null); - res_groups - .read_slice([], {}) - .done(function(res_grp) { - _.each(res_grp,function(res){ + res_groups.read_slice([], {}).done(function (res_grp) { + _.each(res_grp, function (res) { var key = res.id; - group_names[key]=res.name; + group_names[key] = res.name; group_ids.push(res.id); }); - model_data - .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]}) - .done(function(model_grp) { - _.each(model_grp, function(res_group) { - groups.push([res_group.module + "." + res_group.name,group_names[res_group.res_id]]); + model_data.read_slice([], {domain: [ + ['res_id', 'in', group_ids], + ['model', '=', 'res.groups'] + ]}).done(function (model_grp) { + _.each(model_grp, function (res_group) { + groups.push([res_group.module + "." + res_group.name, group_names[res_group.res_id]]); }); self.groups = groups; def.resolve(); }); - }) + }); return def.promise(); }, on_add_node: function(properties, fields){ @@ -922,7 +921,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ render_new_field :function(id){ var self = this; var action = { - context: {'default_model_id': id, 'manual':true}, + context: {'default_model_id': id, 'manual': true}, res_model: "ir.model.fields", views: [[false, 'form']], type: 'ir.actions.act_window', @@ -930,7 +929,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ flags: { action_buttons: true } - } + }; var action_manager = new openerp.web.ActionManager(self); $.when(action_manager.do_action(action)).then(function() { var controller = action_manager.dialog_viewmanager.views['form'].controller; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e296fcc1955..3f13c95a3a5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -125,7 +125,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# if (state.id && this.datarecord.id != state.id) { var idx = this.dataset.get_id_index(state.id); if (idx === null) { - this.dataset.ids.push(state.id) + this.dataset.ids.push(state.id); this.dataset.index = this.dataset.ids.length - 1; } this.do_show(); @@ -233,7 +233,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# do_update_pager: function(hide_index) { var $pager = this.$form_header.find('div.oe_form_pager'); var index = hide_index ? '-' : this.dataset.index + 1; - $pager.find('button').prop('disabled', this.dataset.ids.length < 2) + $pager.find('button').prop('disabled', this.dataset.ids.length < 2); $pager.find('span.oe_pager_index').html(index); $pager.find('span.oe_pager_count').html(this.dataset.ids.length); }, @@ -1920,10 +1920,10 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({ }, _quick_create: function(name) { var self = this; - var slow_create = function() { + var slow_create = function () { self._change_int_value(null); self._search_create_popup("form", undefined, {"default_name": name}); - } + }; if (self.get_definition_options().quick_create === undefined || self.get_definition_options().quick_create) { var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context()); dataset.name_create(name, function(data) { diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index bc7c5f0ba1d..282d3dfd883 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -381,7 +381,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({ this.do_ranged_search(); }, do_ranged_search: function() { - var self = this + var self = this; scheduler.clearAll(); $.when(this.has_been_loaded, this.ready).then(function() { self.dataset.read_slice(_.keys(self.fields), { diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index dc433f961a8..ec2975d48d4 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -190,9 +190,9 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ this.action_managers.push(am); am.appendTo($action); am.do_action(action); - am.do_action = function(action) { + am.do_action = function (action) { self.do_action(action); - } + }; if (action_attrs.creatable && action_attrs.creatable !== 'false') { var action_id = parseInt(action_attrs.creatable, 10); $action.parent().find('button.oe_dashboard_button_create').click(function() { diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 80b29fe4368..01bff96acbc 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -368,16 +368,11 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({ if (!event_id) { var pop = new openerp.web.form.SelectCreatePopup(this); - pop.select_element( - this.model, - { - title: _t("Create: ") + this.name, - initial_view: 'form', - disable_multiple_selection: true - }, - this.dataset.domain, - this.context || this.dataset.context - ) + pop.select_element(this.model, { + title: _t("Create: ") + this.name, + initial_view: 'form', + disable_multiple_selection: true + }, this.dataset.domain, this.context || this.dataset.context); pop.on_select_elements.add_last(function(element_ids) { self.dataset.read_ids(element_ids,[]).done(function(projects) { self.database_projects.concat(projects); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 46c6ce4eaf6..5afb04c00f8 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -78,7 +78,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ node.tag = qweb_prefix; node.attrs[qweb_prefix + '-esc'] = 'record.' + node.attrs['name'] + '.value'; this.extract_aggregates(node); - break + break; case 'button': case 'a': var type = node.attrs.type || ''; @@ -395,7 +395,7 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({ this.qweb_context = { record: this.record, widget: this - } + }; for (var p in this) { if (_.str.startsWith(p, 'kanban_')) { this.qweb_context[p] = _.bind(this[p], this); @@ -444,7 +444,7 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({ var self = this; if (confirm(_t("Are you sure you want to delete this record ?"))) { return $.when(this.view.dataset.unlink([this.id])).then(function() { - self.group.remove_record(self.id) + self.group.remove_record(self.id); self.stop(); }); } diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index 41732391936..bcfedd49dba 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -153,7 +153,7 @@ openerp.web_mobile.Shortcuts = openerp.web.OldWidget.extend({ start: function() { var self = this; this.rpc('/web/session/sc_list',{} ,function(res){ - self.$element.html(self.render({'sc' : res})) + self.$element.html(self.render({'sc': res})); self.$element.find("[data-role=header]").find('h1').html('Favourite'); self.$element.find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 5bfd1d39587..150db955cf3 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -169,7 +169,7 @@ openerp.web_process = function (openerp) { // Node text process_node_text = r.text(n.node.x, n.node.y, (n.node.name)) .attr({"fill": "#fff", "font-weight": "bold", "cursor": "pointer"}); - process_node_text.translate((process_node.getBBox().width/ 2) + 5, 10) + process_node_text.translate((process_node.getBBox().width / 2) + 5, 10); if(n.node.subflow) { process_node_text.click(function() { self.process_id = n.node.subflow[0];