[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20120914165104-zsxkby9nslh8x2ry
This commit is contained in:
@@ -170,7 +170,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
|
||||
})
|
||||
);
|
||||
}
|
||||
return loaded.then(function () {
|
||||
return loaded.pipe(function () {
|
||||
return self.do_load_js(file_list);
|
||||
}).then(function() {
|
||||
self.on_modules_loaded();
|
||||
|
||||
@@ -919,8 +919,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
|
||||
this.records.bind(event, callback);
|
||||
}, this);
|
||||
|
||||
this.$_element = $('<tbody>')
|
||||
.appendTo(document.body)
|
||||
this.$current = $('<tbody>')
|
||||
.delegate('th.oe_list_record_selector', 'click', function (e) {
|
||||
e.stopPropagation();
|
||||
var selection = self.get_selection();
|
||||
@@ -1011,11 +1010,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
|
||||
});
|
||||
},
|
||||
render: function () {
|
||||
var self = this;
|
||||
if (this.$current) {
|
||||
this.$current.remove();
|
||||
}
|
||||
this.$current = this.$_element.clone(true);
|
||||
this.$current.empty().append(
|
||||
QWeb.render('ListView.rows', _.extend({
|
||||
render_cell: function () {
|
||||
@@ -1091,7 +1085,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
|
||||
if (!this.$current) { return; }
|
||||
this.$current.remove();
|
||||
this.$current = null;
|
||||
this.$_element.remove();
|
||||
},
|
||||
get_records: function () {
|
||||
return this.records.map(function (record) {
|
||||
|
||||
Reference in New Issue
Block a user