Skip to content

Added indeterminate state support #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ogeid-dev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added indeterminate state support #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28c478
Added indeterminate state support
ogeid-dev Jun 21, 2018
a283b5f
Added indeterminate state support
ogeid-dev Jun 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions css/bootstrap-toggle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
.toggle.off .toggle-group {
left: -100%;
}
.toggle.indeterminate .toggle-group {
left: -50%;
}
.toggle-on {
position: absolute;
top: 0;
Expand Down
79 changes: 68 additions & 11 deletions js/bootstrap-toggle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
size: 'normal',
style: '',
width: null,
height: null
height: null,
indeterminate: false
}

Toggle.prototype.defaults = function() {
Expand All @@ -41,7 +42,8 @@
size: this.$element.attr('data-size') || Toggle.DEFAULTS.size,
style: this.$element.attr('data-style') || Toggle.DEFAULTS.style,
width: this.$element.attr('data-width') || Toggle.DEFAULTS.width,
height: this.$element.attr('data-height') || Toggle.DEFAULTS.height
height: this.$element.attr('data-height') || Toggle.DEFAULTS.height,
indeterminate: this.$element.data('indeterminate') || Toggle.DEFAULTS.indeterminate
}
}

Expand All @@ -62,6 +64,7 @@
.append($toggleOn, $toggleOff, $toggleHandle)
var $toggle = $('<div class="toggle btn" data-toggle="toggle">')
.addClass( this.$element.prop('checked') ? this._onstyle : this._offstyle+' off' )
.addClass( this.$element.prop('indeterminate') ? 'indeterminate' : '' )
.addClass(size).addClass(this.options.style)

this.$element.wrap($toggle)
Expand All @@ -87,21 +90,57 @@
}

Toggle.prototype.toggle = function () {
if (this.$element.prop('checked')) this.off()
else this.on()
if (this.options.indeterminate)
{
if (this.$element.prop('checked'))
{
if (this.$element.prop('indeterminate'))
{
this.on();
}
else {
this.off();
}
}
else{
this.indeterminate();
}
}
else
{
if (this.$element.prop('checked')) this.off()
else this.on()
}
}

Toggle.prototype.on = function (silent) {
if (this.$element.prop('disabled')) return false
this.$toggle.removeClass(this._offstyle + ' off').addClass(this._onstyle)
this.$element.prop('checked', true)
this.$toggle.removeClass(this._offstyle + ' off')
.addClass(this._onstyle)
.removeClass('indeterminate');
this.$element.prop('checked', true);
this.$element.prop('indeterminate', false);
if (!silent) this.trigger()
}

Toggle.prototype.off = function (silent) {
if (this.$element.prop('disabled')) return false
this.$toggle.removeClass(this._onstyle).addClass(this._offstyle + ' off')
this.$toggle.removeClass(this._onstyle)
.addClass(this._offstyle + ' off')
.removeClass('indeterminate');
this.$element.prop('checked', false)
this.$element.prop('indeterminate', false);
if (!silent) this.trigger()
}

Toggle.prototype.indeterminate = function (silent) {
if (this.$element.prop('disabled')) return false
this.$toggle.addClass('indeterminate')
.removeClass('off')
.removeClass(this._onstyle)
.addClass(this._offstyle);
this.$element.prop('checked', true);
this.$element.prop('indeterminate', true);
if (!silent) this.trigger()
}

Expand All @@ -116,10 +155,28 @@
}

Toggle.prototype.update = function (silent) {
if (this.$element.prop('disabled')) this.disable()
else this.enable()
if (this.$element.prop('checked')) this.on(silent)
else this.off(silent)
if (this.options.indeterminate)
{
if (this.$element.prop('disabled')) this.disable()
else this.enable()
if (this.$element.prop('indeterminate'))
{
this.indeterminate(silent)
}
else
{
if (this.$element.prop('checked')) this.on(silent)
else this.off(silent)
}

}
else
{
if (this.$element.prop('disabled')) this.disable()
else this.enable()
if (this.$element.prop('checked')) this.on(silent)
else this.off(silent)
}
}

Toggle.prototype.trigger = function (silent) {
Expand Down