@@ -1,7 +1,7 @@ /*! * jQuery corner plugin: simple corner rounding * Examples and documentation at: http://jquery.malsup.com/corner/ - * version 2.00 (04-SEP-2009) + * version 2.01 (08-SEP-2009) * Dual licensed under the MIT and GPL licenses: * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl.html @@ -24,8 +24,7 @@ var moz = $.browser.mozilla && /gecko/i.test(navigator.userAgent); var webkit = $.browser.safari && $.browser.version >= 3; -var expr = !moz && !webkit && (function() { - if (! $.browser.msie) return false; +var expr = $.browser.msie && (function() { var div = document.createElement('div'); try { div.style.setExpression('width','0+0'); } catch(e) { return false; } @@ -76,53 +75,54 @@ function getWidth(fx, i, width) { } }; -$.fn.corner = function(o) { +$.fn.corner = function(options) { // in 1.3+ we can fix mistakes with the ready state if (this.length == 0) { if (!$.isReady && this.selector) { var s = this.selector, c = this.context; $(function() { - $(s,c).corner(o); + $(s,c).corner(options); }); } return this; } - o = (o||"").toLowerCase(); - var keep = /keep/.test(o); // keep borders? - var cc = ((o.match(/cc:(#[0-9a-f]+)/)||[])[1]); // corner color - var sc = ((o.match(/sc:(#[0-9a-f]+)/)||[])[1]); // strip color - var width = parseInt((o.match(/(\d+)px/)||[])[1]) || 10; // corner width - var re = /round|bevel|notch|bite|cool|sharp|slide|jut|curl|tear|fray|wicked|sculpt|long|dog3|dog2|dog/; - var fx = ((o.match(re)||['round'])[0]); - var edges = { T:0, B:1 }; - var opts = { - TL: /top|tl/.test(o), TR: /top|tr/.test(o), - BL: /bottom|bl/.test(o), BR: /bottom|br/.test(o) - }; - if ( !opts.TL && !opts.TR && !opts.BL && !opts.BR ) - opts = { TL:1, TR:1, BL:1, BR:1 }; - - // support native rounding - if ($.fn.corner.defaults.useNative && fx == 'round' && (moz || webkit)) { - if (opts.TL) - this.css(moz ? '-moz-border-radius-topleft' : '-webkit-border-top-left-radius', width + 'px'); - if (opts.TR) - this.css(moz ? '-moz-border-radius-topright' : '-webkit-border-top-right-radius', width + 'px'); - if (opts.BL) - this.css(moz ? '-moz-border-radius-bottomleft' : '-webkit-border-bottom-left-radius', width + 'px'); - if (opts.BR) - this.css(moz ? '-moz-border-radius-bottomright' : '-webkit-border-bottom-right-radius', width + 'px'); - return this; - } - - var strip = document.createElement('div'); - strip.style.overflow = 'hidden'; - strip.style.height = '1px'; - strip.style.backgroundColor = sc || 'transparent'; - strip.style.borderStyle = 'solid'; - return this.each(function(index){ + var $this = $(this); + var o = (options || $this.attr($.fn.corner.defaults.metaAttr) || '').toLowerCase(); + var keep = /keep/.test(o); // keep borders? + var cc = ((o.match(/cc:(#[0-9a-f]+)/)||[])[1]); // corner color + var sc = ((o.match(/sc:(#[0-9a-f]+)/)||[])[1]); // strip color + var width = parseInt((o.match(/(\d+)px/)||[])[1]) || 10; // corner width + var re = /round|bevel|notch|bite|cool|sharp|slide|jut|curl|tear|fray|wicked|sculpt|long|dog3|dog2|dog/; + var fx = ((o.match(re)||['round'])[0]); + var edges = { T:0, B:1 }; + var opts = { + TL: /top|tl|left/.test(o), TR: /top|tr|right/.test(o), + BL: /bottom|bl|left/.test(o), BR: /bottom|br|right/.test(o) + }; + if ( !opts.TL && !opts.TR && !opts.BL && !opts.BR ) + opts = { TL:1, TR:1, BL:1, BR:1 }; + + // support native rounding + if ($.fn.corner.defaults.useNative && fx == 'round' && (moz || webkit) && !cc && !sc) { + if (opts.TL) + $this.css(moz ? '-moz-border-radius-topleft' : '-webkit-border-top-left-radius', width + 'px'); + if (opts.TR) + $this.css(moz ? '-moz-border-radius-topright' : '-webkit-border-top-right-radius', width + 'px'); + if (opts.BL) + $this.css(moz ? '-moz-border-radius-bottomleft' : '-webkit-border-bottom-left-radius', width + 'px'); + if (opts.BR) + $this.css(moz ? '-moz-border-radius-bottomright' : '-webkit-border-bottom-right-radius', width + 'px'); + return; + } + + var strip = document.createElement('div'); + strip.style.overflow = 'hidden'; + strip.style.height = '1px'; + strip.style.backgroundColor = sc || 'transparent'; + strip.style.borderStyle = 'solid'; + var pad = { T: parseInt($.css(this,'paddingTop'))||0, R: parseInt($.css(this,'paddingRight'))||0, B: parseInt($.css(this,'paddingBottom'))||0, L: parseInt($.css(this,'paddingLeft'))||0 @@ -192,9 +192,10 @@ $.fn.uncorner = function() { return this; }; -// allow external control over whether or not native rounding is used +// expose options $.fn.corner.defaults = { - useNative: true + useNative: true, // true if plugin should attempt to use native browser support for border radius rounding + metaAttr: 'data-corner' // name of meta attribute to use for options }; })(jQuery); jquery.corner.js f4c0c0ee9d223e2b1594ac1e83a2c6eaca019bef Mike admin@MacBookPro.local http://github.com/malsup/corner/commit/bf2eb3183984efd90f164bafa7406e2267971aa0 bf2eb3183984efd90f164bafa7406e2267971aa0 2009-09-08T10:45:05-07:00 2009-09-08T10:45:05-07:00 Add support for declarative options via meta attribute 2a27656000df7d46e0792821b49ac1c78b94f23c Mike admin@MacBookPro.local