Merge branch 'master' into master

Bttstrp · Apr 13, 2019 · ff80a28 · ff80a28
2 parents 81b69a4 + b93af46
commit ff80a28
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "components/bootstrap-switch",
   "description": "Turn checkboxes and radio buttons into toggle switches.",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "type": "component",
   "keywords": [
     "bootstrap",

diff --git a/dist/css/bootstrap2/bootstrap-switch.css b/dist/css/bootstrap2/bootstrap-switch.css
@@ -1,10 +1,10 @@
 /**
   * bootstrap-switch - Turn checkboxes and radio buttons into toggle switches.
   *
-  * @version v3.3.4
+  * @version v3.3.5
   * @homepage https://bttstrp.github.io/bootstrap-switch
   * @author Mattia Larentis <[email protected]> (http://larentis.eu)
-  * @license Apache-2.0
+  * @license MIT
   */
 
 .clearfix {

diff --git a/dist/css/bootstrap2/bootstrap-switch.min.css b/dist/css/bootstrap2/bootstrap-switch.min.css
diff --git a/dist/css/bootstrap3/bootstrap-switch.css b/dist/css/bootstrap3/bootstrap-switch.css
@@ -1,10 +1,10 @@
 /**
   * bootstrap-switch - Turn checkboxes and radio buttons into toggle switches.
   *
-  * @version v3.3.4
+  * @version v3.3.5
   * @homepage https://bttstrp.github.io/bootstrap-switch
   * @author Mattia Larentis <[email protected]> (http://larentis.eu)
-  * @license Apache-2.0
+  * @license MIT
   */
 
 .bootstrap-switch {

diff --git a/dist/css/bootstrap3/bootstrap-switch.min.css b/dist/css/bootstrap3/bootstrap-switch.min.css
diff --git a/dist/js/bootstrap-switch.js b/dist/js/bootstrap-switch.js
@@ -1,10 +1,10 @@
 /**
   * bootstrap-switch - Turn checkboxes and radio buttons into toggle switches.
   *
-  * @version v3.3.4
+  * @version v3.3.5
   * @homepage https://bttstrp.github.io/bootstrap-switch
   * @author Mattia Larentis <[email protected]> (http://larentis.eu)
-  * @license Apache-2.0
+  * @license MIT
   */
 
 (function (global, factory) {
@@ -393,7 +393,8 @@
           args[_key] = arguments[_key];
         }
 
-        if (_this9.options.onSwitchChange.apply(element, args) === false) {
+        var changeState = _this9.options.onSwitchChange.apply(element, args);
+        if (changeState === false) {
           if (_this9.$element.is(':radio')) {
             $('[name="' + _this9.$element.attr('name') + '"]').trigger('previousState.bootstrapSwitch', true);
           } else {