aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-17 22:11:27 -0700
committerMark Otto <[email protected]>2013-08-17 22:11:27 -0700
commit04a73ebe42b8beb9567220fe31cc11057badf40f (patch)
tree58b0deac8b62f5ea759f7feea156259afb950964
parent3e02b0f5d0fd237cf9ccd901b1cfb66cf6f9bcd1 (diff)
parent95732b429fc9b71f14c544586885a449bd5efddc (diff)
downloadbootstrap-04a73ebe42b8beb9567220fe31cc11057badf40f.tar.xz
bootstrap-04a73ebe42b8beb9567220fe31cc11057badf40f.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
-rw-r--r--assets/js/customizer.js22
-rw-r--r--customize.html14
2 files changed, 29 insertions, 7 deletions
diff --git a/assets/js/customizer.js b/assets/js/customizer.js
index 7725ec0da..b8a4b2956 100644
--- a/assets/js/customizer.js
+++ b/assets/js/customizer.js
@@ -216,5 +216,27 @@ window.onload = function () { // wait for load in a dumb way because B-0
inputsVariables.val('')
})
+ $('[data-dependencies]').on('click', function () {
+ if (!$(this).is(':checked')) return
+ var dependencies = this.getAttribute('data-dependencies')
+ if (!dependencies) return
+ dependencies = dependencies.split(',')
+ for (var i = 0; i < dependencies.length; i++) {
+ var dependency = $('[value="' + dependencies[i] + '"]')
+ dependency && dependency.prop('checked', true)
+ }
+ })
+
+ $('[data-dependents]').on('click', function () {
+ if ($(this).is(':checked')) return
+ var dependents = this.getAttribute('data-dependents')
+ if (!dependents) return
+ dependents = dependents.split(',')
+ for (var i = 0; i < dependents.length; i++) {
+ var dependent = $('[value="' + dependents[i] + '"]')
+ dependent && dependent.prop('checked', false)
+ }
+ })
+
parseUrl()
} \ No newline at end of file
diff --git a/customize.html b/customize.html
index 94b871944..55dd882f8 100644
--- a/customize.html
+++ b/customize.html
@@ -66,13 +66,13 @@ base_url: "../"
</div>
<div class="checkbox">
<label>
- <input type="checkbox" checked value="forms.less">
+ <input type="checkbox" checked value="forms.less" data-dependents="navbar.less,input-groups.less">
Forms
</label>
</div>
<div class="checkbox">
<label>
- <input type="checkbox" checked value="buttons.less">
+ <input type="checkbox" checked value="buttons.less" data-dependents="button-groups.less">
Buttons
</label>
</div>
@@ -112,7 +112,7 @@ base_url: "../"
</div>
<div class="checkbox">
<label>
- <input type="checkbox" checked value="navbar.less" data-dependency="forms.less">
+ <input type="checkbox" checked value="navbar.less" data-dependencies="forms.less">
Navbar
</label>
</div>
@@ -223,13 +223,13 @@ base_url: "../"
<h4>Miscellaneous</h4>
<div class="checkbox">
<label>
- <input type="checkbox" checked value="input-groups.less" data-dependency="forms.less">
+ <input type="checkbox" checked value="input-groups.less" data-dependencies="forms.less">
Input groups
</label>
</div>
<div class="checkbox">
<label>
- <input type="checkbox" checked value="button-groups.less" data-dependency="buttons.less">
+ <input type="checkbox" checked value="button-groups.less" data-dependencies="buttons.less">
Button groups
</label>
</div>
@@ -304,13 +304,13 @@ base_url: "../"
</div>
<div class="checkbox">
<label>
- <input type="checkbox" checked value="tooltip.js">
+ <input type="checkbox" checked value="tooltip.js" data-dependents="popover.js">
Tooltips
</label>
</div>
<div class="checkbox">
<label>
- <input type="checkbox" checked value="popover.js" data-dependency="tooltip.js">
+ <input type="checkbox" checked value="popover.js" data-dependencies="tooltip.js">
Popovers <small>(requires Tooltips)</small>
</label>
</div>