Version 2.4.5

mistic100 · Nov 18, 2017 · 1fb5f7e · 1fb5f7e
2 parents 6033da4 + fa0be59
commit 1fb5f7e
Show file tree

Hide file tree

Showing 68 changed files with 675 additions and 234 deletions.
diff --git a/.sass-lint.yml b/.sass-lint.yml
@@ -0,0 +1,9 @@
+rules:
+    property-sort-order: [0]
+    force-pseudo-nesting: [0]
+    force-element-nesting: [0]
+    force-attribute-nesting: [0]
+    no-important: [0]
+    no-qualifying-elements: [0]
+    shorthand-values: [1, {allowed-shorthands: [1, 2, 4]}]
+    hex-notation: [1, {style: uppercase}]
diff --git a/.scss-lint.yml b/.scss-lint.yml
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,6 @@ language: node_js
 node_js:
   - "5"
 before_install:
-  - gem install sass
-  - gem install scss_lint -v 0.49.0
   - npm install -g grunt-cli
   - npm install -g bower
 before_script:

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -6,7 +6,7 @@ var cleanLn = require('./build/cleanLn');
 module.exports = function(grunt) {
     require('time-grunt')(grunt);
     require('jit-grunt')(grunt, {
-        scsslint: 'grunt-scss-lint',
+        sasslint: 'grunt-sass-lint',
         sass_injection: 'grunt-sass-injection',
         usebanner: 'grunt-banner'
     });
@@ -177,7 +177,7 @@ module.exports = function(grunt) {
         wrap: {
             js: {
                 src: ['dist/js/query-builder.js'],
-                dest: '',
+                dest: 'dist/js/query-builder.js',
                 options: {
                     separator: '',
                     wrapper: function() {
@@ -217,8 +217,8 @@ module.exports = function(grunt) {
         // parse scss
         sass: {
             options: {
-                sourcemap: 'none',
-                style: 'expanded'
+                sourceMap: false,
+                outputStyle: 'expanded'
             },
             dist: {
                 files: [{
@@ -293,11 +293,10 @@ module.exports = function(grunt) {
         },
 
         // scss tests
-        scsslint: {
+        sasslint: {
             lib: {
                 options: {
-                    colorizeOutput: true,
-                    config: '.scss-lint.yml'
+                    configFile: '.sass-lint.yml'
                 },
                 src: ['src/**/*.scss']
             }
@@ -410,7 +409,7 @@ module.exports = function(grunt) {
     grunt.registerTask('test', [
         'jshint',
         'jscs',
-        'scsslint',
+        'sasslint',
         'build_lang',
         'build_css',
         'injector:testSrc',

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Bower version](https://img.shields.io/bower/v/jQuery-QueryBuilder.svg?style=flat-square)](http://querybuilder.js.org)
 [![npm version](https://img.shields.io/npm/v/jQuery-QueryBuilder.svg?style=flat-square)](https://www.npmjs.com/package/jQuery-QueryBuilder)
-[![CDN](https://img.shields.io/badge/cdn-jsdelivr-%23EB4C36.svg?style=flat-square)](http://www.jsdelivr.com/projects/jquery.query-builder)
+[![jsDelivr CDN](https://data.jsdelivr.com/v1/package/npm/jQuery-QueryBuilder/badge)](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder)
 [![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)
 
@@ -37,8 +37,7 @@ $ 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/))
-
+jQuery-QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder).
 ### Dependencies
  * jQuery >= 1.10
  * Bootstrap >= 3.1 (CSS only)
@@ -60,10 +59,8 @@ jQuery-QueryBuilder is available on [jsDelivr](https://cdn.jsdelivr.net/npm/jQue
 #### Prerequisites
 
  * NodeJS + NPM: `apt-get install nodejs-legacy npm`
- * Ruby Dev: `apt-get install ruby-dev`
  * Grunt CLI: `npm install -g grunt-cli`
  * Bower: `npm install -g bower`
- * SASS: `gem install sass`
 
 #### Run
 

diff --git a/bower.json b/bower.json
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "jquery": ">=1.9.0",
-    "bootstrap": ">=3.1.0",
+    "bootstrap": ">=3.1.0 <4",
     "moment": ">=2.6.0",
     "jquery-extendext": ">=0.1.2",
     "doT": ">=1.0.3"

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "mistic100/jquery-querybuilder",
-  "version": "2.4.2",
+  "version": "2.4.5",
   "authors": [{
     "name": "Damien \"Mistic\" Sorel",
     "email": "contact@git.strangeplanet.fr",
@@ -11,7 +11,7 @@
     "robloach/component-installer": "*",
     "components/jquery": ">=1.9.0",
     "moment/moment": ">=2.6.0",
-    "components/bootstrap": ">=3.1.0"
+    "components/bootstrap": ">=3.1.0 <4"
   },
   "keywords": [
     "jquery",

diff --git a/dist/css/query-builder.dark.css b/dist/css/query-builder.dark.css
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.4.4
+ * jQuery QueryBuilder 2.4.5
  * Copyright 2014-2017 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
@@ -26,11 +26,13 @@
   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] {
+.query-builder .rules-group-header .group-conditions input[name$='_cond'] {
   border: 0;
   clip: rect(0 0 0 0);
   height: 1px;
@@ -41,40 +43,52 @@
   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] {
+
+.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;
@@ -84,29 +98,35 @@
   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 {
+.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;
@@ -136,14 +156,17 @@
   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