Skip to content

Commit 1e8b18c

Browse files
author
Emanuele Marchi
committed
v3.3.0
1 parent 44a5942 commit 1e8b18c

26 files changed

+88
-113
lines changed

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap-switch",
33
"description": "Turn checkboxes and radio buttons in toggle switches.",
4-
"version": "3.2.2",
4+
"version": "3.3.0",
55
"main": [
66
"./dist/js/bootstrap-switch.js",
77
"./dist/css/bootstrap3/bootstrap-switch.css"
@@ -23,7 +23,7 @@
2323
"jquery": ">=1.9.0"
2424
},
2525
"devDependencies": {
26-
"jquery": "~2.1.1",
27-
"bootstrap": "~3.2.0"
26+
"jquery": "~2.1",
27+
"bootstrap": "~3.3"
2828
}
2929
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "components/bootstrap-switch",
33
"description": "Turn checkboxes and radio buttons in toggle switches.",
4-
"version": "3.2.2",
4+
"version": "3.3.0",
55
"type": "component",
66
"keywords": [
77
"bootstrap",

dist/css/bootstrap2/bootstrap-switch.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* bootstrap-switch - v3.2.2
2+
* bootstrap-switch - v3.3.0
33
* http://www.bootstrap-switch.org
44
* ========================================================================
55
* Copyright 2012-2013 Mattia Larentis

dist/css/bootstrap2/bootstrap-switch.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap3/bootstrap-switch.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* bootstrap-switch - v3.2.2
2+
* bootstrap-switch - v3.3.0
33
* http://www.bootstrap-switch.org
44
* ========================================================================
55
* Copyright 2012-2013 Mattia Larentis

dist/css/bootstrap3/bootstrap-switch.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/bootstrap-switch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* bootstrap-switch - v3.2.2
2+
* bootstrap-switch - v3.3.0
33
* http://www.bootstrap-switch.org
44
* ========================================================================
55
* Copyright 2012-2013 Mattia Larentis

dist/js/bootstrap-switch.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/main.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ body {
1717
text-align: center;
1818
}
1919

20-
.old-version {
21-
color: #ccc;
22-
text-decoration: line-through;
23-
}
24-
2520
#github {
2621
display: none;
2722
position: fixed;

docs/js/main.js

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,10 @@ $(function() {
1616
}
1717
});
1818

19-
// download switch
20-
$('input[name="download-version"]').on({
21-
'init.bootstrapSwitch': function() {
22-
$('#download-' + ($(this).is(':checked') ? '2' : '3')).hide();
23-
},
24-
'switchChange.bootstrapSwitch': function(event, state) {
25-
$('#download-3')[state ? 'show' : 'hide']();
26-
$('#download-2')[state ? 'hide' : 'show']();
27-
}
28-
});
29-
3019
// initialize all the inputs
31-
$('input[type="checkbox"], input[type="radio"]:not("#switch-create-destroy, #switch-modal")').bootstrapSwitch();
20+
$('input[type="checkbox"], input[type="radio"]')
21+
.not("[data-switch-no-init]")
22+
.bootstrapSwitch();
3223

3324
$('[data-switch-get]').on("click", function() {
3425
var type = $(this).data('switch-get');
@@ -66,6 +57,4 @@ $(function() {
6657
$createDestroy.bootstrapSwitch(isSwitch ? 'destroy' : null);
6758
$(this).button(isSwitch ? 'reset' : 'destroy');
6859
});
69-
70-
$('#modal-switch');
7160
});

0 commit comments

Comments
 (0)