each plugin is its own folder

Author: mistic100

Gruntfile.js

@@ -12,11 +12,9 @@ module.exports = function(grunt) {
         loaded_modules = [],
         loaded_lang = '';
 
-    grunt.file.expandMapping('src/plugins/*.js', '', {
-        flatten: true, ext: ''
-    })
+    grunt.file.expand('src/plugins/*/plugin.js')
     .forEach(function(f) {
-        modules[f.dest] = f.src[0];
+        modules[f.split('/')[2]] = f;
     });
 
     grunt.file.expandMapping('src/i18n/*.js', '', {
@@ -35,7 +33,7 @@ module.exports = function(grunt) {
                 js_files_to_load.push(modules[m]);
                 loaded_modules.push(m);
             }
-            else {
+            else if (m !== 'none') {
                 grunt.fail.warn('Module '+ m +' unknown');
             }
         });
@@ -237,7 +235,7 @@ module.exports = function(grunt) {
             }
         });
 
-        grunt.log.writeln('\nTriggers in QueryBuilder ' + grunt.template.process('<%= pkg.version %>') + ' :\n');
+        grunt.log.writeln('\nTriggers in QueryBuilder:\n');
 
         for (var t in triggers) {
             grunt.log.write((triggers[t].name)['cyan']);
@@ -253,6 +251,29 @@ module.exports = function(grunt) {
         }
     });
 
+    // display avilable modules
+    grunt.registerTask('list_modules', '', function() {
+        grunt.log.writeln('\nAvailable QueryBuilder plugins:\n');
+
+        for (var m in modules) {
+          grunt.log.write(m['cyan']);
+
+          if (grunt.file.exists(modules[m].replace(/js$/, 'css'))) {
+            grunt.log.write(' + CSS');
+          }
+
+          grunt.log.write('\n');
+        }
+        
+        grunt.log.writeln('\nAvailable QueryBuilder languages:\n');
+
+        for (var l in langs) {
+          if (l !== 'en') {
+            grunt.log.writeln(l['cyan']);
+          }
+        }
+    });
+
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-cssmin');

examples/index.html

@@ -6,8 +6,8 @@
 
   <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
   <link rel="stylesheet" href="../src/query-builder.css">
-  <link rel="stylesheet" href="../src/plugins/bt-tooltip-errors.css">
-  <link rel="stylesheet" href="../src/plugins/sortable.css">
+  <link rel="stylesheet" href="../src/plugins/bt-tooltip-errors/plugin.css">
+  <link rel="stylesheet" href="../src/plugins/sortable/plugin.css">
   <link href="../bower_components/seiyria-bootstrap-slider/dist/css/bootstrap-slider.min.css" rel="stylesheet">
 </head>
 
@@ -42,10 +42,10 @@ <h3>Output</h3>
 <script src="../bower_components/jquery-extendext/jQuery.extendext.js"></script>
 <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 <script src="../src/query-builder.js"></script>
-<script src="../src/plugins/sql-support.js"></script>
-<script src="../src/plugins/mongodb-support.js"></script>
-<script src="../src/plugins/bt-tooltip-errors.js"></script>
-<script src="../src/plugins/sortable.js"></script>
+<script src="../src/plugins/sql-support/plugin.js"></script>
+<script src="../src/plugins/mongodb-support/plugin.js"></script>
+<script src="../src/plugins/bt-tooltip-errors/plugin.js"></script>
+<script src="../src/plugins/sortable/plugin.js"></script>
 <script src="../bower_components/seiyria-bootstrap-slider/dist/bootstrap-slider.min.js"></script>
 
 <script>
@@ -201,7 +201,7 @@ <h3>Output</h3>
     },
     onAfterSetValue: function($rule, value, filter, operator) {
       if (operator.accept_values) {
-        var val = value.split('.');
+        var val = value[0].split('.');
 
         $rule.find('[name=coord_1]').val(val[0]).trigger('change');
         $rule.find('[name=coord_2]').val(val[1]);

src/plugins/bt-selectpicker.js renamed to src/plugins/bt-selectpicker/plugin.js

@@ -17,7 +17,7 @@
         }, options || {});
 
         // add BT Tooltip data
-        this.on('ruleTemplate', function(h) {
+        this.on('getRuleTemplate', function(h) {
             return h.replace('class="error-container"', 'class="error-container" data-toggle="tooltip"');
         });
 

src/plugins/bt-tooltip-errors.css renamed to src/plugins/bt-tooltip-errors/plugin.css

@@ -7,16 +7,12 @@
 (function($){
     "use strict";
 
-    $.fn.queryBuilder.defaults.set({
-        default_rule_flags: {
-            no_sortable: false
-        },
-        icons: {
-            sort: 'glyphicon glyphicon-sort'
-        }
-    });
-
     $.fn.queryBuilder.define('sortable', function(options) {
+        options = $.extend({
+            default_no_sortable: false,
+            icon: 'glyphicon glyphicon-sort'
+        }, options || {});
+
         /**
          * Init HTML5 drag and drop
          */
@@ -94,6 +90,14 @@
         /**
          * Remove drag handle from non-sortable rules
          */
+        this.on('getRuleFlags', function(flags) {
+            if (flags.no_sortable === undefined) {
+                flags.no_sortable = options.default_no_sortable;
+            }
+
+            return flags;
+        });
+
         this.on('afterApplyRuleFlags', function($rule, rule, flags) {
             if (flags.no_sortable) {
                 $rule.find('.drag-handle').remove();

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

@@ -53,8 +53,6 @@
         onValidationError: null,
         onAfterAddGroup: null,
         onAfterAddRule: null,
-        onAfterCreateRuleInput: null,
-        onAfterChangeOperator: null,
 
         display_errors: true,
         allow_groups: -1,
@@ -463,10 +461,6 @@
                     }
 
                     that.applyRuleFlags($rule, rule);
-
-                    if (filter.onAfterSetValue) {
-                        filter.onAfterSetValue.call(that, $rule, rule.value, filter, operator);
-                    }
                 }
             });
 
@@ -1269,6 +1263,10 @@
         }
 
         this.trigger('afterSetRuleValue', $rule, value, filter, operator);
+
+        if (filter.onAfterSetValue) {
+            filter.onAfterSetValue.call(this, $rule, value, filter, operator);
+        }
     };
 
     /**