Permalink
Browse files

bumped version

  • Loading branch information...
mhayes committed Apr 10, 2012
1 parent 5b3c0d0 commit 6bd381fa009a424336f82a93b51aefc5a13a0e87
@@ -1,4 +1,4 @@
module Foundation
- COMMIT = "add28ff4b81fa1f2e2ed116fd46e44b8aa17acb7"
- VERSION = "2.2.0.2"
+ COMMIT = "e9d5d8f5267b5d2db23cb74fb307fe149913ca14"
+ VERSION = "2.2.1.0"
end
@@ -8,12 +8,15 @@ jQuery(document).ready(function ($) {
function activateTab($tab) {
var $activeTab = $tab.closest('dl').find('a.active'),
contentLocation = $tab.attr("href") + 'Tab';
+
+ // Strip off the current url that IE adds
+ contentLocation = contentLocation.replace(/^.+#/, '#');
//Make Tab Active
$activeTab.removeClass('active');
$tab.addClass('active');
- //Show Tab Content
+ //Show Tab Content
$(contentLocation).closest('.tabs-content').children('li').hide();
$(contentLocation).css('display', 'block');
}
@@ -28,6 +31,7 @@ jQuery(document).ready(function ($) {
if (window.location.hash) {
activateTab($('a[href="' + window.location.hash + '"]'));
+ $.foundation.customForms.appendCustomMarkup();
}
/* ALERT BOXES ------------ */
@@ -90,7 +94,6 @@ jQuery(document).ready(function ($) {
/* DISABLED BUTTONS ------------- */
/* Gives elements with a class of 'disabled' a return: false; */
-
});
@@ -6,6 +6,9 @@
* http://www.opensource.org/licenses/mit-license.php
*/
+jQuery.foundation = jQuery.foundation || {};
+jQuery.foundation.customForms = jQuery.foundation.customForms || {};
+
jQuery(document).ready(function ($) {
function appendCustomMarkup(type) {
@@ -22,8 +25,6 @@ jQuery(document).ready(function ($) {
$span.toggleClass('disabled', $this.is(':disabled'));
});
}
- appendCustomMarkup('checkbox');
- appendCustomMarkup('radio');
function appendCustomSelect(sel) {
var $this = $(sel),
@@ -32,6 +33,7 @@ jQuery(document).ready(function ($) {
maxWidth = 0,
$li;
+ if ($this.hasClass('no-custom')) { return; }
if ($customSelect.length === 0) {
$customSelectSize = '';
if ($(sel).hasClass('small')) {
@@ -71,6 +73,9 @@ jQuery(document).ready(function ($) {
}
});
+ $customSelect.css('width', 'inherit');
+ $customSelect.find('ul').css('width', 'inherit');
+
$customSelect.find('li').each(function () {
$customSelect.addClass('open');
if ($(this).outerWidth() > maxWidth) {
@@ -85,11 +90,17 @@ jQuery(document).ready(function ($) {
}
}
-
- $('form.custom select').each(function () {
- appendCustomSelect(this);
- });
+ $.foundation.customForms.appendCustomMarkup = function () {
+ appendCustomMarkup('checkbox');
+ appendCustomMarkup('radio');
+
+ $('form.custom select').each(function () {
+ appendCustomSelect(this);
+ });
+ };
+
+ $.foundation.customForms.appendCustomMarkup();
});
(function ($) {
@@ -144,13 +155,15 @@ jQuery(document).ready(function ($) {
var $input = $element.prev(),
input = $input[0];
- $('input:radio[name="' + $input.attr('name') + '"]').each(function () {
- $(this).next().removeClass('checked');
- });
- input.checked = ((input.checked) ? false : true);
- $element.toggleClass('checked');
+ if (false == $input.is(':disabled')) {
+ $('input:radio[name="' + $input.attr('name') + '"]').each(function () {
+ $(this).next().removeClass('checked');
+ });
+ input.checked = ((input.checked) ? false : true);
+ $element.toggleClass('checked');
- $input.trigger('change');
+ $input.trigger('change');
+ }
}
$('form.custom span.custom.checkbox').live('click', function (event) {
Oops, something went wrong.

0 comments on commit 6bd381f

Please sign in to comment.