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

[FIX] don't needlessly prevent events from bubbling 

bzr revid: xmo@openerp.com-20110331113545-ig0kcaxzi8x2g4c1
This commit is contained in:
Xavier Morel 2011-03-31 13:35:45 +02:00
parent 359e2443d4
commit f86d1acc51
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/base/static/src/js/search.js
View File

@ -371,7 +371,7 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
this._super(parent);
this.fields = fields;
},
add_group: function(group) {
add_group: function() {
var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
var render = group.render({});
this.$element.find('.searchview_extended_groups_list').append(render);
@ -382,10 +382,8 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
var _this = this;
openerp.base.search.add_expand_listener(this.$element);
this.add_group();
this.$element.find('.searchview_extended_add_group').click(function (e) {
this.$element.find('.searchview_extended_add_group').click(function () {
_this.add_group();
e.stopPropagation();
e.preventDefault();
});
},
get_context: function() {
@ -418,16 +416,12 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
this._super();
var _this = this;
this.add_prop();
this.$element.find('.searchview_extended_add_proposition').click(function (e) {
this.$element.find('.searchview_extended_add_proposition').click(function () {
_this.add_prop();
e.stopPropagation();
e.preventDefault();
});
var delete_btn = this.$element.find('.searchview_extended_delete_group');
delete_btn.click(function (e) {
_this.stop();
e.stopPropagation();
e.preventDefault();
});
},
get_domain: function() {
@ -476,16 +470,12 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
this._super();
this.set_selected(this.fields.length > 0 ? this.fields[0] : null);
var _this = this;
this.$element.find(".searchview_extended_prop_field").change(function(e) {
this.$element.find(".searchview_extended_prop_field").change(function() {
_this.changed();
e.stopPropagation();
e.preventDefault();
});
var delete_btn = this.$element.find('.searchview_extended_delete_prop');
delete_btn.click(function (e) {
delete_btn.click(function () {
_this.stop();
e.stopPropagation();
e.preventDefault();
});
},
changed: function() {

16
addons/base/static/src/xml/base.xml
View File

@ -368,8 +368,9 @@
<t t-set="expand" t-value="false"/>
<t t-set="label" t-value="'Extended Filters'"/>
<t t-set="content">
<div class="searchview_extended_groups_list"></div>
<button class="searchview_extended_add_group">Add group of conditions</button>
<div class="searchview_extended_groups_list"/>
<button class="searchview_extended_add_group"
type="button">Add group of conditions</button>
</t>
</t>
</t>
@ -382,8 +383,10 @@
</select>
<div class="searchview_extended_propositions_list">
</div>
<button class="searchview_extended_add_proposition">Add condition</button>
<button class="searchview_extended_delete_group">Delete this group</button>
<button class="searchview_extended_add_proposition"
type="button">Add condition</button>
<button class="searchview_extended_delete_group"
type="button">Delete this group</button>
</div>
</t>
<t t-name="SearchView.extended_search.proposition">
@ -400,10 +403,11 @@
</select>
<span class="searchview_extended_prop_value">
</span>
<button class="searchview_extended_delete_prop">Delete this condition</button>
<button class="searchview_extended_delete_prop"
type="button">Delete this condition</button>
</div>
</t>
<t t-name="SearchView.extended_search.proposition.char">
<input t-att-id="element_id"></input>
<input t-att-id="element_id"/>
</t>
</templates>