odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] terminate a bunch of unterminated statements 

bzr revid: xmo@openerp.com-20110906085853-2a5tqi92jdnglejd
This commit is contained in:
Xavier Morel 2011-09-06 10:58:53 +02:00
parent 1bba02bf63
commit 4f8b43561f
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/core.js
View File

@ -987,7 +987,7 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend({
var fcnt = function(str) {
var tmp = self.get(str);
return tmp === undefined ? str : tmp;
}
};
fcnt.database = this;
return fcnt;
},

2
addons/web/static/src/js/data.js
View File

@ -691,7 +691,7 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
}
}
setTimeout(function () {completion.resolve(records);}, 0);
}
};
if(to_get.length > 0) {
var rpc_promise = this._super(to_get, fields, function(records) {
_.each(records, function(record, index) {

16
addons/web/static/src/js/form.js
View File

@ -214,7 +214,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
var ctx = widget.build_context ? widget.build_context() : {};
return ctx;
}
}
};
var parent_fields = null;
_.each(call[2].split(','), function(a, i) {
var field = _.trim(a);
@ -1318,7 +1318,7 @@ openerp.web.form.dialog = function(content, options) {
var dialog = new openerp.web.Dialog(null, options);
dialog.$dialog = $(content).dialog(dialog.dialog_options);
return dialog.$dialog;
}
};
openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
init: function(view, node) {
@ -1411,13 +1411,13 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
if (!self.$input.is(":focus") &&
!self.$input.autocomplete("widget").is(":visible") &&
!self.value) {
if(self.value === undefined && self.last_search.length > 0) {
if (self.value === undefined && self.last_search.length > 0) {
self._change_int_ext_value(self.last_search[0]);
} else {
self._change_int_ext_value(null);
}
}
}
};
this.$input.focusout(anyoneLoosesFocus);
var isSelecting = false;
@ -1479,7 +1479,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
}});
}
// quick create
var raw_result = _(data.result).map(function(x) {return x[1];})
var raw_result = _(data.result).map(function(x) {return x[1];});
if (search_val.length > 0 &&
!_.include(raw_result, search_val) &&
(!self.value || search_val !== self.value[1])) {
@ -2251,7 +2251,7 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({
relation: null
}
}
}
};
this.get_fields_values = view.get_fields_values;
this.do_onchange = this.on_form_changed = this.on_nop;
this.widgets = {};
@ -2361,7 +2361,7 @@ openerp.web.form.FieldBinary = openerp.web.form.Field.extend({
} else {
var url = '/web/binary/saveas?session_id=' + this.session.session_id + '&model=' +
this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name +
'&fieldname=' + (this.node.attrs.filename || '') + '&t=' + (new Date().getTime())
'&fieldname=' + (this.node.attrs.filename || '') + '&t=' + (new Date().getTime());
window.open(url);
}
},
@ -2419,7 +2419,7 @@ openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
this._super.apply(this, arguments);
this.set_image_maxwidth();
var url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime())
this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime());
this.$image.attr('src', url);
},
set_image_maxwidth: function() {

2
addons/web/static/src/js/views.js
View File

@ -536,7 +536,7 @@ openerp.web.TranslateDialog = openerp.web.Dialog.extend({
self.$fields_form.find('.oe_trad_field[name="' + lg.code + '-' + f + '"]').val(values[0][f] || '').attr('data-value', values[0][f] || '');
});
deff.resolve();
}
};
if (lg.code === self.view_language) {
var values = {};
_.each(self.translatable_fields_keys, function(field) {

4
addons/web_calendar/static/src/js/calendar.js
View File

@ -170,7 +170,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
value: filter_value,
label: (typeof filter === 'object') ? filter[1] : filter,
color: this.get_color(filter_value)
}
};
if (!sidebar_items[filter_value]) {
sidebar_items[filter_value] = filter_item;
}
@ -224,7 +224,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
'text': res_text,
'id': evt.id,
'title': res_description.join()
}
};
if (evt.color) {
r.color = evt.color;
}

4
addons/web_dashboard/static/src/js/dashboard.js
View File

@ -103,10 +103,10 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
self.actions_attrs[aid] = {
name: aid,
string: _.trim(result.result.name)
}
};
qdict.action = {
attrs : self.actions_attrs[aid]
}
};
self.$element.find('.oe-dashboard-column:first').prepend(QWeb.render('DashBoard.action', qdict));
self.do_save_dashboard();
self.on_load_action(result)

8
addons/web_gantt/static/src/js/gantt.js
View File

@ -94,7 +94,7 @@ init: function(parent, element_id, dataset, view_id) {
COLOR_PALETTE = ['#ccccff', '#cc99ff', '#75507b', '#3465a4', '#73d216', '#c17d11', '#edd400',
'#fcaf3e', '#ef2929', '#ff00c9', '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f',
'#ff8e00', '#ff0000', '#b0008c', '#9000ff', '#0078ff', '#00ff00', '#e6ff00', '#ffff00',
'#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900']
'#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900'];
if (result.length != 0){
var show_event = [];
@ -157,7 +157,7 @@ init: function(parent, element_id, dataset, view_id) {
var duration = res[this.date_delay];
}
if (duration == false)
duration = 0
duration = 0;
if (self.grp.length){
for (var j in self.grp){
@ -396,14 +396,14 @@ init: function(parent, element_id, dataset, view_id) {
"type":"ir.actions.act_window",
"view_type":"form",
"view_mode":"form"
}
};
action.flags = {
search_view: false,
sidebar : false,
views_switcher : false,
pager: false
}
};
var element_id = _.uniqueId("act_window_dialog");
var dialog = jQuery('<div>', {
'id': element_id

4
addons/web_mobile/static/src/js/chrome_mobile.js
View File

@ -132,7 +132,7 @@ openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({
start: function() {
var self = this;
this.rpc('/web/session/sc_list',{} ,function(res){
self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
self.$element.html(QWeb.render("Shortcuts", {'sc' : res}));
self.$element.find("a").click(self.on_clicked);
})
},
@ -246,4 +246,4 @@ openerp.web_mobile.Selection = openerp.web.Widget.extend({
$($this).prev().find(".ui-btn-text").html($($this).find("option:selected").text());
}
});
}
};

2
addons/web_mobile/static/src/js/form_mobile.js
View File

@ -128,4 +128,4 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
next.addClass(this.collapsed_class);
}
});
}
};

2
addons/web_mobile/static/src/js/list_mobile.js
View File

@ -70,4 +70,4 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
this.formview.start();
}
});
}
};