Skip to content

Commit 2a23788

Browse files
committed
jsdoc: fix events links and plugins definition
1 parent abb9e4b commit 2a23788

File tree

23 files changed

+262
-292
lines changed

23 files changed

+262
-292
lines changed

.jsdoc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{"kind": "global", "title": "Globals", "summary": "All documented globals."},
2727
{"kind": "mixin", "title": "Mixins", "summary": "All documented mixins."},
2828
{"kind": "interface", "title": "Interfaces", "summary": "All documented interfaces."},
29-
{"kind": "module", "title": "Plugins", "summary": "All documented modules."},
29+
{"kind": "module", "title": "Modules", "summary": "All documented modules."},
3030
{"kind": "event", "title": "Events", "summary": "All documented events."},
3131
{"kind": "namespace", "title": "Namespaces", "summary": "All documented namespaces."},
3232
{"kind": "tutorial", "title": "Tutorials", "summary": "All available tutorials."}

Gruntfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module.exports = function(grunt) {
1717
js_core_files: [
1818
'src/main.js',
1919
'src/defaults.js',
20+
'src/plugins.js',
2021
'src/core.js',
2122
'src/public.js',
2223
'src/data.js',

build/jsdoc.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
# Entry point: [$.fn.QueryBuilder](external-_jQuery.fn_.html)
44

5-
## [QueryBuilder](QueryBuilder.html)
5+
# [QueryBuilder](QueryBuilder.html)
66

7-
## [Rule](Rule.html) & [Group](Group.html)
7+
# [Rule](Rule.html) & [Group](Group.html)
88

9-
## [Events](list_event.html)
9+
# [Events](list_event.html)
1010

11-
## [Plugins](list_module.html)
11+
# [Plugins](module-plugins.html)

src/core.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ QueryBuilder.prototype.bindEvents = function() {
321321
* @param {object} [data] - group custom data
322322
* @param {object} [flags] - flags to apply to the group
323323
* @returns {Group} root group
324-
* @fires QueryBuilder#afterAddGroup
324+
* @fires QueryBuilder.afterAddGroup
325325
*/
326326
QueryBuilder.prototype.setRoot = function(addRule, data, flags) {
327327
addRule = (addRule === undefined || addRule === true);
@@ -354,8 +354,8 @@ QueryBuilder.prototype.setRoot = function(addRule, data, flags) {
354354
* @param {object} [data] - group custom data
355355
* @param {object} [flags] - flags to apply to the group
356356
* @returns {Group}
357-
* @fires QueryBuilder#beforeAddGroup
358-
* @fires QueryBuilder#afterAddGroup
357+
* @fires QueryBuilder.beforeAddGroup
358+
* @fires QueryBuilder.afterAddGroup
359359
*/
360360
QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
361361
addRule = (addRule === undefined || addRule === true);
@@ -403,8 +403,8 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
403403
* Tries to delete a group. The group is not deleted if at least one rule is flagged `no_delete`.
404404
* @param {Group} group
405405
* @returns {boolean} if the group has been deleted
406-
* @fires QueryBuilder#beforeDeleteGroup
407-
* @fires QueryBuilder#afterDeleteGroup
406+
* @fires QueryBuilder.beforeDeleteGroup
407+
* @fires QueryBuilder.afterDeleteGroup
408408
*/
409409
QueryBuilder.prototype.deleteGroup = function(group) {
410410
if (group.isRoot()) {
@@ -447,7 +447,7 @@ QueryBuilder.prototype.deleteGroup = function(group) {
447447
/**
448448
* Performs actions when a group's condition changes
449449
* @param {Group} group
450-
* @fires QueryBuilder#afterUpdateGroupCondition
450+
* @fires QueryBuilder.afterUpdateGroupCondition
451451
* @private
452452
*/
453453
QueryBuilder.prototype.updateGroupCondition = function(group) {
@@ -489,9 +489,9 @@ QueryBuilder.prototype.refreshGroupsConditions = function() {
489489
* @param {object} [data] - rule custom data
490490
* @param {object} [flags] - flags to apply to the rule
491491
* @returns {Rule}
492-
* @fires QueryBuilder#beforeAddRule
493-
* @fires QueryBuilder#afterAddRule
494-
* @fires QueryBuilder#changer:getDefaultFilter
492+
* @fires QueryBuilder.beforeAddRule
493+
* @fires QueryBuilder.afterAddRule
494+
* @fires QueryBuilder.changer:getDefaultFilter
495495
*/
496496
QueryBuilder.prototype.addRule = function(parent, data, flags) {
497497
/**
@@ -547,8 +547,8 @@ QueryBuilder.prototype.addRule = function(parent, data, flags) {
547547
* Tries to delete a rule
548548
* @param {Rule} rule
549549
* @returns {boolean} if the rule has been deleted
550-
* @fires QueryBuilder#beforeDeleteRule
551-
* @fires QueryBuilder#afterDeleteRule
550+
* @fires QueryBuilder.beforeDeleteRule
551+
* @fires QueryBuilder.afterDeleteRule
552552
*/
553553
QueryBuilder.prototype.deleteRule = function(rule) {
554554
if (rule.flags.no_delete) {
@@ -581,8 +581,8 @@ QueryBuilder.prototype.deleteRule = function(rule) {
581581
/**
582582
* Creates the filters for a rule
583583
* @param {Rule} rule
584-
* @fires QueryBuilder#changer:getRuleFilters
585-
* @fires QueryBuilder#afterCreateRuleFilters
584+
* @fires QueryBuilder.changer:getRuleFilters
585+
* @fires QueryBuilder.afterCreateRuleFilters
586586
* @private
587587
*/
588588
QueryBuilder.prototype.createRuleFilters = function(rule) {
@@ -611,7 +611,7 @@ QueryBuilder.prototype.createRuleFilters = function(rule) {
611611
/**
612612
* Creates the operators for a rule and init the rule operator
613613
* @param {Rule} rule
614-
* @fires QueryBuilder#afterCreateRuleOperators
614+
* @fires QueryBuilder.afterCreateRuleOperators
615615
* @private
616616
*/
617617
QueryBuilder.prototype.createRuleOperators = function(rule) {
@@ -642,7 +642,7 @@ QueryBuilder.prototype.createRuleOperators = function(rule) {
642642
/**
643643
* Creates the main input for a rule
644644
* @param {Rule} rule
645-
* @fires QueryBuilder#afterCreateRuleInput
645+
* @fires QueryBuilder.afterCreateRuleInput
646646
* @private
647647
*/
648648
QueryBuilder.prototype.createRuleInput = function(rule) {
@@ -701,7 +701,7 @@ QueryBuilder.prototype.createRuleInput = function(rule) {
701701
* Performs action when a rule's filter changes
702702
* @param {Rule} rule
703703
* @param {object} previousFilter
704-
* @fires QueryBuilder#afterUpdateRuleFilter
704+
* @fires QueryBuilder.afterUpdateRuleFilter
705705
* @private
706706
*/
707707
QueryBuilder.prototype.updateRuleFilter = function(rule, previousFilter) {
@@ -728,7 +728,7 @@ QueryBuilder.prototype.updateRuleFilter = function(rule, previousFilter) {
728728
* Performs actions when a rule's operator changes
729729
* @param {Rule} rule
730730
* @param {object} previousOperator
731-
* @fires QueryBuilder#afterUpdateRuleOperator
731+
* @fires QueryBuilder.afterUpdateRuleOperator
732732
* @private
733733
*/
734734
QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
@@ -768,7 +768,7 @@ QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
768768
/**
769769
* Performs actions when rule's value changes
770770
* @param {Rule} rule
771-
* @fires QueryBuilder#afterUpdateRuleValue
771+
* @fires QueryBuilder.afterUpdateRuleValue
772772
* @private
773773
*/
774774
QueryBuilder.prototype.updateRuleValue = function(rule) {
@@ -788,7 +788,7 @@ QueryBuilder.prototype.updateRuleValue = function(rule) {
788788
/**
789789
* Changes a rule's properties depending on its flags
790790
* @param {Rule} rule
791-
* @fires QueryBuilder#afterApplyRuleFlags
791+
* @fires QueryBuilder.afterApplyRuleFlags
792792
* @private
793793
*/
794794
QueryBuilder.prototype.applyRuleFlags = function(rule) {
@@ -820,7 +820,7 @@ QueryBuilder.prototype.applyRuleFlags = function(rule) {
820820
/**
821821
* Changes group's properties depending on its flags
822822
* @param {Group} group
823-
* @fires QueryBuilder#afterApplyGroupFlags
823+
* @fires QueryBuilder.afterApplyGroupFlags
824824
* @private
825825
*/
826826
QueryBuilder.prototype.applyGroupFlags = function(group) {
@@ -875,7 +875,7 @@ QueryBuilder.prototype.clearErrors = function(node) {
875875
/**
876876
* Adds/Removes error on a Rule or Group
877877
* @param {Node} node
878-
* @fires QueryBuilder#changer:displayError
878+
* @fires QueryBuilder.changer:displayError
879879
* @private
880880
*/
881881
QueryBuilder.prototype.updateError = function(node) {
@@ -910,7 +910,7 @@ QueryBuilder.prototype.updateError = function(node) {
910910
* @param {Node} node
911911
* @param {string|array} error
912912
* @param {*} value
913-
* @fires QueryBuilder#validationError
913+
* @fires QueryBuilder.validationError
914914
* @private
915915
*/
916916
QueryBuilder.prototype.triggerValidationError = function(node, error, value) {

src/data.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @param {Rule} rule
44
* @param {string|string[]} value
55
* @returns {array|boolean} true or error array
6-
* @fires QueryBuilder#changer:validateValue
6+
* @fires QueryBuilder.changer:validateValue
77
*/
88
QueryBuilder.prototype.validateValue = function(rule, value) {
99
var validation = rule.filter.validation || {};
@@ -246,7 +246,7 @@ QueryBuilder.prototype.nextRuleId = function() {
246246
* Returns the operators for a filter
247247
* @param {string|object} filter - filter id or filter object
248248
* @returns {object[]}
249-
* @fires QueryBuilder#changer:getOperators
249+
* @fires QueryBuilder.changer:getOperators
250250
* @private
251251
*/
252252
QueryBuilder.prototype.getOperators = function(filter) {
@@ -341,7 +341,7 @@ QueryBuilder.prototype.getOperatorByType = function(type, doThrow) {
341341
* Returns rule's current input value
342342
* @param {Rule} rule
343343
* @returns {*}
344-
* @fires QueryBuilder#changer:getRuleValue
344+
* @fires QueryBuilder.changer:getRuleValue
345345
* @private
346346
*/
347347
QueryBuilder.prototype.getRuleInputValue = function(rule) {
@@ -483,7 +483,7 @@ QueryBuilder.prototype.setRuleInputValue = function(rule, value) {
483483
* Parses rule flags
484484
* @param {object} rule
485485
* @returns {object}
486-
* @fires QueryBuilder#changer:parseRuleFlags
486+
* @fires QueryBuilder.changer:parseRuleFlags
487487
* @private
488488
*/
489489
QueryBuilder.prototype.parseRuleFlags = function(rule) {
@@ -539,7 +539,7 @@ QueryBuilder.prototype.getRuleFlags = function(flags, all) {
539539
* Parses group flags
540540
* @param {object} group
541541
* @returns {object}
542-
* @fires QueryBuilder#changer:parseGroupFlags
542+
* @fires QueryBuilder.changer:parseGroupFlags
543543
* @private
544544
*/
545545
QueryBuilder.prototype.parseGroupFlags = function(group) {
@@ -596,7 +596,7 @@ QueryBuilder.prototype.getGroupFlags = function(flags, all) {
596596
* @param {string} [category]
597597
* @param {string|object} key
598598
* @returns {string}
599-
* @fires QueryBuilder#changer:translate
599+
* @fires QueryBuilder.changer:translate
600600
*/
601601
QueryBuilder.prototype.translate = function(category, key) {
602602
if (!key) {

src/defaults.js

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Allowed types and their internal representation
33
* @type {object.<string, string>}
44
* @readonly
5+
* @private
56
*/
67
QueryBuilder.types = {
78
'string': 'string',
@@ -17,6 +18,7 @@ QueryBuilder.types = {
1718
* Allowed inputs
1819
* @type {string[]}
1920
* @readonly
21+
* @private
2022
*/
2123
QueryBuilder.inputs = [
2224
'text',
@@ -31,6 +33,7 @@ QueryBuilder.inputs = [
3133
* Runtime modifiable options with `setOptions` method
3234
* @type {string[]}
3335
* @readonly
36+
* @private
3437
*/
3538
QueryBuilder.modifiable_options = [
3639
'display_errors',

src/jquery.js

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
* @memberof external:"jQuery.fn"
1010
* @param {*} option - initial configuration or method name
1111
* @param {...*} args - method arguments
12+
*
13+
* @example
14+
* $('#builder').queryBuilder({ /** configuration object *\/ });
15+
* @example
16+
* $('#builder').queryBuilder('methodName', methodParam1, methodParam2);
1217
*/
1318
$.fn.queryBuilder = function(option) {
1419
if (this.length === 0) {

src/main.js

+1-50
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @param {jQuery} $el
1515
* @param {object} options - see {@link http://querybuilder.js.org/#options}
1616
* @constructor
17-
* @fires QueryBuilder#afterInit
17+
* @fires QueryBuilder.afterInit
1818
*/
1919
var QueryBuilder = function($el, options) {
2020
$el[0].queryBuilder = this;
@@ -237,52 +237,3 @@ $.extend(QueryBuilder.prototype, /** @lends QueryBuilder.prototype */ {
237237
}).join(' ');
238238
}
239239
});
240-
241-
/**
242-
* Definition of available plugins
243-
* @type {object.<String, object>}
244-
*/
245-
QueryBuilder.plugins = {};
246-
247-
/**
248-
* Gets or extends the default configuration
249-
* @param {object} [options] - new configuration
250-
* @returns {undefined|object} nothing or configuration object (copy)
251-
*/
252-
QueryBuilder.defaults = function(options) {
253-
if (typeof options == 'object') {
254-
$.extendext(true, 'replace', QueryBuilder.DEFAULTS, options);
255-
}
256-
else if (typeof options == 'string') {
257-
if (typeof QueryBuilder.DEFAULTS[options] == 'object') {
258-
return $.extend(true, {}, QueryBuilder.DEFAULTS[options]);
259-
}
260-
else {
261-
return QueryBuilder.DEFAULTS[options];
262-
}
263-
}
264-
else {
265-
return $.extend(true, {}, QueryBuilder.DEFAULTS);
266-
}
267-
};
268-
269-
/**
270-
* Registers a new plugin
271-
* @param {string} name
272-
* @param {function} fct - init function
273-
* @param {object} [def] - default options
274-
*/
275-
QueryBuilder.define = function(name, fct, def) {
276-
QueryBuilder.plugins[name] = {
277-
fct: fct,
278-
def: def || {}
279-
};
280-
};
281-
282-
/**
283-
* Adds new methods to QueryBuilder prototype
284-
* @param {object.<string, function>} methods
285-
*/
286-
QueryBuilder.extend = function(methods) {
287-
$.extend(QueryBuilder.prototype, methods);
288-
};

0 commit comments

Comments
 (0)