summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-04-17 13:43:58 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-04-17 13:43:58 +0200
commit5b89624fcf297b4a8a39cd5e2597abe63badac35 (patch)
tree10d9d4cf39b0085c3e0d514e4a76eda4e53a4d4c /addons/web/static/src
parent1bad998f513887e56d5a92040c88780abc585a56 (diff)
[imp] renammed some usage of instance for future refactoring
bzr revid: nicolas.vanhoren@openerp.com-20120417114358-ilya1z6iv0o61m6t
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_form.js2
-rw-r--r--addons/web/static/src/js/view_list.js14
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c462ae49798..bcf3ffd2600 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1926,7 +1926,7 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
picker: function() {
return $.fn[this.jqueryui_object].apply(this.$input_picker, arguments);
},
- on_picker_select: function(text, instance) {
+ on_picker_select: function(text, instance_) {
var date = this.picker('getDate');
this.$input.val(date ? this.format_client(date) : '').change();
},
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index f137bd6c211..d8ef6ecb34f 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1654,19 +1654,19 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
var records = record instanceof Array ? record : [record];
for(var i=0, length=records.length; i<length; ++i) {
- var instance = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
- instance.bind(null, this._onRecordEvent);
- this._byId[instance.get('id')] = instance;
+ var instance_ = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
+ instance_.bind(null, this._onRecordEvent);
+ this._byId[instance_.get('id')] = instance_;
if (options.at == undefined) {
- this.records.push(instance);
+ this.records.push(instance_);
if (!options.silent) {
- this.trigger('add', this, instance, this.records.length-1);
+ this.trigger('add', this, instance_, this.records.length-1);
}
} else {
var insertion_index = options.at + i;
- this.records.splice(insertion_index, 0, instance);
+ this.records.splice(insertion_index, 0, instance_);
if (!options.silent) {
- this.trigger('add', this, instance, insertion_index);
+ this.trigger('add', this, instance_, insertion_index);
}
}
this.length++;