Changeset 4585

Timestamp:

08/21/10 14:24:37 (18 months ago)

Author:

vain

Message:

• Dropped jQuery corner v1.99
• Tagging jQuery corner v2.11
• Updating [vendor][current] to v2.11

Location:

vendors/js-jquery-corner

Files:

• 1.99 (deleted)
• 2.11 (added)
• 2.11/jquery.corner.js (added)
• current/jquery.corner.js (modified) (9 diffs)

vendors/js-jquery-corner/current/jquery.corner.js

@@ -2 +2 @@
  * jQuery corner plugin: simple corner rounding
  * Examples and documentation at: http://jquery.malsup.com/corner/
- * version 1.99 (28-JUL-2009)
+ * version 2.11 (15-JUN-2010)
+ * Requires jQuery v1.3.2 or later
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
  * http://www.gnu.org/licenses/gpl.html
+ * Authors: Dave Methvin and Mike Alsup
  */
 
@@ -12 +14 @@
  *
  *  effect:  name of the effect to apply, such as round, bevel, notch, bite, etc (default is round). 
- *  corners: one or more of: top, bottom, tr, tl, br, or bl. 
- *           by default, all four corners are adorned. 
+ *  corners: one or more of: top, bottom, tr, tl, br, or bl.  (default is all corners)
  *  width:   width of the effect; in the case of rounded corners this is the radius. 
- *           specify this value using the px suffix such as 10px (and yes, it must be pixels).
- *
- * @name corner
- * @type jQuery
- * @param String options Options which control the corner style
- * @cat Plugins/Corner
- * @return jQuery
- * @author Dave Methvin (http://methvin.com/jquery/jq-corner.html)
- * @author Mike Alsup   (http://jquery.malsup.com/corner/)
+ *           specify this value using the px suffix such as 10px (yes, it must be pixels).
  */
 ;(function($) { 
 
-var expr = (function() {
-        if (! $.browser.msie) return false;
-    var div = document.createElement('div');
-    try { div.style.setExpression('width','0+0'); }
-    catch(e) { return false; }
-    return true;
-})();
-    
+var style = document.createElement('div').style,
+    moz = style['MozBorderRadius'] !== undefined,
+    webkit = style['WebkitBorderRadius'] !== undefined,
+    radius = style['borderRadius'] !== undefined || style['BorderRadius'] !== undefined,
+    mode = document.documentMode || 0,
+    noBottomFold = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8),
+
+    expr = $.browser.msie && (function() {
+        var div = document.createElement('div');
+        try { div.style.setExpression('width','0+0'); div.style.removeExpression('width'); }
+        catch(e) { return false; }
+        return true;
+    })();
+
+$.support = $.support || {};
+$.support.borderRadius = moz || webkit || radius; // so you can do:  if (!$.support.borderRadius) $('#myDiv').corner();
+
 function sz(el, p) { 
     return parseInt($.css(el,p))||0; 
@@ -43 +45 @@
 };
 function gpc(node) {
-    for ( ; node && node.nodeName.toLowerCase() != 'html'; node = node.parentNode ) {
-        var v = $.css(node,'backgroundColor');
-        if (v == 'rgba(0, 0, 0, 0)')
-            continue; // webkit
-        if (v.indexOf('rgb') >= 0) { 
-            var rgb = v.match(/\d+/g); 
-            return '#'+ hex2(rgb[0]) + hex2(rgb[1]) + hex2(rgb[2]);
-        }
-        if ( v && v != 'transparent' )
+    while(node) {
+        var v = $.css(node,'backgroundColor'), rgb;
+        if (v && v != 'transparent' && v != 'rgba(0, 0, 0, 0)') {
+            if (v.indexOf('rgb') >= 0) { 
+                rgb = v.match(/\d+/g); 
+                return '#'+ hex2(rgb[0]) + hex2(rgb[1]) + hex2(rgb[2]);
+            }
             return v;
+        }
+        if (node.nodeName.toLowerCase() == 'html')
+            break;
+        node = node.parentNode; // keep walking if transparent
     }
     return '#ffffff';
@@ -70 +74 @@
     case 'long':   return Math.round(width*(Math.sqrt(i)));
     case 'sculpt': return Math.round(width*(Math.log((width-i-1),width)));
+    case 'dogfold':
     case 'dog':    return (i&1) ? (i+1) : width;
     case 'dog2':   return (i&2) ? (i+1) : width;
@@ -75 +80 @@
     case 'fray':   return (i%2)*width;
     case 'notch':  return width; 
+    case 'bevelfold':
     case 'bevel':  return i+1;
     }
 };
 
-$.fn.corner = function(o) {
+$.fn.corner = function(options) {
     // in 1.3+ we can fix mistakes with the ready state
-        if (this.length == 0) {
+    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 };
-    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 pad = {
+        var $this = $(this),
+            // meta values override options
+            o = [$this.attr($.fn.corner.defaults.metaAttr) || '', options || ''].join(' ').toLowerCase(),
+            keep = /keep/.test(o),                       // keep borders?
+            cc = ((o.match(/cc:(#[0-9a-f]+)/)||[])[1]),  // corner color
+            sc = ((o.match(/sc:(#[0-9a-f]+)/)||[])[1]),  // strip color
+            width = parseInt((o.match(/(\d+)px/)||[])[1]) || 10, // corner width
+            re = /round|bevelfold|bevel|notch|bite|cool|sharp|slide|jut|curl|tear|fray|wicked|sculpt|long|dog3|dog2|dogfold|dog/,
+            fx = ((o.match(re)||['round'])[0]),
+            fold = /dogfold|bevelfold/.test(o),
+            edges = { T:0, B:1 },
+            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)
+            },
+            // vars used in func later
+            strip, pad, cssHeight, j, bot, d, ds, bw, i, w, e, c, common, $horz;
+        
+        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' && (radius || moz || webkit) && !cc && !sc) {
+            if (opts.TL)
+                $this.css(radius ? 'border-top-left-radius' : moz ? '-moz-border-radius-topleft' : '-webkit-border-top-left-radius', width + 'px');
+            if (opts.TR)
+                $this.css(radius ? 'border-top-right-radius' : moz ? '-moz-border-radius-topright' : '-webkit-border-top-right-radius', width + 'px');
+            if (opts.BL)
+                $this.css(radius ? 'border-bottom-left-radius' : moz ? '-moz-border-radius-bottomleft' : '-webkit-border-bottom-left-radius', width + 'px');
+            if (opts.BR)
+                $this.css(radius ? 'border-bottom-right-radius' : moz ? '-moz-border-radius-bottomright' : '-webkit-border-bottom-right-radius', width + 'px');
+            return;
+        }
+            
+        strip = document.createElement('div');
+        $(strip).css({
+            overflow: 'hidden',
+            height: '1px',
+            minHeight: '1px',
+            fontSize: '1px',
+            backgroundColor: sc || 'transparent',
+            borderStyle: 'solid'
+        });
+    
+        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
@@ -119 +150 @@
         if (!keep) this.style.border = 'none';
         strip.style.borderColor = cc || gpc(this.parentNode);
-        var cssHeight = $.curCSS(this, 'height');
-
-        for (var j in edges) {
-            var bot = edges[j];
+        cssHeight = $(this).outerHeight();
+
+        for (j in edges) {
+            bot = edges[j];
             // only add stips if needed
             if ((bot && (opts.BL || opts.BR)) || (!bot && (opts.TL || opts.TR))) {
                 strip.style.borderStyle = 'none '+(opts[j+'R']?'solid':'none')+' none '+(opts[j+'L']?'solid':'none');
-                var d = document.createElement('div');
+                d = document.createElement('div');
                 $(d).addClass('jquery-corner');
-                var ds = d.style;
+                ds = d.style;
 
                 bot ? this.appendChild(d) : this.insertBefore(d, this.firstChild);
@@ -150 +181 @@
                     // fix ie6 problem when blocked element has a border width
                     if (expr) {
-                        var bw = sz(this,'borderLeftWidth') + sz(this,'borderRightWidth');
+                        bw = sz(this,'borderLeftWidth') + sz(this,'borderRightWidth');
                         ds.setExpression('width', 'this.parentNode.offsetWidth - '+bw+'+ "px"');
                     }
@@ -157 +188 @@
                 }
                 else {
-                        ds.position = 'relative';
+                    ds.position = 'relative';
                     ds.margin = !bot ? '-'+pad.T+'px -'+pad.R+'px '+(pad.T-width)+'px -'+pad.L+'px' : 
                                         (pad.B-width)+'px -'+pad.R+'px -'+pad.B+'px -'+pad.L+'px';                
                 }
 
-                for (var i=0; i < width; i++) {
-                    var w = Math.max(0,getWidth(fx,i, width));
-                    var e = strip.cloneNode(false);
+                for (i=0; i < width; i++) {
+                    w = Math.max(0,getWidth(fx,i, width));
+                    e = strip.cloneNode(false);
                     e.style.borderWidth = '0 '+(opts[j+'R']?w:0)+'px 0 '+(opts[j+'L']?w:0)+'px';
                     bot ? d.appendChild(e) : d.insertBefore(e, d.firstChild);
                 }
+                
+                if (fold && $.support.boxModel) {
+                    if (bot && noBottomFold) continue;
+                    for (c in opts) {
+                        if (!opts[c]) continue;
+                        if (bot && (c == 'TL' || c == 'TR')) continue;
+                        if (!bot && (c == 'BL' || c == 'BR')) continue;
+                        
+                        common = { position: 'absolute', border: 'none', margin: 0, padding: 0, overflow: 'hidden', backgroundColor: strip.style.borderColor };
+                        $horz = $('<div/>').css(common).css({ width: width + 'px', height: '1px' });
+                        switch(c) {
+                        case 'TL': $horz.css({ bottom: 0, left: 0 }); break;
+                        case 'TR': $horz.css({ bottom: 0, right: 0 }); break;
+                        case 'BL': $horz.css({ top: 0, left: 0 }); break;
+                        case 'BR': $horz.css({ top: 0, right: 0 }); break;
+                        }
+                        d.appendChild($horz[0]);
+                        
+                        var $vert = $('<div/>').css(common).css({ top: 0, bottom: 0, width: '1px', height: width + 'px' });
+                        switch(c) {
+                        case 'TL': $vert.css({ left: width }); break;
+                        case 'TR': $vert.css({ right: width }); break;
+                        case 'BL': $vert.css({ left: width }); break;
+                        case 'BR': $vert.css({ right: width }); break;
+                        }
+                        d.appendChild($vert[0]);
+                    }
+                }
             }
         }
@@ -174 +233 @@
 
 $.fn.uncorner = function() { 
-        $('div.jquery-corner', this).remove();
-        return this;
+    if (radius || moz || webkit)
+        this.css(radius ? 'border-radius' : moz ? '-moz-border-radius' : '-webkit-border-radius', 0);
+    $('div.jquery-corner', this).remove();
+    return this;
+};
+
+// expose options
+$.fn.corner.defaults = {
+    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
 };