Version 2.4.4

mistic100 · Jul 10, 2017 · 6033da4 · 6033da4
2 parents ed733d2 + d8fbbaf
commit 6033da4
Show file tree

Hide file tree

Showing 49 changed files with 1,090 additions and 921 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -3,4 +3,4 @@
 - Please search in the [documentation](http://querybuilder.js.org) before asking.
 - Any issue without enough details won't get any answer and will be closed.
 - Help requests must be exhaustive, precise and come with some code explaining the need (use Markdown code highlight).
-- Bug reports must come with a simple test case, preferably on jsFiddle, Plunker, etc. (QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/projects/jquery.query-builder) to be used on such platforms).
+- Bug reports must come with a simple test case, preferably on jsFiddle, Plunker, etc. (QueryBuilder is available on [jsDelivr](https://cdn.jsdelivr.net/npm/jQuery-QueryBuilder/dist/) and [unpkg](https://unpkg.com/jQuery-QueryBuilder/dist/) to be used on such platforms).
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -22,8 +22,8 @@ module.exports = function(grunt) {
             'src/public.js',
             'src/data.js',
             'src/template.js',
-            'src/model.js',
             'src/utils.js',
+            'src/model.js',
             'src/jquery.js'
         ],
         js_files_for_standalone: [

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Damien Sorel
+Copyright (c) 2014-2017 Damien Sorel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -35,6 +35,10 @@ $ bower install jQuery-QueryBuilder
 $ npm install jQuery-QueryBuilder
 ```
 
+#### Via CDN
+
+jQuery-QueryBuilder is available on [jsDelivr](https://cdn.jsdelivr.net/npm/jQuery-QueryBuilder/dist/) and [unpkg](https://unpkg.com/jQuery-QueryBuilder/dist/))
+
 ### Dependencies
  * jQuery >= 1.10
  * Bootstrap >= 3.1 (CSS only)

diff --git a/dist/css/query-builder.dark.css b/dist/css/query-builder.dark.css
@@ -1,150 +1,150 @@
 /*!
- * jQuery QueryBuilder 2.4.3
+ * jQuery QueryBuilder 2.4.4
  * Copyright 2014-2017 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
-.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rule-placeholder {
-  position: relative;
-  margin: 4px 0;
-  border-radius: 5px;
-  padding: 5px;
-  border: 1px solid #111;
-  background: rgba(40, 40, 40, 0.9);
-}
-
-.query-builder .rule-container .rule-filter-container,
-.query-builder .rule-container .rule-operator-container,
-.query-builder .rule-container .rule-value-container, .query-builder .error-container, .query-builder .drag-handle {
-  display: inline-block;
-  margin: 0 5px 0 0;
-  vertical-align: middle;
-}
-
-.query-builder .rules-group-container {
-  padding: 10px;
-  padding-bottom: 6px;
-  border: 1px solid #00164A;
-  background: rgba(50, 70, 80, 0.5);
-}
-.query-builder .rules-group-header {
-  margin-bottom: 10px;
-}
-.query-builder .rules-group-header .group-conditions .btn.readonly:not(.active),
-.query-builder .rules-group-header .group-conditions input[name$=_cond] {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-  white-space: nowrap;
-}
-.query-builder .rules-group-header .group-conditions .btn.readonly {
-  border-radius: 3px;
-}
-.query-builder .rules-list {
-  list-style: none;
-  padding: 0 0 0 15px;
-  margin: 0;
-}
-.query-builder .rule-value-container {
-  border-left: 1px solid #DDD;
-  padding-left: 5px;
-}
-.query-builder .rule-value-container label {
-  margin-bottom: 0;
-  font-weight: normal;
-}
-.query-builder .rule-value-container label.block {
-  display: block;
-}
-.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 {
-  display: none;
-  cursor: help;
-  color: #F00;
-}
-.query-builder .has-error {
-  background-color: #322;
-  border-color: #800;
-}
-.query-builder .has-error .error-container {
-  display: inline-block !important;
-}
-.query-builder .rules-list > *::before, .query-builder .rules-list > *::after {
-  content: '';
-  position: absolute;
-  left: -10px;
-  width: 10px;
-  height: calc(50% + 4px);
-  border-color: #222;
-  border-style: solid;
-}
-.query-builder .rules-list > *::before {
-  top: -4px;
-  border-width: 0 0 2px 2px;
-}
-.query-builder .rules-list > *::after {
-  top: 50%;
-  border-width: 0 0 0 2px;
-}
-.query-builder .rules-list > *:first-child::before {
-  top: -12px;
-  height: calc(50% + 14px);
-}
-.query-builder .rules-list > *:last-child::before {
-  border-radius: 0 0 0 4px;
-}
-.query-builder .rules-list > *:last-child::after {
-  display: none;
-}
-
-.query-builder.bt-checkbox-glyphicons .checkbox input[type=checkbox]:checked + label::after {
-  font-family: 'Glyphicons Halflings';
-  content: '\e013';
-}
-.query-builder.bt-checkbox-glyphicons .checkbox label::after {
-  padding-left: 4px;
-  padding-top: 2px;
-  font-size: 9px;
-}
-
-.query-builder .error-container + .tooltip .tooltip-inner {
-  color: #F22 !important;
-}
-
-.query-builder p.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: .8em;
-}
-
-.query-builder .rules-group-header [data-invert] {
-  margin-left: 5px;
-}
-
-.query-builder .drag-handle {
-  cursor: move;
-  vertical-align: middle;
-  margin-left: 5px;
-}
-.query-builder .dragging {
-  position: fixed;
-  opacity: .5;
-  z-index: 100;
-}
-.query-builder .dragging::before, .query-builder .dragging::after {
-  display: none;
-}
-.query-builder .rule-placeholder {
-  border: 1px dashed #BBB;
-  opacity: .7;
-}
+.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rule-placeholder {
+  position: relative;
+  margin: 4px 0;
+  border-radius: 5px;
+  padding: 5px;
+  border: 1px solid #111;
+  background: rgba(40, 40, 40, 0.9);
+}
+
+.query-builder .rule-container .rule-filter-container,
+.query-builder .rule-container .rule-operator-container,
+.query-builder .rule-container .rule-value-container, .query-builder .error-container, .query-builder .drag-handle {
+  display: inline-block;
+  margin: 0 5px 0 0;
+  vertical-align: middle;
+}
+
+.query-builder .rules-group-container {
+  padding: 10px;
+  padding-bottom: 6px;
+  border: 1px solid #00164A;
+  background: rgba(50, 70, 80, 0.5);
+}
+.query-builder .rules-group-header {
+  margin-bottom: 10px;
+}
+.query-builder .rules-group-header .group-conditions .btn.readonly:not(.active),
+.query-builder .rules-group-header .group-conditions input[name$=_cond] {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+  white-space: nowrap;
+}
+.query-builder .rules-group-header .group-conditions .btn.readonly {
+  border-radius: 3px;
+}
+.query-builder .rules-list {
+  list-style: none;
+  padding: 0 0 0 15px;
+  margin: 0;
+}
+.query-builder .rule-value-container {
+  border-left: 1px solid #DDD;
+  padding-left: 5px;
+}
+.query-builder .rule-value-container label {
+  margin-bottom: 0;
+  font-weight: normal;
+}
+.query-builder .rule-value-container label.block {
+  display: block;
+}
+.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 {
+  display: none;
+  cursor: help;
+  color: #F00;
+}
+.query-builder .has-error {
+  background-color: #322;
+  border-color: #800;
+}
+.query-builder .has-error .error-container {
+  display: inline-block !important;
+}
+.query-builder .rules-list > *::before, .query-builder .rules-list > *::after {
+  content: '';
+  position: absolute;
+  left: -10px;
+  width: 10px;
+  height: calc(50% + 4px);
+  border-color: #222;
+  border-style: solid;
+}
+.query-builder .rules-list > *::before {
+  top: -4px;
+  border-width: 0 0 2px 2px;
+}
+.query-builder .rules-list > *::after {
+  top: 50%;
+  border-width: 0 0 0 2px;
+}
+.query-builder .rules-list > *:first-child::before {
+  top: -12px;
+  height: calc(50% + 14px);
+}
+.query-builder .rules-list > *:last-child::before {
+  border-radius: 0 0 0 4px;
+}
+.query-builder .rules-list > *:last-child::after {
+  display: none;
+}
+
+.query-builder.bt-checkbox-glyphicons .checkbox input[type=checkbox]:checked + label::after {
+  font-family: 'Glyphicons Halflings';
+  content: '\e013';
+}
+.query-builder.bt-checkbox-glyphicons .checkbox label::after {
+  padding-left: 4px;
+  padding-top: 2px;
+  font-size: 9px;
+}
+
+.query-builder .error-container + .tooltip .tooltip-inner {
+  color: #F22 !important;
+}
+
+.query-builder p.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: .8em;
+}
+
+.query-builder .rules-group-header [data-invert] {
+  margin-left: 5px;
+}
+
+.query-builder .drag-handle {
+  cursor: move;
+  vertical-align: middle;
+  margin-left: 5px;
+}
+.query-builder .dragging {
+  position: fixed;
+  opacity: .5;
+  z-index: 100;
+}
+.query-builder .dragging::before, .query-builder .dragging::after {
+  display: none;
+}
+.query-builder .rule-placeholder {
+  border: 1px dashed #BBB;
+  opacity: .7;
+}
diff --git a/dist/css/query-builder.dark.min.css b/dist/css/query-builder.dark.min.css