simplify internal usage of events

Author: mistic100

src/core.js

@@ -390,7 +390,7 @@ QueryBuilder.prototype.deleteRule = function(rule) {
  * @param rule {Rule}
  */
 QueryBuilder.prototype.createRuleFilters = function(rule) {
-    var filters = this.change('ruleFilters', this.filters, rule);
+    var filters = this.change('getRuleFilters', this.filters, rule);
 
     var $filterSelect = $(this.getRuleFilterSelect(rule, filters));
 
@@ -452,11 +452,11 @@ QueryBuilder.prototype.createRuleInput = function(rule) {
         $inputs[filter.plugin](filter.plugin_config || {});
     }
 
+    this.trigger('afterCreateRuleInput', rule);
+
     if (filter.default_value !== undefined) {
         this.setRuleValue(rule, filter.default_value);
     }
-
-    this.trigger('afterCreateRuleInput', rule);
 };
 
 /**

src/main.js

@@ -31,18 +31,18 @@ $.extend(QueryBuilder.prototype, {
         return event;
     },
 
-    on: function() {
-        this.$el.on.apply(this.$el, aps.call(arguments));
+    on: function(type, cb) {
+        this.$el.on(type + '.queryBuilder', cb);
         return this;
     },
 
-    off: function() {
-        this.$el.off.apply(this.$el, aps.call(arguments));
+    off: function(type, cb) {
+        this.$el.off(type + '.queryBuilder', cb);
         return this;
     },
 
-    once: function() {
-        this.$el.one.apply(this.$el, aps.call(arguments));
+    once: function(type, cb) {
+        this.$el.one(type + '.queryBuilder', cb);
         return this;
     }
 });

src/plugins/bt-checkbox/plugin.js

@@ -16,7 +16,7 @@ QueryBuilder.define('bt-checkbox', function(options) {
         document.body.appendChild(injectCSS);
     }
 
-    this.on('getRuleInput.queryBuilder.filter', function(h, rule, name) {
+    this.on('getRuleInput.filter', function(h, rule, name) {
         var filter = rule.filter;
 
         if ((filter.input === 'radio' || filter.input === 'checkbox') && !filter.plugin) {

src/plugins/bt-selectpicker/plugin.js

@@ -4,20 +4,20 @@ QueryBuilder.define('bt-selectpicker', function(options) {
     }
 
     // init selectpicker
-    this.on('afterCreateRuleFilters.queryBuilder', function(e, rule) {
+    this.on('afterCreateRuleFilters', function(e, rule) {
         rule.$el.find('.rule-filter-container select').removeClass('form-control').selectpicker(options);
     });
 
-    this.on('afterCreateRuleOperators.queryBuilder', function(e, rule) {
+    this.on('afterCreateRuleOperators', function(e, rule) {
         rule.$el.find('.rule-operator-container select').removeClass('form-control').selectpicker(options);
     });
 
     // update selectpicker on change
-    this.on('afterUpdateRuleFilter.queryBuilder', function(e, rule) {
+    this.on('afterUpdateRuleFilter', function(e, rule) {
         rule.$el.find('.rule-filter-container select').selectpicker('render');
     });
 
-    this.on('afterUpdateRuleOperator.queryBuilder', function(e, rule) {
+    this.on('afterUpdateRuleOperator', function(e, rule) {
         rule.$el.find('.rule-operator-container select').selectpicker('render');
     });
 }, {

src/plugins/bt-tooltip-errors/plugin.js

@@ -6,11 +6,11 @@ QueryBuilder.define('bt-tooltip-errors', function(options) {
     var self = this;
 
     // add BT Tooltip data
-    this.on('getRuleTemplate.queryBuilder.filter', function(h) {
+    this.on('getRuleTemplate.filter', function(h) {
         h.value = h.value.replace('class="error-container"', 'class="error-container" data-toggle="tooltip"');
     });
 
-    this.on('getGroupTemplate.queryBuilder.filter', function(h) {
+    this.on('getGroupTemplate.filter', function(h) {
         h.value = h.value.replace('class="error-container"', 'class="error-container" data-toggle="tooltip"');
     });
 

src/plugins/filter-description/plugin.js

@@ -3,7 +3,7 @@ QueryBuilder.define('filter-description', function(options) {
      * INLINE
      */
     if (options.mode === 'inline') {
-        this.on('afterUpdateRuleFilter.queryBuilder', function(e, rule) {
+        this.on('afterUpdateRuleFilter', function(e, rule) {
             var $p = rule.$el.find('p.filter-description');
 
             if (!rule.filter || !rule.filter.description) {
@@ -30,7 +30,7 @@ QueryBuilder.define('filter-description', function(options) {
             error('Bootstrap Popover is required to use "filter-description" plugin. Get it here: http://getbootstrap.com');
         }
 
-        this.on('afterUpdateRuleFilter.queryBuilder', function(e, rule) {
+        this.on('afterUpdateRuleFilter', function(e, rule) {
             var $b = rule.$el.find('button.filter-description');
 
             if (!rule.filter || !rule.filter.description) {
@@ -75,7 +75,7 @@ QueryBuilder.define('filter-description', function(options) {
             error('Bootbox is required to use "filter-description" plugin. Get it here: http://bootboxjs.com');
         }
 
-        this.on('afterUpdateRuleFilter.queryBuilder', function(e, rule) {
+        this.on('afterUpdateRuleFilter', function(e, rule) {
             var $b = rule.$el.find('button.filter-description');
 
             if (!rule.filter || !rule.filter.description) {

src/plugins/sortable/plugin.js

@@ -2,7 +2,7 @@ QueryBuilder.define('sortable', function(options) {
     /**
      * Init HTML5 drag and drop
      */
-    this.on('afterInit.queryBuilder', function(e) {
+    this.on('afterInit', function(e) {
         // configure jQuery to use dataTransfer
         $.event.props.push('dataTransfer');
 
@@ -77,13 +77,13 @@ QueryBuilder.define('sortable', function(options) {
     /**
      * Remove drag handle from non-sortable rules
      */
-    this.on('parseRuleFlags.queryBuilder.filter', function(flags) {
+    this.on('parseRuleFlags.filter', function(flags) {
         if (flags.value.no_sortable === undefined) {
             flags.value.no_sortable = options.default_no_sortable;
         }
     });
 
-    this.on('afterApplyRuleFlags.queryBuilder', function(e, rule) {
+    this.on('afterApplyRuleFlags', function(e, rule) {
         if (rule.flags.no_sortable) {
             rule.$el.find('.drag-handle').remove();
         }
@@ -92,15 +92,15 @@ QueryBuilder.define('sortable', function(options) {
     /**
      * Modify templates
      */
-    this.on('getGroupTemplate.queryBuilder.filter', function(h, level) {
+    this.on('getGroupTemplate.filter', function(h, level) {
         if (level>1) {
             var $h = $(h.value);
             $h.find('.group-conditions').after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
             h.value = $h.prop('outerHTML');
         }
     });
 
-    this.on('getRuleTemplate.queryBuilder.filter', function(h) {
+    this.on('getRuleTemplate.filter', function(h) {
         var $h = $(h.value);
         $h.find('.rule-header').after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
         h.value = $h.prop('outerHTML');

src/plugins/unique-filter/plugin.js

@@ -1,9 +1,9 @@
 QueryBuilder.define('unique-filter', function() {
     this.status.used_filters = {};
 
-    this.on('afterUpdateRuleFilter.queryBuilder', this.updateDisabledFilters);
-    this.on('afterDeleteRule.queryBuilder', this.updateDisabledFilters);
-    this.on('afterCreateRuleFilters.queryBuilder', this.applyDisabledFilters);
+    this.on('afterUpdateRuleFilter', this.updateDisabledFilters);
+    this.on('afterDeleteRule', this.updateDisabledFilters);
+    this.on('afterCreateRuleFilters', this.applyDisabledFilters);
 });
 
 QueryBuilder.extend({