version 2.3.1

CONTRIBUTING.md

@@ -15,7 +15,7 @@ I reserve the right to refuse any plugin I think is not useful for many people.
 ## Unit tests
 Any big feature must have it's own QUnit tests suite. Of course existing tests must still pass after changes.
 
-I won't merge any branch not passing the TravisCI build (this include JShint compliance).
+I won't merge any branch not passing the TravisCI build, including JShint/JSCS/SCSSlint compliance.
 
 ## dist files
 Keep it simple, don't commit any files in the `dist` directory, I build these files only before a release.

README.md

@@ -1,9 +1,9 @@
 # jQuery QueryBuilder
 
 [![Bower version](https://img.shields.io/bower/v/jQuery-QueryBuilder.svg?style=flat-square)](http://querybuilder.js.org)
+[![CDN](https://img.shields.io/badge/cdn-jsdelivr-%23EB4C36.svg?style=flat-square)](http://www.jsdelivr.com/projects/jquery.query-builder)
 [![Build Status](https://img.shields.io/travis/mistic100/jQuery-QueryBuilder.svg?style=flat-square)](https://travis-ci.org/mistic100/jQuery-QueryBuilder)
 [![Coverage Status](https://img.shields.io/coveralls/mistic100/jQuery-QueryBuilder/master.svg?style=flat-square)](https://coveralls.io/r/mistic100/jQuery-QueryBuilder)
-[![CDN](https://img.shields.io/badge/cdn-jsdelivr-%23EB4C36.svg?style=flat-square)](http://www.jsdelivr.com/projects/jquery.query-builder)
 
 jQuery plugin offering an simple interface to create complex queries.
 
@@ -16,7 +16,7 @@ http://querybuilder.js.org
  * jQuery >= 1.9
  * Bootstrap >= 3.1 (CSS only)
  * [jQuery.extendext](https://github.com/mistic100/jQuery.extendext)
- * [doT.js](http://olado.github.io/doT)
+ * [doT.js](http://olado.github.io/doT) (@master until the author decide to publish a new version)
  * [MomentJS](http://momentjs.com) (optional, for Date/Time validation)
  * Other Bootstrap/jQuery plugins used by plugins
 
@@ -60,9 +60,10 @@ grunt --languages=fr,it
 
 #### Other commands
 
- * `grunt test` to run JSHint and the QUnit test suite.
+ * `grunt test` to run jshint/jscs/scsslint and the QUnit test suite.
  * `grunt list_modules` to get the list of available plugins and languages.
  * `grunt describe_triggers` to get the list of all triggers.
+ * `grunt describe_errors` to get the list of all fatal errors.
  * `grunt watch` to automatically build the library when modifying the source files.
 
 ### Inspiration

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jQuery-QueryBuilder",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "authors": [{
     "name": "Damien \"Mistic\" Sorel",
     "email": "[email protected]",
@@ -13,8 +13,8 @@
   ],
   "dependencies": {
     "jquery": ">= 1.9.0",
-    "bootstrap": "^3.1.0",
-    "moment": "^2.6.0",
+    "bootstrap": ">= 3.1.0",
+    "moment": ">= 2.6.0",
     "jquery-extendext": "^0.1.1",
     "doT": "master"
   },

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "mistic100/jquery-querybuilder",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "authors": [{
     "name": "Damien \"Mistic\" Sorel",
     "email": "[email protected]",

dist/css/query-builder.dark.css

@@ -1,6 +1,6 @@
 /*!
- * jQuery QueryBuilder 2.3.0
- * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * jQuery QueryBuilder 2.3.1
+ * Copyright 2014-2016 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
 
@@ -27,29 +27,33 @@
   border: 1px solid #00164A;
   background: rgba(50, 70, 80, 0.5);
 }
-.query-builder .rules-group-container .rules-group-header {
+.query-builder .rules-group-header {
   margin-bottom: 10px;
 }
-.query-builder .rules-group-container .rules-group-header input[name$=_cond] {
+.query-builder .rules-group-header .group-conditions .btn.disabled:not(.active),
+.query-builder .rules-group-header .group-conditions input[name$=_cond] {
   display: none;
 }
-.query-builder .rules-group-container .rules-list {
+.query-builder .rules-group-header .group-conditions .btn.disabled {
+  border-radius: 3px;
+}
+.query-builder .rules-list {
   list-style: none;
   padding: 0 0 0 15px;
   margin: 0;
 }
-.query-builder .rule-container .rule-value-container {
-  border-left: 1px solid #ddd;
+.query-builder .rule-value-container {
+  border-left: 1px solid #DDD;
   padding-left: 5px;
 }
-.query-builder .rule-container .rule-value-container label {
+.query-builder .rule-value-container label {
   margin-bottom: 0;
   font-weight: normal;
 }
-.query-builder .rule-container .rule-value-container label.block {
+.query-builder .rule-value-container label.block {
   display: block;
 }
-.query-builder .rule-container select, .query-builder .rule-container input[type=text], .query-builder .rule-container input[type=number] {
+.query-builder .rule-value-container select, .query-builder .rule-value-container input[type=text], .query-builder .rule-value-container input[type=number] {
   padding: 1px;
 }
 .query-builder .error-container {
@@ -64,7 +68,7 @@
 .query-builder .has-error .error-container {
   display: inline-block !important;
 }
-.query-builder .rules-list > *:before, .query-builder .rules-list > *:after {
+.query-builder .rules-list > *::before, .query-builder .rules-list > *::after {
   content: '';
   position: absolute;
   left: -10px;
@@ -73,37 +77,37 @@
   border-color: #222;
   border-style: solid;
 }
-.query-builder .rules-list > *:before {
+.query-builder .rules-list > *::before {
   top: -4px;
   border-width: 0 0 2px 2px;
 }
-.query-builder .rules-list > *:after {
+.query-builder .rules-list > *::after {
   top: 50%;
   border-width: 0 0 0 2px;
 }
-.query-builder .rules-list > *:first-child:before {
+.query-builder .rules-list > *:first-child::before {
   top: -12px;
   height: calc(50% + 14px);
 }
-.query-builder .rules-list > *:last-child:before {
+.query-builder .rules-list > *:last-child::before {
   border-radius: 0 0 0 4px;
 }
-.query-builder .rules-list > *:last-child:after {
+.query-builder .rules-list > *:last-child::after {
   display: none;
 }
 
 .query-builder .error-container + .tooltip .tooltip-inner {
   color: #F22 !important;
 }
 
-.query-builder p.filter-description {
+.query-builder .filter-description {
   margin: 5px 0 0 0;
   background: rgba(0, 170, 255, 0.2);
   border: 1px solid #346F7B;
   color: #AAD1E4;
   border-radius: 5px;
   padding: 2.5px 5px;
-  font-size: 0.8em;
+  font-size: .8em;
 }
 
 .query-builder .rules-group-header [data-invert] {
@@ -116,9 +120,9 @@
   margin-left: 5px;
 }
 .query-builder .dragged {
-  opacity: 0.5;
+  opacity: .5;
 }
 .query-builder .rule-placeholder {
   border: 1px dashed #BBB;
-  opacity: 0.7;
+  opacity: .7;
 }

dist/css/query-builder.default.css

@@ -1,6 +1,6 @@
 /*!
- * jQuery QueryBuilder 2.3.0
- * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * jQuery QueryBuilder 2.3.1
+ * Copyright 2014-2016 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
 
@@ -27,29 +27,33 @@
   border: 1px solid #DCC896;
   background: rgba(250, 240, 210, 0.5);
 }
-.query-builder .rules-group-container .rules-group-header {
+.query-builder .rules-group-header {
   margin-bottom: 10px;
 }
-.query-builder .rules-group-container .rules-group-header input[name$=_cond] {
+.query-builder .rules-group-header .group-conditions .btn.disabled:not(.active),
+.query-builder .rules-group-header .group-conditions input[name$=_cond] {
   display: none;
 }
-.query-builder .rules-group-container .rules-list {
+.query-builder .rules-group-header .group-conditions .btn.disabled {
+  border-radius: 3px;
+}
+.query-builder .rules-list {
   list-style: none;
   padding: 0 0 0 15px;
   margin: 0;
 }
-.query-builder .rule-container .rule-value-container {
-  border-left: 1px solid #ddd;
+.query-builder .rule-value-container {
+  border-left: 1px solid #DDD;
   padding-left: 5px;
 }
-.query-builder .rule-container .rule-value-container label {
+.query-builder .rule-value-container label {
   margin-bottom: 0;
   font-weight: normal;
 }
-.query-builder .rule-container .rule-value-container label.block {
+.query-builder .rule-value-container label.block {
   display: block;
 }
-.query-builder .rule-container select, .query-builder .rule-container input[type=text], .query-builder .rule-container input[type=number] {
+.query-builder .rule-value-container select, .query-builder .rule-value-container input[type=text], .query-builder .rule-value-container input[type=number] {
   padding: 1px;
 }
 .query-builder .error-container {
@@ -64,7 +68,7 @@
 .query-builder .has-error .error-container {
   display: inline-block !important;
 }
-.query-builder .rules-list > *:before, .query-builder .rules-list > *:after {
+.query-builder .rules-list > *::before, .query-builder .rules-list > *::after {
   content: '';
   position: absolute;
   left: -10px;
@@ -73,37 +77,37 @@
   border-color: #CCC;
   border-style: solid;
 }
-.query-builder .rules-list > *:before {
+.query-builder .rules-list > *::before {
   top: -4px;
   border-width: 0 0 2px 2px;
 }
-.query-builder .rules-list > *:after {
+.query-builder .rules-list > *::after {
   top: 50%;
   border-width: 0 0 0 2px;
 }
-.query-builder .rules-list > *:first-child:before {
+.query-builder .rules-list > *:first-child::before {
   top: -12px;
   height: calc(50% + 14px);
 }
-.query-builder .rules-list > *:last-child:before {
+.query-builder .rules-list > *:last-child::before {
   border-radius: 0 0 0 4px;
 }
-.query-builder .rules-list > *:last-child:after {
+.query-builder .rules-list > *:last-child::after {
   display: none;
 }
 
 .query-builder .error-container + .tooltip .tooltip-inner {
   color: #F99 !important;
 }
 
-.query-builder p.filter-description {
+.query-builder .filter-description {
   margin: 5px 0 0 0;
   background: #D9EDF7;
   border: 1px solid #BCE8F1;
   color: #31708F;
   border-radius: 5px;
   padding: 2.5px 5px;
-  font-size: 0.8em;
+  font-size: .8em;
 }
 
 .query-builder .rules-group-header [data-invert] {
@@ -116,9 +120,9 @@
   margin-left: 5px;
 }
 .query-builder .dragged {
-  opacity: 0.5;
+  opacity: .5;
 }
 .query-builder .rule-placeholder {
   border: 1px dashed #BBB;
-  opacity: 0.7;
+  opacity: .7;
 }