diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/BootstrapCheckBoxPickerConfig.java b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/BootstrapCheckBoxPickerConfig.java
index 782af819a..4dec7f250 100644
--- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/BootstrapCheckBoxPickerConfig.java
+++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/BootstrapCheckBoxPickerConfig.java
@@ -1,6 +1,9 @@
 package de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstrapcheckbox;
 
+import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.ICssClassNameProvider;
 import de.agilecoders.wicket.core.markup.html.bootstrap.button.ButtonGroup;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons.Orientation;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons.Type;
 import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
 import de.agilecoders.wicket.jquery.AbstractConfig;
 import de.agilecoders.wicket.jquery.IKey;
@@ -11,65 +14,174 @@
  */
 public class BootstrapCheckBoxPickerConfig extends AbstractConfig {
 
-    private static final IKey<String> Style = newKey("style", null);
-    private static final IKey<String> DefaultClass = newKey("defaultClass", "btn-secondary");
-    private static final IKey<String> DisabledCursor = newKey("disabledCursor", "not-allowed");
-    private static final IKey<String> OffClass = newKey("offClass", "btn-danger");
-    private static final IKey<String> OnClass = newKey("onClass", "btn-success");
-    private static final IKey<IconType> OffIconCLass = newKey("offIconClass", null);
-    private static final IKey<IconType> OnIconCLass = newKey("onIconClass", null);
-    private static final IKey<Boolean> Reverse = newKey("reverse", false);
-    private static final IKey<String[]> ToggleKeyCodes = newKey("toggleKeyCodes", null);
+    private static final IKey<String> 	BaseGroupCls = 		newKey("baseGroupCls", "btn-group");
+    private static final IKey<String> 	BaseCls = 			newKey("baseCls", "btn");
+    private static final IKey<String> 	GroupCls = 			newKey("groupCls", null);
+    private static final IKey<String> 	Cls = 				newKey("cls", null);
+    private static final IKey<String> 	OffCls = 			newKey("offCls", "btn-default");
+    private static final IKey<String> 	OnCls = 			newKey("onCls", "btn-default");
+    private static final IKey<String> 	OffActiveCls = 		newKey("offActiveCls", "btn-danger");
+    private static final IKey<String> 	OnActiveCls = 		newKey("onActiveCls", "btn-success");
+    private static final IKey<String> 	OffLabel= 			newKey("offLabel", "No");
+    private static final IKey<String> 	OnLabel= 			newKey("onLabel", "Yes");
+    private static final IKey<String> 	DisabledCursor = 	newKey("disabledCursor", "not-allowed");
+    private static final IKey<Boolean>	Html = 				newKey("html", false);
+    private static final IKey<String> 	IconCls= 			newKey("iconCls", "glyphicon");
+    private static final IKey<IconType> OffIconCls = 		newKey("offIconCls", null);
+    private static final IKey<IconType> OnIconCls = 		newKey("onIconCls", null);
+    private static final IKey<String> 	OffTitle = 			newKey("offTitle", null);
+    private static final IKey<String> 	OnTitle = 			newKey("onTitle", null);
+    private static final IKey<Boolean> 	SwitchAlways = 		newKey("switchAlways", false);
+    private static final IKey<Boolean> 	Reverse = 			newKey("reverse", false);
+    private static final IKey<String[]> ToggleKeyCodes = 	newKey("toggleKeyCodes", new String[] {"13", "32"});
+    private static final IKey<String> 	WarningMessage = 	newKey("warningMessage", "Please do not use bootstrap-checkbox element in label element.");
 
     /**
      * Default constructor
      */
     public BootstrapCheckBoxPickerConfig() {
-        withDefaultClass("btn-light");
+    }
+    
+    public BootstrapCheckBoxPickerConfig withBaseGroupCls(final Orientation value) {
+    	put(BaseGroupCls, cssClassOrNull(value));
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withBaseCls(final String value) {
+    	put(BaseCls, value);
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withGroupCls(final ButtonGroup.Size value) {
+    	put(GroupCls, cssClassOrNull(value));
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withCls(final String value) {
+    	put(Cls, value);
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withOffCls(final Type value) {
+    	put(OffCls, cssClassOrNull(value));
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withOnCls(final Type value) {
+    	put(OnCls, cssClassOrNull(value));
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withOffActiveCls(final Type value) {
+    	put(OffActiveCls, cssClassOrNull(value));
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withOnActiveCls(final Type value) {
+    	put(OnActiveCls, cssClassOrNull(value));
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withOffLabel(final String value) {
+    	put(OffLabel, value);
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withOnLabel(final String value) {
+    	put(OnLabel, value);
+    	return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withDisabledCursor(final String value) {
+        put(DisabledCursor, value);
+        return this;
+    }
+    public BootstrapCheckBoxPickerConfig withHtml(final boolean value) {
+    	put(Html, value);
+    	return this;
+    }
+    public BootstrapCheckBoxPickerConfig withIconCls(final String value) {
+    	put(IconCls, value);
+    	return this;
+    }
+    public BootstrapCheckBoxPickerConfig withOffIconCls(final IconType value) {
+    	put(OffIconCls, value);
+    	return this;
+    }
+    public BootstrapCheckBoxPickerConfig withOnIconCls(final IconType value) {
+    	put(OnIconCls, value);
+    	return this;
     }
 
-    public BootstrapCheckBoxPickerConfig withDefaultClass(final String value) {
-        put(DefaultClass, value);
+    public BootstrapCheckBoxPickerConfig withSwitchAlwaysOffTitle(final boolean value) {
+        put(SwitchAlways, value);
+        return this;
+    }
+    
+    public BootstrapCheckBoxPickerConfig withReverse(final boolean value) {
+    	put(Reverse, value);
+    	return this;
+    }
+
+    public BootstrapCheckBoxPickerConfig withToggleKeyCodes(final String[] value) {
+        put(ToggleKeyCodes, value);
         return this;
     }
+    public BootstrapCheckBoxPickerConfig withOffTitle(final String value) {
+    	put(OffTitle, value);
+    	return this;
+    }
+    public BootstrapCheckBoxPickerConfig withOnTitle(final String value) {
+    	put(OnTitle, value);
+    	return this;
+    }
+    public BootstrapCheckBoxPickerConfig withWarningMessage(final String value) {
+    	put(WarningMessage, value);
+    	return this;
+    }
+    
+    // ****************************************************
+	// * Old v1.x methods, used for backwards compatibility
+	// ****************************************************
+    
 
-    public BootstrapCheckBoxPickerConfig withDisabledCursor(final String value) {
-        put(DisabledCursor, value);
+    @Deprecated
+    public BootstrapCheckBoxPickerConfig withDefaultClass(final String value) {
+        put(Cls, value);
         return this;
     }
 
+    @Deprecated
     public BootstrapCheckBoxPickerConfig withOffClass(final String value) {
-        put(OffClass, value);
+        put(OffCls, value);
         return this;
     }
 
+    @Deprecated
     public BootstrapCheckBoxPickerConfig withOnClass(final String value) {
-        put(OnClass, value);
+        put(OnCls, value);
         return this;
     }
 
+    @Deprecated
     public BootstrapCheckBoxPickerConfig withOffIcon(final IconType value) {
-        put(OffIconCLass, value);
-        return this;
+        return withOffIconCls(value);
     }
 
+    @Deprecated
     public BootstrapCheckBoxPickerConfig withOnIcon(final IconType value) {
-        put(OnIconCLass, value);
-        return this;
+    	return withOnIconCls(value);
     }
 
+    @Deprecated
     public BootstrapCheckBoxPickerConfig withStyle(final ButtonGroup.Size value) {
-        put(Style, value.cssClassName());
-        return this;
-    }
-
-    public BootstrapCheckBoxPickerConfig withReverse(final boolean value) {
-        put(Reverse, value);
-        return this;
+    	return withGroupCls(value);
     }
 
-    public BootstrapCheckBoxPickerConfig withToggleKeyCodes(final String[] value) {
-        put(ToggleKeyCodes, value);
-        return this;
+    private String cssClassOrNull(ICssClassNameProvider provider) {
+    	if(provider == null)
+    		return null;
+    	
+    	return provider.cssClassName();
     }
 }
diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.js b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.js
index 3b6467f2a..a2dcfa8b4 100644
--- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.js
+++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.js
@@ -1,112 +1,104 @@
-/*!
- * Bootstrap-checkbox v1.2.8 (http://vsn4ik.github.io/bootstrap-checkbox)
- * Copyright 2013-2015 Vasily A. (https://github.com/vsn4ik)
- * Licensed under the MIT license
- */
-
-/**
- * $.inArray: friends with IE8. Use Array.prototype.indexOf in future.
- * Use this.element.hidden in future.
- * $.proxy: friends with IE8. Use Function.prototype.bind in future.
- */
-
-'use strict';
-
-(function(factory) {
-  if (typeof define == 'function' && define.amd) {
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module
     define(['jquery'], factory);
-  }
-  else if (typeof exports == 'object') {
+  } else if (typeof exports === 'object') {
     // Node/CommonJS
     module.exports = factory(require('jquery'));
-  }
-  else {
+  } else {
     // Browser globals
     factory(jQuery);
   }
-})(function($) {
-  $.create = function() {
-    return $($.map(arguments, function(tagName) {
-      return document.createElement(tagName);
-    }));
-  };
+})(function ($) {
+  function create() {
+    return $($.map(arguments, $.proxy(document, 'createElement')));
+  }
 
-  function Checkboxpicker(element, options) {
-    this.element = element;
-    this.$element = $(element);
+  var Checkboxpicker =
+  /*#__PURE__*/
+  function () {
+    function Checkboxpicker(element, options) {
+      this.element = element;
+      this.$element = $(element);
+      var data = this.$element.data(); // <... data-reverse>
 
-    this.options = $.extend({}, $.fn.checkboxpicker.defaults, options, this.$element.data());
+      if (data.reverse === '') {
+        data.reverse = true;
+      } // <... data-switch-always>
 
-    if (this.$element.closest('label').length) {
-      console.warn(this.options.warningMessage);
 
-      return;
-    }
+      if (data.switchAlways === '') {
+        data.switchAlways = true;
+      } // <... data-html>
 
-    this.$group = $.create('div').addClass('btn-group');
 
-    // .btn-group-justified works with <a> elements as the <button> doesn't pick up the styles
-    this.$buttons = $.create('a', 'a').addClass('btn');
+      if (data.html === '') {
+        data.html = true;
+      }
 
-    // === '': <... data-reverse>
-    var reverse = this.options.reverse || this.options.reverse === '';
+      this.options = $.extend({}, $.fn.checkboxpicker.defaults, options, data);
 
-    this.$off = this.$buttons.eq(reverse ? 1 : 0);
-    this.$on = this.$buttons.eq(reverse ? 0 : 1);
+      if (this.$element.closest('label').length) {
+        console.warn(this.options.warningMessage);
+        return;
+      }
 
-    this.init();
-  }
+      this.$group = $(document.createElement('div'));
+      this.$buttons = create('button', 'button').attr('type', 'button').attr('tabindex', -1);
+      this.$off = this.$buttons.eq(this.options.reverse ? 1 : 0);
+      this.$on = this.$buttons.eq(this.options.reverse ? 0 : 1);
+      this.init();
+    }
+
+    var _proto = Checkboxpicker.prototype;
 
-  Checkboxpicker.prototype = {
-    init: function() {
-      this.$element.addClass('hidden');
+    _proto.init = function init() {
+      var fn = this.options.html ? 'html' : 'text';
+      this.element.hidden = true;
+      this.$group.addClass(this.options.baseGroupCls).addClass(this.options.groupCls);
+      this.$buttons.addClass(this.options.baseCls).addClass(this.options.cls);
 
       if (this.options.offLabel) {
-        this.$off.text(this.options.offLabel);
+        this.$off[fn](this.options.offLabel);
       }
 
       if (this.options.onLabel) {
-        this.$on.text(this.options.onLabel);
+        this.$on[fn](this.options.onLabel);
       }
 
-      if (this.options.offIconClass) {
+      if (this.options.offIconCls) {
         if (this.options.offLabel) {
           // &nbsp; -- whitespace (or wrap into span)
           this.$off.prepend('&nbsp;');
-        }
+        } // $.addClass for XSS check
+
 
-        // $.addClass for XSS check
-        $.create('span').addClass(this.options.offIconClass).prependTo(this.$off);
+        create('span').addClass(this.options.iconCls).addClass(this.options.offIconCls).prependTo(this.$off);
       }
 
-      if (this.options.onIconClass) {
+      if (this.options.onIconCls) {
         if (this.options.onLabel) {
           // &nbsp; -- whitespace (or wrap into span)
           this.$on.prepend('&nbsp;');
-        }
+        } // $.addClass for XSS check
 
-        // $.addClass for XSS check
-        $.create('span').addClass(this.options.onIconClass).prependTo(this.$on);
-      }
 
-      if (this.element.checked) {
-        this.$on.addClass('active ' + this.options.onClass);
-        this.$off.addClass(this.options.defaultClass);
-      }
-      else {
-        this.$off.addClass('active ' + this.options.offClass);
-        this.$on.addClass(this.options.defaultClass);
+        create('span').addClass(this.options.iconCls).addClass(this.options.onIconCls).prependTo(this.$on);
       }
 
-      if (this.options.style) {
-        this.$group.addClass(this.options.style);
+      if (this.element.checked) {
+        this.$on.addClass('active');
+        this.$on.addClass(this.options.onActiveCls);
+        this.$off.addClass(this.options.offCls);
+      } else {
+        this.$off.addClass('active');
+        this.$off.addClass(this.options.offActiveCls);
+        this.$on.addClass(this.options.onCls);
       }
 
       if (this.element.title) {
         this.$group.attr('title', this.element.title);
-      }
-      else {
+      } else {
         // Attribute title (offTitle, onTitle) on this.$buttons not work (native) if this.element.disabled, fine!
         if (this.options.offTitle) {
           this.$off.attr('title', this.options.offTitle);
@@ -115,99 +107,100 @@
         if (this.options.onTitle) {
           this.$on.attr('title', this.options.onTitle);
         }
-      }
+      } // Keydown event only trigger if set tabindex, fine!
 
-      // Keydown event only trigger if set tabindex, fine!
-      this.$group.on('keydown', $.proxy(this.keydown, this));
 
-      // Don't trigger if <a> element has .disabled class, fine!
-      this.$group.on('click', 'a:not(.active)', $.proxy(this.click, this));
+      this.$group.on('keydown', $.proxy(this, 'keydown')); // Don't trigger if <a> element has .disabled class, fine!
 
-      this.$element.on('change', $.proxy(this.toggle_checked, this));
-      $(this.element.labels).on('click', $.proxy(this.focus, this));
-      $(this.element.form).on('reset', $.proxy(this.reset, this));
+      this.$buttons.on('click', $.proxy(this, 'click'));
+      this.$element.on('change', $.proxy(this, 'toggleChecked'));
+      $(this.element.labels).on('click', $.proxy(this, 'focus'));
+      $(this.element.form).on('reset', $.proxy(this, 'reset'));
+      this.$group.append(this.$buttons).insertAfter(this.element); // Necessarily after this.$group.append() (autofocus)
 
-      this.$group.append(this.$buttons).insertAfter(this.element);
-
-      // Necessarily after this.$group.append() (autofocus)
-      if (this.element.disabled) {
-        this.$buttons.addClass('disabled');
-
-        if (this.options.disabledCursor) {
-          this.$group.css('cursor', this.options.disabledCursor);
-        }
-      }
-      else {
+      if (this.element.readOnly || this.element.disabled) {
+        this.$buttons.prop('disabled', true);
+      } else {
         this.$group.attr('tabindex', this.element.tabIndex);
 
         if (this.element.autofocus) {
           this.focus();
         }
       }
-    },
-    toggle_checked: function() {
+    };
+
+    _proto.toggleChecked = function toggleChecked() {
       // this.$group not focus (incorrect on form reset)
-      this.$buttons.toggleClass('active ' + this.options.defaultClass);
-      this.$off.toggleClass(this.options.offClass);
-      this.$on.toggleClass(this.options.onClass);
-    },
-    toggle_disabled: function() {
+      this.$buttons.toggleClass('active');
+      this.$off.toggleClass(this.options.offCls);
+      this.$off.toggleClass(this.options.offActiveCls);
+      this.$on.toggleClass(this.options.onCls);
+      this.$on.toggleClass(this.options.onActiveCls);
+    };
+
+    _proto.toggleDisabled = function toggleDisabled() {
       this.$buttons.toggleClass('disabled');
 
       if (this.element.disabled) {
         this.$group.attr('tabindex', this.element.tabIndex);
-        this.$group.css('cursor', '');
-      }
-      else {
+      } else {
         this.$group.removeAttr('tabindex');
-
-        if (this.options.disabledCursor) {
-          this.$group.css('cursor', this.options.disabledCursor);
-        }
       }
-    },
-    focus: function() {
+    };
+
+    _proto.focus = function focus() {
       // Original behavior
       this.$group.trigger('focus');
-    },
-    click: function() {
-      this.change(!this.element.checked);
-    },
-    change: function(value) {
+    };
+
+    _proto.click = function click(event) {
+      // Strictly event.currentTarget. Fix #19
+      var $button = $(event.currentTarget);
+
+      if (!$button.hasClass('active') || this.options.switchAlways) {
+        this.change();
+      }
+    };
+
+    _proto.change = function change() {
+      this.set(!this.element.checked);
+    };
+
+    _proto.set = function set(value) {
       // Fix #12
       this.element.checked = value;
-
       this.$element.trigger('change');
-    },
-    keydown: function(event) {
-      if ($.inArray(event.keyCode, this.options.toggleKeyCodes) != -1) {
+    };
+
+    _proto.keydown = function keydown(event) {
+      if ($.inArray(event.keyCode, this.options.toggleKeyCodes) !== -1) {
         // Off vertical scrolling on Spacebar
         event.preventDefault();
-
-        this.click();
-      }
-      else if (event.keyCode == 13) {
+        this.change();
+      } else if (event.keyCode === 13) {
         $(this.element.form).trigger('submit');
       }
-    },
-    reset: function() {
+    };
+
+    _proto.reset = function reset() {
       // this.element.checked not used (incorect on large number of form elements)
-      if ((this.element.defaultChecked && this.$off.hasClass('active')) || (!this.element.defaultChecked && this.$on.hasClass('active'))) {
-        this.change(this.element.defaultChecked);
+      if (this.element.defaultChecked && this.$off.hasClass('active') || !this.element.defaultChecked && this.$on.hasClass('active')) {
+        this.set(this.element.defaultChecked);
       }
-    }
-  };
+    };
+
+    return Checkboxpicker;
+  }(); // Be hooks friendly
 
-  // Be hooks friendly
-  var oldPropHooks = $.extend({}, $.propHooks);
 
-  // Support $.fn.prop setter (checked, disabled)
+  var oldPropHooks = $.extend({}, $.propHooks); // Support $.fn.prop setter (checked, disabled)
+
   $.extend($.propHooks, {
     checked: {
-      set: function(element, value) {
+      set: function set(element, value) {
         var data = $.data(element, 'bs.checkbox');
 
-        if (data && element.checked != value) {
+        if (data && element.checked !== value) {
           data.change(value);
         }
 
@@ -217,11 +210,11 @@
       }
     },
     disabled: {
-      set: function(element, value) {
+      set: function set(element, value) {
         var data = $.data(element, 'bs.checkbox');
 
-        if (data && element.disabled != value) {
-          data.toggle_disabled();
+        if (data && element.disabled !== value) {
+          data.toggleDisabled();
         }
 
         if (oldPropHooks.disabled && oldPropHooks.disabled.set) {
@@ -229,54 +222,51 @@
         }
       }
     }
-  });
-
-  // For AMD/Node/CommonJS used elements (optional)
+  }); // For AMD/Node/CommonJS used elements (optional)
   // http://learn.jquery.com/jquery-ui/environments/amd/
-  $.fn.checkboxpicker = function(options, elements) {
+
+  $.fn.checkboxpicker = function (options, elements) {
     var $elements;
 
     if (this instanceof $) {
       $elements = this;
-    }
-    else if (typeof options == 'string') {
+    } else if (typeof options === 'string') {
       $elements = $(options);
-    }
-    else {
+    } else {
       $elements = $(elements);
     }
 
-    return $elements.each(function() {
+    return $elements.each(function () {
       var data = $.data(this, 'bs.checkbox');
 
       if (!data) {
         data = new Checkboxpicker(this, options);
-
         $.data(this, 'bs.checkbox', data);
       }
     });
-  };
+  }; // HTML5 data-*.
+  // <input data-on-label="43"> --> $('input').data('onLabel') === '43'.
+
 
-  // HTML5 data-*.
-  // <input data-on-label="43"> --> $('input').data('onLabel') == '43'.
   $.fn.checkboxpicker.defaults = {
-    style: false,
-    defaultClass: 'btn-default',
-    disabledCursor: 'not-allowed',
-    offClass: 'btn-danger',
-    onClass: 'btn-success',
+    baseGroupCls: 'btn-group',
+    baseCls: 'btn',
+    groupCls: null,
+    cls: null,
+    offCls: 'btn-default',
+    onCls: 'btn-default',
+    offActiveCls: 'btn-danger',
+    onActiveCls: 'btn-success',
     offLabel: 'No',
     onLabel: 'Yes',
     offTitle: false,
     onTitle: false,
-
+    iconCls: 'glyphicon',
     // Event key codes:
     // 13: Return
     // 32: Spacebar
     toggleKeyCodes: [13, 32],
-
     warningMessage: 'Please do not use Bootstrap-checkbox element in label element.'
   };
-
-  return $.fn.checkboxpicker;
-});
+  return Checkboxpicker;
+});
\ No newline at end of file
diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.min.js b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.min.js
index 0f50f0e1f..3da77a9b4 100644
--- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.min.js
+++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/form/checkbox/bootstrapcheckbox/js/bootstrap-checkbox.min.js
@@ -1,7 +1 @@
-/*!
- * Bootstrap-checkbox v1.2.8 (http://vsn4ik.github.io/bootstrap-checkbox)
- * Copyright 2013-2015 Vasily A. (https://github.com/vsn4ik)
- * Licensed under the MIT license
- */
-
-"use strict";!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){function b(b,c){if(this.element=b,this.$element=a(b),this.options=a.extend({},a.fn.checkboxpicker.defaults,c,this.$element.data()),this.$element.closest("label").length)return void console.warn(this.options.warningMessage);this.$group=a.create("div").addClass("btn-group"),this.$buttons=a.create("a","a").addClass("btn");var d=this.options.reverse||""===this.options.reverse;this.$off=this.$buttons.eq(d?1:0),this.$on=this.$buttons.eq(d?0:1),this.init()}a.create=function(){return a(a.map(arguments,function(a){return document.createElement(a)}))},b.prototype={init:function(){this.$element.addClass("hidden"),this.options.offLabel&&this.$off.text(this.options.offLabel),this.options.onLabel&&this.$on.text(this.options.onLabel),this.options.offIconClass&&(this.options.offLabel&&this.$off.prepend("&nbsp;"),a.create("span").addClass(this.options.offIconClass).prependTo(this.$off)),this.options.onIconClass&&(this.options.onLabel&&this.$on.prepend("&nbsp;"),a.create("span").addClass(this.options.onIconClass).prependTo(this.$on)),this.element.checked?(this.$on.addClass("active "+this.options.onClass),this.$off.addClass(this.options.defaultClass)):(this.$off.addClass("active "+this.options.offClass),this.$on.addClass(this.options.defaultClass)),this.options.style&&this.$group.addClass(this.options.style),this.element.title?this.$group.attr("title",this.element.title):(this.options.offTitle&&this.$off.attr("title",this.options.offTitle),this.options.onTitle&&this.$on.attr("title",this.options.onTitle)),this.$group.on("keydown",a.proxy(this.keydown,this)),this.$group.on("click","a:not(.active)",a.proxy(this.click,this)),this.$element.on("change",a.proxy(this.toggle_checked,this)),a(this.element.labels).on("click",a.proxy(this.focus,this)),a(this.element.form).on("reset",a.proxy(this.reset,this)),this.$group.append(this.$buttons).insertAfter(this.element),this.element.disabled?(this.$buttons.addClass("disabled"),this.options.disabledCursor&&this.$group.css("cursor",this.options.disabledCursor)):(this.$group.attr("tabindex",this.element.tabIndex),this.element.autofocus&&this.focus())},toggle_checked:function(){this.$buttons.toggleClass("active "+this.options.defaultClass),this.$off.toggleClass(this.options.offClass),this.$on.toggleClass(this.options.onClass)},toggle_disabled:function(){this.$buttons.toggleClass("disabled"),this.element.disabled?(this.$group.attr("tabindex",this.element.tabIndex),this.$group.css("cursor","")):(this.$group.removeAttr("tabindex"),this.options.disabledCursor&&this.$group.css("cursor",this.options.disabledCursor))},focus:function(){this.$group.trigger("focus")},click:function(){this.change(!this.element.checked)},change:function(a){this.element.checked=a,this.$element.trigger("change")},keydown:function(b){-1!=a.inArray(b.keyCode,this.options.toggleKeyCodes)?(b.preventDefault(),this.click()):13==b.keyCode&&a(this.element.form).trigger("submit")},reset:function(){(this.element.defaultChecked&&this.$off.hasClass("active")||!this.element.defaultChecked&&this.$on.hasClass("active"))&&this.change(this.element.defaultChecked)}};var c=a.extend({},a.propHooks);return a.extend(a.propHooks,{checked:{set:function(b,d){var e=a.data(b,"bs.checkbox");e&&b.checked!=d&&e.change(d),c.checked&&c.checked.set&&c.checked.set(b,d)}},disabled:{set:function(b,d){var e=a.data(b,"bs.checkbox");e&&b.disabled!=d&&e.toggle_disabled(),c.disabled&&c.disabled.set&&c.disabled.set(b,d)}}}),a.fn.checkboxpicker=function(c,d){var e;return e=this instanceof a?this:a("string"==typeof c?c:d),e.each(function(){var d=a.data(this,"bs.checkbox");d||(d=new b(this,c),a.data(this,"bs.checkbox",d))})},a.fn.checkboxpicker.defaults={style:!1,defaultClass:"btn-default",disabledCursor:"not-allowed",offClass:"btn-danger",onClass:"btn-success",offLabel:"No",onLabel:"Yes",offTitle:!1,onTitle:!1,toggleKeyCodes:[13,32],warningMessage:"Please do not use Bootstrap-checkbox element in label element."},a.fn.checkboxpicker});
\ No newline at end of file
+!function(factory){"function"==typeof define&&define.amd?define(["jquery"],factory):"object"==typeof exports?module.exports=factory(require("jquery")):factory(jQuery)}((function($){function create(){return $($.map(arguments,$.proxy(document,"createElement")))}var Checkboxpicker=function(){function Checkboxpicker(element,options){this.element=element,this.$element=$(element);var data=this.$element.data();""===data.reverse&&(data.reverse=!0),""===data.switchAlways&&(data.switchAlways=!0),""===data.html&&(data.html=!0),this.options=$.extend({},$.fn.checkboxpicker.defaults,options,data),this.$element.closest("label").length?console.warn(this.options.warningMessage):(this.$group=$(document.createElement("div")),this.$buttons=create("button","button").attr("type","button").attr("tabindex",-1),this.$off=this.$buttons.eq(this.options.reverse?1:0),this.$on=this.$buttons.eq(this.options.reverse?0:1),this.init())}var _proto=Checkboxpicker.prototype;return _proto.init=function(){var fn=this.options.html?"html":"text";this.element.hidden=!0,this.$group.addClass(this.options.baseGroupCls).addClass(this.options.groupCls),this.$buttons.addClass(this.options.baseCls).addClass(this.options.cls),this.options.offLabel&&this.$off[fn](this.options.offLabel),this.options.onLabel&&this.$on[fn](this.options.onLabel),this.options.offIconCls&&(this.options.offLabel&&this.$off.prepend("&nbsp;"),create("span").addClass(this.options.iconCls).addClass(this.options.offIconCls).prependTo(this.$off)),this.options.onIconCls&&(this.options.onLabel&&this.$on.prepend("&nbsp;"),create("span").addClass(this.options.iconCls).addClass(this.options.onIconCls).prependTo(this.$on)),this.element.checked?(this.$on.addClass("active"),this.$on.addClass(this.options.onActiveCls),this.$off.addClass(this.options.offCls)):(this.$off.addClass("active"),this.$off.addClass(this.options.offActiveCls),this.$on.addClass(this.options.onCls)),this.element.title?this.$group.attr("title",this.element.title):(this.options.offTitle&&this.$off.attr("title",this.options.offTitle),this.options.onTitle&&this.$on.attr("title",this.options.onTitle)),this.$group.on("keydown",$.proxy(this,"keydown")),this.$buttons.on("click",$.proxy(this,"click")),this.$element.on("change",$.proxy(this,"toggleChecked")),$(this.element.labels).on("click",$.proxy(this,"focus")),$(this.element.form).on("reset",$.proxy(this,"reset")),this.$group.append(this.$buttons).insertAfter(this.element),this.element.readOnly||this.element.disabled?this.$buttons.prop("disabled",!0):(this.$group.attr("tabindex",this.element.tabIndex),this.element.autofocus&&this.focus())},_proto.toggleChecked=function(){this.$buttons.toggleClass("active"),this.$off.toggleClass(this.options.offCls),this.$off.toggleClass(this.options.offActiveCls),this.$on.toggleClass(this.options.onCls),this.$on.toggleClass(this.options.onActiveCls)},_proto.toggleDisabled=function(){this.$buttons.toggleClass("disabled"),this.element.disabled?this.$group.attr("tabindex",this.element.tabIndex):this.$group.removeAttr("tabindex")},_proto.focus=function(){this.$group.trigger("focus")},_proto.click=function(event){$(event.currentTarget).hasClass("active")&&!this.options.switchAlways||this.change()},_proto.change=function(){this.set(!this.element.checked)},_proto.set=function(value){this.element.checked=value,this.$element.trigger("change")},_proto.keydown=function(event){-1!==$.inArray(event.keyCode,this.options.toggleKeyCodes)?(event.preventDefault(),this.change()):13===event.keyCode&&$(this.element.form).trigger("submit")},_proto.reset=function(){(this.element.defaultChecked&&this.$off.hasClass("active")||!this.element.defaultChecked&&this.$on.hasClass("active"))&&this.set(this.element.defaultChecked)},Checkboxpicker}(),oldPropHooks=$.extend({},$.propHooks);return $.extend($.propHooks,{checked:{set:function(element,value){var data=$.data(element,"bs.checkbox");data&&element.checked!==value&&data.change(value),oldPropHooks.checked&&oldPropHooks.checked.set&&oldPropHooks.checked.set(element,value)}},disabled:{set:function(element,value){var data=$.data(element,"bs.checkbox");data&&element.disabled!==value&&data.toggleDisabled(),oldPropHooks.disabled&&oldPropHooks.disabled.set&&oldPropHooks.disabled.set(element,value)}}}),$.fn.checkboxpicker=function(options,elements){return(this instanceof $?this:$("string"==typeof options?options:elements)).each((function(){var data=$.data(this,"bs.checkbox");data||(data=new Checkboxpicker(this,options),$.data(this,"bs.checkbox",data))}))},$.fn.checkboxpicker.defaults={baseGroupCls:"btn-group",baseCls:"btn",groupCls:null,cls:null,offCls:"btn-default",onCls:"btn-default",offActiveCls:"btn-danger",onActiveCls:"btn-success",offLabel:"No",onLabel:"Yes",offTitle:!1,onTitle:!1,iconCls:"glyphicon",toggleKeyCodes:[13,32],warningMessage:"Please do not use Bootstrap-checkbox element in label element."},Checkboxpicker}));
\ No newline at end of file