summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-01-25 09:53:10 +0100
committerXavier Morel <xmo@openerp.com>2012-01-25 09:53:10 +0100
commit7ce1aad7ecbbe66f99bd345fa6b0028e64b65386 (patch)
tree2721828b653cb855c1f16d7802981a7bf5d657e5 /addons/web/static/src/js
parentfa10430e2536c3992cc5c445ecdf7d38d43db081 (diff)
[IMP] terminate statements, remove extraneous statement terminations
bzr revid: xmo@openerp.com-20120125085310-zzwjrll47n61hw8w
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/core.js6
-rw-r--r--addons/web/static/src/js/view_editor.js37
-rw-r--r--addons/web/static/src/js/view_form.js8
3 files changed, 25 insertions, 26 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) {