|
@@ -42,7 +42,7 @@
|
|
|
|
|
|
$element.addClass('has-switch');
|
|
|
|
|
|
- if ($element.data('on'))
|
|
|
+ if ($element.data('on') !== undefined)
|
|
|
color = "switch-" + $element.data('on');
|
|
|
|
|
|
if ($element.data('on-label') !== undefined)
|
|
@@ -64,7 +64,7 @@
|
|
|
.html(onLabel);
|
|
|
|
|
|
color = '';
|
|
|
- if ($element.data('off'))
|
|
|
+ if ($element.data('off') !== undefined)
|
|
|
color = "switch-" + $element.data('off');
|
|
|
|
|
|
$switchRight = $('<span>')
|
|
@@ -186,8 +186,7 @@
|
|
|
|
|
|
$this.on('click touchend', function (e) {
|
|
|
var $this = $(this)
|
|
|
- , $target = $(e.target)
|
|
|
- , $myRadioCheckBox = $target.siblings('input');
|
|
|
+ , $myInputBox = $this.siblings('input');
|
|
|
|
|
|
e.stopImmediatePropagation();
|
|
|
e.preventDefault();
|
|
@@ -195,12 +194,12 @@
|
|
|
$this.unbind('mouseleave');
|
|
|
|
|
|
if (moving)
|
|
|
- $myRadioCheckBox.prop('checked', !(parseInt($this.parent().css('left')) < -25));
|
|
|
+ $myInputBox.prop('checked', !(parseInt($this.parent().css('left')) < -25));
|
|
|
else
|
|
|
- $myRadioCheckBox.prop("checked", !$myRadioCheckBox.is(":checked"));
|
|
|
+ $myInputBox.prop("checked", !$myInputBox.is(":checked"));
|
|
|
|
|
|
moving = false;
|
|
|
- $myRadioCheckBox.trigger('change');
|
|
|
+ $myInputBox.trigger('change');
|
|
|
});
|
|
|
|
|
|
$this.on('mouseleave', function (e) {
|
|
@@ -210,7 +209,7 @@
|
|
|
e.preventDefault();
|
|
|
e.stopImmediatePropagation();
|
|
|
|
|
|
- $this.unbind('mouseleave');
|
|
|
+ $this.unbind('mouseleave mousemove');
|
|
|
$this.trigger('mouseup');
|
|
|
|
|
|
$myInputBox.prop('checked', !(parseInt($this.parent().css('left')) < -25)).trigger('change');
|
|
@@ -220,7 +219,7 @@
|
|
|
e.stopImmediatePropagation();
|
|
|
e.preventDefault();
|
|
|
|
|
|
- $(this).unbind('mousemove');
|
|
|
+ $(this).trigger('mouseleave');
|
|
|
});
|
|
|
}
|
|
|
});
|