Skip to content

Commit fa0be59

Browse files
Marcin Charmułowiczmistic100
Marcin Charmułowicz
authored andcommitted
Pass previous operator to afterUpdateRuleOperator event
1 parent e1887ad commit fa0be59

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

src/core.js

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ QueryBuilder.prototype.bindEvents = function() {
282282
break;
283283

284284
case 'value':
285-
self.updateRuleValue(node);
285+
self.updateRuleValue(node, oldValue);
286286
break;
287287
}
288288
}
@@ -297,7 +297,7 @@ QueryBuilder.prototype.bindEvents = function() {
297297
break;
298298

299299
case 'condition':
300-
self.updateGroupCondition(node);
300+
self.updateGroupCondition(node, oldValue);
301301
break;
302302
}
303303
}
@@ -446,10 +446,11 @@ QueryBuilder.prototype.deleteGroup = function(group) {
446446
/**
447447
* Performs actions when a group's condition changes
448448
* @param {Group} group
449+
* @param {object} previousCondition
449450
* @fires QueryBuilder.afterUpdateGroupCondition
450451
* @private
451452
*/
452-
QueryBuilder.prototype.updateGroupCondition = function(group) {
453+
QueryBuilder.prototype.updateGroupCondition = function(group, previousCondition) {
453454
group.$el.find('>' + QueryBuilder.selectors.group_condition).each(function() {
454455
var $this = $(this);
455456
$this.prop('checked', $this.val() === group.condition);
@@ -461,8 +462,9 @@ QueryBuilder.prototype.updateGroupCondition = function(group) {
461462
* @event afterUpdateGroupCondition
462463
* @memberof QueryBuilder
463464
* @param {Group} group
465+
* @param {object} previousCondition
464466
*/
465-
this.trigger('afterUpdateGroupCondition', group);
467+
this.trigger('afterUpdateGroupCondition', group, previousCondition);
466468

467469
this.trigger('rulesChanged');
468470
};
@@ -732,8 +734,9 @@ QueryBuilder.prototype.updateRuleFilter = function(rule, previousFilter) {
732734
* @event afterUpdateRuleFilter
733735
* @memberof QueryBuilder
734736
* @param {Rule} rule
737+
* @param {object} previousFilter
735738
*/
736-
this.trigger('afterUpdateRuleFilter', rule);
739+
this.trigger('afterUpdateRuleFilter', rule, previousFilter);
737740

738741
this.trigger('rulesChanged');
739742
};
@@ -747,6 +750,7 @@ QueryBuilder.prototype.updateRuleFilter = function(rule, previousFilter) {
747750
*/
748751
QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
749752
var $valueContainer = rule.$el.find(QueryBuilder.selectors.value_container);
753+
var ruleValue = rule.value;
750754

751755
if (!rule.operator || rule.operator.nb_inputs === 0) {
752756
$valueContainer.hide();
@@ -773,22 +777,24 @@ QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
773777
* @event afterUpdateRuleOperator
774778
* @memberof QueryBuilder
775779
* @param {Rule} rule
780+
* @param {object} previousOperator
776781
*/
777-
this.trigger('afterUpdateRuleOperator', rule);
782+
this.trigger('afterUpdateRuleOperator', rule, previousOperator);
778783

779784
this.trigger('rulesChanged');
780785

781786
// FIXME is it necessary ?
782-
this.updateRuleValue(rule);
787+
this.updateRuleValue(rule, ruleValue);
783788
};
784789

785790
/**
786791
* Performs actions when rule's value changes
787792
* @param {Rule} rule
793+
* @param {object} previousValue
788794
* @fires QueryBuilder.afterUpdateRuleValue
789795
* @private
790796
*/
791-
QueryBuilder.prototype.updateRuleValue = function(rule) {
797+
QueryBuilder.prototype.updateRuleValue = function(rule, previousValue) {
792798
if (!rule._updating_value) {
793799
this.setRuleInputValue(rule, rule.value);
794800
}
@@ -798,8 +804,9 @@ QueryBuilder.prototype.updateRuleValue = function(rule) {
798804
* @event afterUpdateRuleValue
799805
* @memberof QueryBuilder
800806
* @param {Rule} rule
807+
* @param {*} previousValue
801808
*/
802-
this.trigger('afterUpdateRuleValue', rule);
809+
this.trigger('afterUpdateRuleValue', rule, previousValue);
803810

804811
this.trigger('rulesChanged');
805812
};

src/i18n/pl.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"delete_group": "Usuń",
99

1010
"conditions": {
11-
"AND": "AND",
12-
"OR": "OR"
11+
"AND": "ORAZ",
12+
"OR": "LUB"
1313
},
1414

1515
"operators": {

0 commit comments

Comments
 (0)