From d24d57abd0fac3f8bbd88a6ccf59f17687a4ee7a Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 20 Apr 2009 19:34:27 +0000 Subject: [PATCH] Update Jcrop to 0.9.8. Props nbachiyski. fixes #9545 git-svn-id: http://svn.automattic.com/wordpress/trunk@11015 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/jcrop/jquery.Jcrop.css | 14 +- wp-includes/js/jcrop/jquery.Jcrop.dev.js | 391 +++++++++++++++-------- wp-includes/js/jcrop/jquery.Jcrop.js | 164 +++++++++- wp-includes/script-loader.php | 4 +- 4 files changed, 419 insertions(+), 154 deletions(-) diff --git a/wp-includes/js/jcrop/jquery.Jcrop.css b/wp-includes/js/jcrop/jquery.Jcrop.css index b95178a72..24925dc94 100644 --- a/wp-includes/js/jcrop/jquery.Jcrop.css +++ b/wp-includes/js/jcrop/jquery.Jcrop.css @@ -1,18 +1,11 @@ /* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */ -.jcrop-holder -{ - text-align: left; -} +.jcrop-holder { text-align: left; } .jcrop-vline, .jcrop-hline { font-size: 0; position: absolute; background: white url('Jcrop.gif') top left repeat; - /* - opacity: .5; - *filter:alpha(opacity=50); - */ } .jcrop-vline { height: 100%; width: 1px !important; } .jcrop-hline { width: 100%; height: 1px !important; } @@ -26,10 +19,7 @@ *height: 9px; } -.jcrop-tracker { - *background-color: gray; - width: 100%; height: 100%; -} +.jcrop-tracker { width: 100%; height: 100%; } .custom .jcrop-vline, .custom .jcrop-hline diff --git a/wp-includes/js/jcrop/jquery.Jcrop.dev.js b/wp-includes/js/jcrop/jquery.Jcrop.dev.js index 99f7aa62b..ad261f97a 100644 --- a/wp-includes/js/jcrop/jquery.Jcrop.dev.js +++ b/wp-includes/js/jcrop/jquery.Jcrop.dev.js @@ -1,8 +1,8 @@ /** - * jquery.Jcrop.js v0.9.5 + * jquery.Jcrop.js v0.9.8 * jQuery Image Cropping Plugin - * @author Kelly Hallman - * Copyright (c) 2008 Kelly Hallman - released under MIT License {{{ + * @author Kelly Hallman + * Copyright (c) 2008-2009 Kelly Hallman - released under MIT License {{{ * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -27,7 +27,9 @@ * }}} */ + (function($) { + $.Jcrop = function(obj,opt) { // Initialization {{{ @@ -38,12 +40,17 @@ $.Jcrop = function(obj,opt) if (typeof(obj) !== 'object') obj = $(obj)[0]; if (typeof(opt) !== 'object') opt = { }; + // Some on-the-fly fixes for MSIE...sigh if (!('trackDocument' in opt)) + { opt.trackDocument = $.browser.msie ? false : true; + if ($.browser.msie && $.browser.version.split('.')[0] == '8') + opt.trackDocument = true; + } if (!('keySupport' in opt)) - opt.keySupport = $.browser.msie ? false : true; - + opt.keySupport = $.browser.msie ? false : true; + // }}} // Extend the default options {{{ var defaults = { @@ -78,7 +85,10 @@ $.Jcrop = function(obj,opt) animationDelay: 20, swingSpeed: 3, - watchShift: false, + allowSelect: true, + allowMove: true, + allowResize: true, + minSelect: [ 0, 0 ], maxSize: [ 0, 0 ], minSize: [ 0, 0 ], @@ -94,7 +104,12 @@ $.Jcrop = function(obj,opt) // }}} // Initialize some jQuery objects {{{ - var $img = $(obj).css({ position: 'absolute' }); + var $origimg = $(obj); + var $img = $origimg.clone().removeAttr('id').css({ position: 'absolute' }); + + $img.width($origimg.width()); + $img.height($origimg.height()); + $origimg.after($img).hide(); presize($img,options.boxWidth,options.boxHeight); @@ -106,13 +121,12 @@ $.Jcrop = function(obj,opt) .addClass(cssClass('holder')) .css({ position: 'relative', - //overflow: 'hidden', backgroundColor: options.bgColor - }) + }).insertAfter($origimg).append($img); ; if (options.addClass) $div.addClass(options.addClass); - $img.wrap($div); + //$img.wrap($div); var $img2 = $('')/*{{{*/ .attr('src',$img.attr('src')) @@ -130,11 +144,8 @@ $.Jcrop = function(obj,opt) ;/*}}}*/ var $hdl_holder = $('
')/*{{{*/ .width(pct(100)).height(pct(100)) - .css({ - zIndex: 320 - //position: 'absolute' - }) - ;/*}}}*/ + .css('zIndex',320); + /*}}}*/ var $sel = $('
')/*{{{*/ .css({ position: 'absolute', @@ -145,38 +156,24 @@ $.Jcrop = function(obj,opt) ;/*}}}*/ var bound = options.boundary; - var $trk = $('
') - .addClass(cssClass('tracker')) - .width(boundx+(bound*2)) - .height(boundy+(bound*2)) - .css({ - position: 'absolute', - top: px(-bound), - left: px(-bound), - zIndex: 290, - opacity: 0 - }) - .mousedown(newSelection) - ; + var $trk = newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)) + .css({ position: 'absolute', top: px(-bound), left: px(-bound), zIndex: 290 }) + .mousedown(newSelection); /* }}} */ // Set more variables {{{ - var xscale, yscale; - var docOffset = getPos(obj), + var xlimit, ylimit, xmin, ymin; + var xscale, yscale, enabled = true; + var docOffset = getPos($img), // Internal states - btndown, aspectLock, lastcurs, dimmed, animating, + btndown, lastcurs, dimmed, animating, shift_down; // }}} - if ('trueSize' in options)/*{{{*/ - { - xscale = options.trueSize[0] / boundx; - yscale = options.trueSize[1] / boundy; - } - /*}}}*/ + - // }}} + // }}} // Internal Modules {{{ var Coords = function()/*{{{*/ @@ -234,12 +231,13 @@ $.Jcrop = function(obj,opt) /*}}}*/ function getFixed()/*{{{*/ { - if (!options.aspectRatio && !aspectLock) return getRect(); - + if (!options.aspectRatio) return getRect(); // This function could use some optimization I think... - var aspect = options.aspectRatio ? options.aspectRatio : aspectLock, - min = options.minSize, - max = options.maxSize, + var aspect = options.aspectRatio, + min_x = options.minSize[0]/xscale, + min_y = options.minSize[1]/yscale, + max_x = options.maxSize[0]/xscale, + max_y = options.maxSize[1]/yscale, rw = x2 - x1, rh = y2 - y1, rwa = Math.abs(rw), @@ -247,7 +245,8 @@ $.Jcrop = function(obj,opt) real_ratio = rwa / rha, xx, yy ; - + if (max_x == 0) { max_x = boundx * 10 } + if (max_y == 0) { max_y = boundy * 10 } if (real_ratio < aspect) { yy = y2; @@ -285,6 +284,48 @@ $.Jcrop = function(obj,opt) xx = rw < 0 ? x1 - w : w + x1; } } + + // Magic %-) + if(xx > x1) { // right side + if(xx - x1 < min_x) { + xx = x1 + min_x; + } else if (xx - x1 > max_x) { + xx = x1 + max_x; + } + if(yy > y1) { + yy = y1 + (xx - x1)/aspect; + } else { + yy = y1 - (xx - x1)/aspect; + } + } else if (xx < x1) { // left side + if(x1 - xx < min_x) { + xx = x1 - min_x + } else if (x1 - xx > max_x) { + xx = x1 - max_x; + } + if(yy > y1) { + yy = y1 + (x1 - xx)/aspect; + } else { + yy = y1 - (x1 - xx)/aspect; + } + } + + if(xx < 0) { + x1 -= xx; + xx = 0; + } else if (xx > boundx) { + x1 -= xx - boundx; + xx = boundx; + } + + if(yy < 0) { + y1 -= yy; + yy = 0; + } else if (yy > boundy) { + y1 -= yy - boundy; + yy = boundy; + } + return last = makeObj(flipCoords(x1,y1,xx,yy)); }; /*}}}*/ @@ -490,15 +531,18 @@ $.Jcrop = function(obj,opt) /*}}}*/ function refresh()/*{{{*/ { - var p = Coords.getFixed(); - Coords.setPressed([p.x,p.y]); - Coords.setCurrent([p.x2,p.y2]); + var c = Coords.getFixed(); + + Coords.setPressed([c.x,c.y]); + Coords.setCurrent([c.x2,c.y2]); + + updateVisible(); }; /*}}}*/ // Internal Methods function updateVisible()/*{{{*/ - { if (awake) return update(); }; + { if (awake) return update(); }; /*}}}*/ function update()/*{{{*/ { @@ -532,18 +576,24 @@ $.Jcrop = function(obj,opt) awake = false; }; /*}}}*/ - function hide()/*{{{*/ + function showHandles()//{{{ { - release(); - $img.css('opacity',1); - awake = false; + if (seehandles) + { + moveHandles(Coords.getFixed()); + $hdl_holder.show(); + } }; - /*}}}*/ + //}}} function enableHandles()/*{{{*/ { seehandles = true; - moveHandles(Coords.getFixed()); - $hdl_holder.show(); + if (options.allowResize) + { + moveHandles(Coords.getFixed()); + $hdl_holder.show(); + return true; + } }; /*}}}*/ function disableHandles()/*{{{*/ @@ -559,29 +609,26 @@ $.Jcrop = function(obj,opt) /*}}}*/ function done()/*{{{*/ { - var c = Coords.getFixed(); animMode(false); refresh(); }; /*}}}*/ - disableHandles(); + var $track = newTracker().mousedown(createDragger('move')) + .css({ cursor: 'move', position: 'absolute', zIndex: 360 }) - $img_holder.append - ( - $('
') - .addClass(cssClass('tracker')) - .mousedown(createDragger('move')) - .css({ cursor: 'move', position: 'absolute', zIndex: 360, opacity: 0 }) - ); + $img_holder.append($track); + disableHandles(); return { updateVisible: updateVisible, update: update, release: release, - show: show, - hide: hide, + refresh: refresh, + setCursor: function (cursor) { $track.css('cursor',cursor); }, enableHandles: enableHandles, + enableOnly: function() { seehandles = true; }, + showHandles: showHandles, disableHandles: disableHandles, animMode: animMode, done: done @@ -605,6 +652,7 @@ $.Jcrop = function(obj,opt) function toFront()/*{{{*/ { + $trk.css({zIndex:450}); if (trackDoc) { $(document) @@ -612,11 +660,11 @@ $.Jcrop = function(obj,opt) .mouseup(trackUp) ; } - $trk.css({zIndex:450}); } /*}}}*/ function toBack()/*{{{*/ { + $trk.css({zIndex:290}); if (trackDoc) { $(document) @@ -624,7 +672,6 @@ $.Jcrop = function(obj,opt) .unbind('mouseup',trackUp) ; } - $trk.css({zIndex:290}); } /*}}}*/ function trackMove(e)/*{{{*/ @@ -675,8 +722,7 @@ $.Jcrop = function(obj,opt) { var $keymgr = $('') .css({ position: 'absolute', left: '-30px' }) - .keydown(parseKey) - .keyup(watchShift) + .keypress(parseKey) .blur(onBlur), $keywrap = $('
') @@ -701,28 +747,12 @@ $.Jcrop = function(obj,opt) $keymgr.hide(); }; /*}}}*/ - function watchShift(e)/*{{{*/ - { - if (!options.watchShift) return; - var init_shift = shift_down, fc; - shift_down = e.shiftKey ? true : false; - - if (init_shift != shift_down) { - if (shift_down && btndown) { - fc = Coords.getFixed(); - aspectLock = fc.w / fc.h; - } else aspectLock = 0; - Selection.update(); - } - e.stopPropagation(); - e.preventDefault(); - return false; - }; - /*}}}*/ function doNudge(e,x,y)/*{{{*/ { - Coords.moveOffset([x,y]); - Selection.updateVisible(); + if (options.allowMove) { + Coords.moveOffset([x,y]); + Selection.updateVisible(); + }; e.preventDefault(); e.stopPropagation(); }; @@ -730,7 +760,7 @@ $.Jcrop = function(obj,opt) function parseKey(e)/*{{{*/ { if (e.ctrlKey) return true; - watchShift(e); + shift_down = e.shiftKey ? true : false; var nudge = shift_down ? 10 : 1; switch(e.keyCode) { @@ -744,7 +774,7 @@ $.Jcrop = function(obj,opt) case 9: return true; } - return false; + return nothing(e); }; /*}}}*/ @@ -785,21 +815,26 @@ $.Jcrop = function(obj,opt) /*}}}*/ function startDragMode(mode,pos)/*{{{*/ { - docOffset = getPos(obj); + docOffset = getPos($img); Tracker.setCursor(mode=='move'?mode:mode+'-resize'); if (mode == 'move') return Tracker.activateHandlers(createMover(pos), doneSelect); var fc = Coords.getFixed(); - Coords.setPressed(Coords.getCorner(oppLockCorner(mode))); + var opp = oppLockCorner(mode); + var opc = Coords.getCorner(oppLockCorner(opp)); + + Coords.setPressed(Coords.getCorner(opp)); + Coords.setCurrent(opc); + Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect); }; /*}}}*/ function dragmodeHandler(mode,f)/*{{{*/ { return function(pos) { - if (!options.aspectRatio && !aspectLock) switch(mode) + if (!options.aspectRatio) switch(mode) { case 'e': pos[1] = f.y2; break; case 'w': pos[1] = f.y2; break; @@ -850,6 +885,8 @@ $.Jcrop = function(obj,opt) function createDragger(ord)/*{{{*/ { return function(e) { + if (options.disabled) return false; + if ((ord == 'move') && !options.allowMove) return false; btndown = true; startDragMode(ord,mouseAbs(e)); e.stopPropagation(); @@ -897,19 +934,22 @@ $.Jcrop = function(obj,opt) { Selection.release(); } - Tracker.setCursor('crosshair'); + Tracker.setCursor( options.allowSelect?'crosshair':'default' ); }; /*}}}*/ function newSelection(e)/*{{{*/ { + if (options.disabled) return false; + if (!options.allowSelect) return false; btndown = true; - docOffset = getPos(obj); - Selection.release(); + docOffset = getPos($img); Selection.disableHandles(); myCursor('crosshair'); - Coords.setPressed(mouseAbs(e)); + var pos = mouseAbs(e); + Coords.setPressed(pos); Tracker.activateHandlers(selectDrag,doneSelect); KeyManager.watchKeys(); + Selection.update(); e.stopPropagation(); e.preventDefault(); @@ -920,29 +960,31 @@ $.Jcrop = function(obj,opt) { Coords.setCurrent(pos); Selection.update(); - }; /*}}}*/ + function newTracker() + { + var trk = $('
').addClass(cssClass('tracker')); + $.browser.msie && trk.css({ opacity: 0, backgroundColor: 'white' }); + return trk; + }; // }}} - // Public API {{{ - + // API methods {{{ + function animateTo(a)/*{{{*/ { - var x1 = a[0], - y1 = a[1], - x2 = a[2], - y2 = a[3]; + var x1 = a[0] / xscale, + y1 = a[1] / yscale, + x2 = a[2] / xscale, + y2 = a[3] / yscale; if (animating) return; + var animto = Coords.flipCoords(x1,y1,x2,y2); var c = Coords.getFixed(); var animat = initcr = [ c.x, c.y, c.x2, c.y2 ]; var interv = options.animationDelay; - //var ix1 = (animto[0] - initcr[0]) / steps; - //var iy1 = (animto[1] - initcr[1]) / steps; - //var ix2 = (animto[2] - initcr[2]) / steps; - //var iy2 = (animto[3] - initcr[3]) / steps; var x = animat[0]; var y = animat[1]; @@ -973,7 +1015,7 @@ $.Jcrop = function(obj,opt) if (pcent >= 99.8) pcent = 100; - setSelect(animat); + setSelectRaw(animat); }; }(); @@ -981,10 +1023,14 @@ $.Jcrop = function(obj,opt) { window.setTimeout(animator,interv); }; animateStart(); - }; /*}}}*/ - function setSelect(l) /*{{{*/ + function setSelect(rect)//{{{ + { + setSelectRaw([rect[0]/xscale,rect[1]/yscale,rect[2]/xscale,rect[3]/yscale]); + }; + //}}} + function setSelectRaw(l) /*{{{*/ { Coords.setPressed([l[0],l[1]]); Coords.setCurrent([l[2],l[3]]); @@ -1001,6 +1047,7 @@ $.Jcrop = function(obj,opt) if (typeof(options.onSelect)!=='function') options.onSelect = function() { }; + }; /*}}}*/ function tellSelect()/*{{{*/ @@ -1016,35 +1063,104 @@ $.Jcrop = function(obj,opt) function setOptionsNew(opt)/*{{{*/ { setOptions(opt); - - if ('setSelect' in opt) { - setSelect(opt.setSelect); - Selection.done(); - } + interfaceUpdate(); }; /*}}}*/ + function disableCrop()//{{{ + { + options.disabled = true; + Selection.disableHandles(); + Selection.setCursor('default'); + Tracker.setCursor('default'); + }; + //}}} + function enableCrop()//{{{ + { + options.disabled = false; + interfaceUpdate(); + }; + //}}} + function cancelCrop()//{{{ + { + Selection.done(); + Tracker.activateHandlers(null,null); + }; + //}}} + function destroy()//{{{ + { + $div.remove(); + $origimg.show(); + }; + //}}} - if (typeof(opt) != 'object') opt = { }; - if ('setSelect' in opt) { setSelect(opt.setSelect); Selection.done(); } + function interfaceUpdate(alt)//{{{ + // This method tweaks the interface based on options object. + // Called when options are changed and at end of initialization. + { + options.allowResize ? + alt?Selection.enableOnly():Selection.enableHandles(): + Selection.disableHandles(); + + Tracker.setCursor( options.allowSelect? 'crosshair': 'default' ); + Selection.setCursor( options.allowMove? 'move': 'default' ); + + $div.css('backgroundColor',options.bgColor); + + if ('setSelect' in options) { + setSelect(opt.setSelect); + Selection.done(); + delete(options.setSelect); + } + + if ('trueSize' in options) { + xscale = options.trueSize[0] / boundx; + yscale = options.trueSize[1] / boundy; + } + + xlimit = options.maxSize[0] || 0; + ylimit = options.maxSize[1] || 0; + xmin = options.minSize[0] || 0; + ymin = options.minSize[1] || 0; + + if ('outerImage' in options) + { + $img.attr('src',options.outerImage); + delete(options.outerImage); + } + + Selection.refresh(); + }; + //}}} // }}} - var xlimit = options.maxSize[0] || 0; - var ylimit = options.maxSize[1] || 0; - var xmin = options.minSize[0] || 0; - var ymin = options.minSize[1] || 0; - - Tracker.setCursor('crosshair'); + $hdl_holder.hide(); + interfaceUpdate(true); - return { + var api = { animateTo: animateTo, setSelect: setSelect, setOptions: setOptionsNew, tellSelect: tellSelect, - tellScaled: tellScaled - }; -}; + tellScaled: tellScaled, + disable: disableCrop, + enable: enableCrop, + cancel: cancelCrop, + + focus: KeyManager.watchKeys, + + getBounds: function() { return [ boundx * xscale, boundy * yscale ]; }, + getWidgetSize: function() { return [ boundx, boundy ]; }, + + release: Selection.release, + destroy: destroy + + }; + + $origimg.data('Jcrop',api); + return api; +}; $.fn.Jcrop = function(options)/*{{{*/ { @@ -1052,11 +1168,7 @@ $.fn.Jcrop = function(options)/*{{{*/ { var loadsrc = options.useImg || from.src; var img = new Image(); - var from = from; - img.onload = function() { - $(from).hide().after(img); - from.Jcrop = $.Jcrop(img,options); - }; + img.onload = function() { $.Jcrop(from,options); }; img.src = loadsrc; }; /*}}}*/ @@ -1066,12 +1178,12 @@ $.fn.Jcrop = function(options)/*{{{*/ this.each(function() { // If we've already attached to this object - if ('Jcrop' in this) + if ($(this).data('Jcrop')) { // The API can be requested this way (undocumented) - if (options == 'api') return this.Jcrop; + if (options == 'api') return $(this).data('Jcrop'); // Otherwise, we just reset the options... - else this.Jcrop.setOptions(options); + else $(this).data('Jcrop').setOptions(options); } // If we haven't been attached, preload and attach else attachWhenDone(this); @@ -1080,5 +1192,6 @@ $.fn.Jcrop = function(options)/*{{{*/ // Return "this" so we're chainable a la jQuery plugin-style! return this; }; +/*}}}*/ + })(jQuery); -/*}}}*/ \ No newline at end of file diff --git a/wp-includes/js/jcrop/jquery.Jcrop.js b/wp-includes/js/jcrop/jquery.Jcrop.js index 5156311c4..9002b9787 100644 --- a/wp-includes/js/jcrop/jquery.Jcrop.js +++ b/wp-includes/js/jcrop/jquery.Jcrop.js @@ -1 +1,163 @@ -(function(a){a.Jcrop=function(d,v){var d=d,v=v;if(typeof(d)!=="object"){d=a(d)[0]}if(typeof(v)!=="object"){v={}}if(!("trackDocument" in v)){v.trackDocument=a.browser.msie?false:true}if(!("keySupport" in v)){v.keySupport=a.browser.msie?false:true}var Q={trackDocument:false,baseClass:"jcrop",addClass:null,bgColor:"black",bgOpacity:0.6,borderOpacity:0.4,handleOpacity:0.5,handlePad:5,handleSize:9,handleOffset:5,edgeMargin:14,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,boxWidth:0,boxHeight:0,boundary:8,animationDelay:20,swingSpeed:3,watchShift:false,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){}};var E=Q;u(v);var ac=a(d).css({position:"absolute"});P(ac,E.boxWidth,E.boxHeight);var M=ac.width(),K=ac.height(),T=a("
").width(M).height(K).addClass(y("holder")).css({position:"relative",backgroundColor:E.bgColor});if(E.addClass){T.addClass(E.addClass)}ac.wrap(T);var F=a("").attr("src",ac.attr("src")).css("position","absolute").width(M).height(K);var j=a("
").width(H(100)).height(H(100)).css({zIndex:310,position:"absolute",overflow:"hidden"}).append(F);var I=a("
").width(H(100)).height(H(100)).css({zIndex:320});var t=a("
").css({position:"absolute",zIndex:300}).insertBefore(ac).append(j,I);var q=E.boundary;var b=a("
").addClass(y("tracker")).width(M+(q*2)).height(K+(q*2)).css({position:"absolute",top:k(-q),left:k(-q),zIndex:290,opacity:0}).mousedown(W);var J,e;var X=A(d),o,z,ae,ad,x,V;if("trueSize" in E){J=E.trueSize[0]/M;e=E.trueSize[1]/K}var U=function(){var ah=0,at=0,ag=0,ar=0,ak,ai;function am(aw){var aw=aj(aw);ag=ah=aw[0];ar=at=aw[1]}function al(aw){var aw=aj(aw);ak=aw[0]-ag;ai=aw[1]-ar;ag=aw[0];ar=aw[1]}function av(){return[ak,ai]}function af(ay){var ax=ay[0],aw=ay[1];if(0>ah+ax){ax-=ax+ah}if(0>at+aw){aw-=aw+at}if(KM){aw=M;h=Math.abs((aw-ah)/ax);aD=aF<0?at-h:h+at}}}else{aw=ag;h=az/ax;aD=aF<0?at-h:at+h;if(aD<0){aD=0;w=Math.abs((aD-at)*ax);aw=ay<0?ah-w:w+ah}else{if(aD>K){aD=K;w=Math.abs(aD-at)*ax;aw=ay<0?ah-w:w+ah}}}return last=ap(ao(ah,at,aw,aD))}function aj(aw){if(aw[0]<0){aw[0]=0}if(aw[1]<0){aw[1]=0}if(aw[0]>M){aw[0]=M}if(aw[1]>K){aw[1]=K}return[aw[0],aw[1]]}function ao(az,aB,ay,aA){var aD=az,aC=ay,ax=aB,aw=aA;if(ays)){ag=(ax>0)?(ah+s):(ah-s)}if(Z&&(Math.abs(aw)>Z)){ar=(aw>0)?(at+Z):(at-Z)}if(O&&(Math.abs(aw)0)?(at+O):(at-O)}if(l&&(Math.abs(ax)0)?(ah+l):(ah-l)}if(ah<0){ag-=ah;ah-=ah}if(at<0){ar-=at;at-=at}if(ag<0){ah-=ag;ag-=ag}if(ar<0){at-=ar;ar-=ar}if(ag>M){var ay=ag-M;ah-=ay;ag-=ay}if(ar>K){var ay=ar-K;at-=ay;ar-=ay}if(ah>M){var ay=ah-K;ar-=ay;at-=ay}if(at>K){var ay=at-K;ar-=ay;at-=ay}return ap(ao(ah,at,ag,ar))}function ap(aw){return{x:aw[0],y:aw[1],x2:aw[2],y2:aw[3],w:aw[2]-aw[0],h:aw[3]-aw[1]}}return{flipCoords:ao,setPressed:am,setCurrent:al,getOffset:av,moveOffset:af,getCorner:an,getFixed:au}}();var R=function(){var ak,ah,ar,aq,aA=370;var aj={};var aE={};var ag=false;var ap=E.handleOffset;if(E.drawBorders){aj={top:al("hline").css("top",a.browser.msie?k(-1):k(0)),bottom:al("hline"),left:al("vline"),right:al("vline")}}if(E.dragEdges){aE.t=az("n");aE.b=az("s");aE.r=az("e");aE.l=az("w")}E.sideHandles&&av(["n","s","e","w"]);E.cornerHandles&&av(["sw","nw","ne","se"]);function al(aH){var aI=a("
").css({position:"absolute",opacity:E.borderOpacity}).addClass(y(aH));j.append(aI);return aI}function af(aH,aI){var aJ=a("
").mousedown(c(aH)).css({cursor:aH+"-resize",position:"absolute",zIndex:aI});I.append(aJ);return aJ}function at(aH){return af(aH,aA++).css({top:k(-ap+1),left:k(-ap+1),opacity:E.handleOpacity}).addClass(y("handle"))}function az(aJ){var aM=E.handleSize,aN=ap,aL=aM,aI=aM,aK=aN,aH=aN;switch(aJ){case"n":case"s":aI=H(100);break;case"e":case"w":aL=H(100);break}return af(aJ,aA++).width(aI).height(aL).css({top:k(-aK+1),left:k(-aH+1)})}function av(aH){for(i in aH){aE[aH[i]]=at(aH[i])}}function ax(aO){var aJ=Math.round((aO.h/2)-ap),aI=Math.round((aO.w/2)-ap),aM=west=-ap+1,aL=aO.w-ap,aK=aO.h-ap,aH,aN;"e" in aE&&aE.e.css({top:k(aJ),left:k(aL)})&&aE.w.css({top:k(aJ)})&&aE.s.css({top:k(aK),left:k(aI)})&&aE.n.css({left:k(aI)});"ne" in aE&&aE.ne.css({left:k(aL)})&&aE.se.css({top:k(aK),left:k(aL)})&&aE.sw.css({top:k(aK)});"b" in aE&&aE.b.css({top:k(aK)})&&aE.r.css({left:k(aL)})}function an(aH,aI){F.css({top:k(-aI),left:k(-aH)});t.css({top:k(aI),left:k(aH)})}function aG(aH,aI){t.width(aH).height(aI)}function ai(){var aH=U.getFixed();U.setPressed([aH.x,aH.y]);U.setCurrent([aH.x2,aH.y2])}function aD(){if(aq){return am()}}function am(){var aH=U.getFixed();aG(aH.w,aH.h);an(aH.x,aH.y);E.drawBorders&&aj.right.css({left:k(aH.w-1)})&&aj.bottom.css({top:k(aH.h-1)});ag&&ax(aH);aq||aF();E.onChange(S(aH))}function aF(){t.show();ac.css("opacity",E.bgOpacity);aq=true}function aB(){aC();t.hide();ac.css("opacity",1);aq=false}function ao(){aB();ac.css("opacity",1);aq=false}function aw(){ag=true;ax(U.getFixed());I.show()}function aC(){ag=false;I.hide()}function ay(aH){(x=aH)?aC():aw()}function au(){var aH=U.getFixed();ay(false);ai()}aC();j.append(a("
").addClass(y("tracker")).mousedown(c("move")).css({cursor:"move",position:"absolute",zIndex:360,opacity:0}));return{updateVisible:aD,update:am,release:aB,show:aF,hide:ao,enableHandles:aw,disableHandles:aC,animMode:ay,done:au}}();var L=function(){var ag=function(){},ai=function(){},ah=E.trackDocument;if(!ah){b.mousemove(af).mouseup(aj).mouseout(aj)}function an(){if(ah){a(document).mousemove(af).mouseup(aj)}b.css({zIndex:450})}function am(){if(ah){a(document).unbind("mousemove",af).unbind("mouseup",aj)}b.css({zIndex:290})}function af(ao){ag(C(ao))}function aj(ao){ao.preventDefault();ao.stopPropagation();if(o){o=false;ai(C(ao));E.onSelect(S(U.getFixed()));am();ag=function(){};ai=function(){}}return false}function ak(ap,ao){o=true;ag=ap;ai=ao;an();return false}function al(ao){b.css("cursor",ao)}ac.before(b);return{activateHandlers:ak,setCursor:al}}();var ab=function(){var ai=a('').css({position:"absolute",left:"-30px"}).keydown(af).keyup(aj).blur(ak),al=a("
").css({position:"absolute",overflow:"hidden"}).append(ai);function ag(){if(E.keySupport){ai.show();ai.focus()}}function ak(am){ai.hide()}function aj(an){if(!E.watchShift){return}var ao=V,am;V=an.shiftKey?true:false;if(ao!=V){if(V&&o){am=U.getFixed();z=am.w/am.h}else{z=0}R.update()}an.stopPropagation();an.preventDefault();return false}function ah(an,am,ao){U.moveOffset([am,ao]);R.updateVisible();an.preventDefault();an.stopPropagation()}function af(an){if(an.ctrlKey){return true}aj(an);var am=V?10:1;switch(an.keyCode){case 37:ah(an,-am,0);break;case 39:ah(an,am,0);break;case 38:ah(an,0,-am);break;case 40:ah(an,0,am);break;case 27:R.release();break;case 9:return true}return false}if(E.keySupport){al.insertBefore(ac)}return{watchKeys:ag}}();function k(af){return""+parseInt(af)+"px"}function H(af){return""+parseInt(af)+"%"}function y(af){return E.baseClass+"-"+af}function A(af){var ag=a(af).offset();return[ag.left,ag.top]}function C(af){return[(af.pageX-X[0]),(af.pageY-X[1])]}function B(af){if(af!=ae){L.setCursor(af);ae=af}}function f(ag,ah){X=A(d);L.setCursor(ag=="move"?ag:ag+"-resize");if(ag=="move"){return L.activateHandlers(N(ah),m)}var af=U.getFixed();U.setPressed(U.getCorner(n(ag)));L.activateHandlers(D(ag,af),m)}function D(ag,af){return function(ah){if(!E.aspectRatio&&!z){switch(ag){case"e":ah[1]=af.y2;break;case"w":ah[1]=af.y2;break;case"n":ah[0]=af.x2;break;case"s":ah[0]=af.x2;break}}else{switch(ag){case"e":ah[1]=af.y+1;break;case"w":ah[1]=af.y+1;break;case"n":ah[0]=af.x+1;break;case"s":ah[0]=af.x+1;break}}U.setCurrent(ah);R.update()}}function N(ag){var af=ag;ab.watchKeys();return function(ah){U.moveOffset([ah[0]-af[0],ah[1]-af[1]]);af=ah;R.update()}}function n(af){switch(af){case"n":return"sw";case"s":return"nw";case"e":return"nw";case"w":return"ne";case"ne":return"sw";case"nw":return"se";case"se":return"nw";case"sw":return"ne"}}function c(af){return function(ag){o=true;f(af,C(ag));ag.stopPropagation();ag.preventDefault();return false}}function P(aj,ag,ai){var af=aj.width(),ah=aj.height();if((af>ag)&&ag>0){af=ag;ah=(ag/aj.width())*aj.height()}if((ah>ai)&&ai>0){ah=ai;af=(ai/aj.height())*aj.width()}J=aj.width()/af;e=aj.height()/ah;aj.width(af).height(ah)}function S(af){return{x:parseInt(af.x*J),y:parseInt(af.y*e),x2:parseInt(af.x2*J),y2:parseInt(af.y2*e),w:parseInt(af.w*J),h:parseInt(af.h*e)}}function m(ag){var af=U.getFixed();if(af.w>E.minSelect[0]&&af.h>E.minSelect[1]){R.enableHandles();R.done()}else{R.release()}L.setCursor("crosshair")}function W(af){o=true;X=A(d);R.release();R.disableHandles();B("crosshair");U.setPressed(C(af));L.activateHandlers(aa,m);ab.watchKeys();af.stopPropagation();af.preventDefault();return false}function aa(af){U.setCurrent(af);R.update()}function p(ax){var ar=ax[0],ag=ax[1],aq=ax[2],af=ax[3];if(x){return}var ap=U.flipCoords(ar,ag,aq,af);var av=U.getFixed();var ai=initcr=[av.x,av.y,av.x2,av.y2];var ah=E.animationDelay;var an=ai[0];var am=ai[1];var aq=ai[2];var af=ai[3];var au=ap[0]-initcr[0];var ak=ap[1]-initcr[1];var at=ap[2]-initcr[2];var aj=ap[3]-initcr[3];var ao=0;var al=E.swingSpeed;R.animMode(true);var aw=function(){return function(){ao+=(100-ao)/al;ai[0]=an+((ao/100)*au);ai[1]=am+((ao/100)*ak);ai[2]=aq+((ao/100)*at);ai[3]=af+((ao/100)*aj);if(ao<100){ay()}else{R.done()}if(ao>=99.8){ao=100}G(ai)}}();function ay(){window.setTimeout(aw,ah)}ay()}function G(af){U.setPressed([af[0],af[1]]);U.setCurrent([af[2],af[3]]);R.update()}function u(af){if(typeof(af)!="object"){af={}}E=a.extend(E,af);if(typeof(E.onChange)!=="function"){E.onChange=function(){}}if(typeof(E.onSelect)!=="function"){E.onSelect=function(){}}}function g(){return S(U.getFixed())}function Y(){return U.getFixed()}function r(af){u(af);if("setSelect" in af){G(af.setSelect);R.done()}}if(typeof(v)!="object"){v={}}if("setSelect" in v){G(v.setSelect);R.done()}var s=E.maxSize[0]||0;var Z=E.maxSize[1]||0;var l=E.minSize[0]||0;var O=E.minSize[1]||0;L.setCursor("crosshair");return{animateTo:p,setSelect:G,setOptions:r,tellSelect:g,tellScaled:Y}};a.fn.Jcrop=function(c){function b(f){var e=c.useImg||f.src;var d=new Image();var f=f;d.onload=function(){a(f).hide().after(d);f.Jcrop=a.Jcrop(d,c)};d.src=e}if(typeof(c)!=="object"){c={}}this.each(function(){if("Jcrop" in this){if(c=="api"){return this.Jcrop}else{this.Jcrop.setOptions(c)}}else{b(this)}});return this}})(jQuery); \ No newline at end of file +/** + * Jcrop v.0.9.8 (minimized) + * (c) 2008 Kelly Hallman and DeepLiquid.com + * More information: http://deepliquid.com/content/Jcrop.html + * Released under MIT License - this header must remain with code + */ + + +(function($){$.Jcrop=function(obj,opt) +{var obj=obj,opt=opt;if(typeof(obj)!=='object')obj=$(obj)[0];if(typeof(opt)!=='object')opt={};if(!('trackDocument'in opt)) +{opt.trackDocument=$.browser.msie?false:true;if($.browser.msie&&$.browser.version.split('.')[0]=='8') +opt.trackDocument=true;} +if(!('keySupport'in opt)) +opt.keySupport=$.browser.msie?false:true;var defaults={trackDocument:false,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:.6,borderOpacity:.4,handleOpacity:.5,handlePad:5,handleSize:9,handleOffset:5,edgeMargin:14,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,boxWidth:0,boxHeight:0,boundary:8,animationDelay:20,swingSpeed:3,allowSelect:true,allowMove:true,allowResize:true,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){}};var options=defaults;setOptions(opt);var $origimg=$(obj);var $img=$origimg.clone().removeAttr('id').css({position:'absolute'});$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('
').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);;if(options.addClass)$div.addClass(options.addClass);var $img2=$('').attr('src',$img.attr('src')).css('position','absolute').width(boundx).height(boundy);var $img_holder=$('
').width(pct(100)).height(pct(100)).css({zIndex:310,position:'absolute',overflow:'hidden'}).append($img2);var $hdl_holder=$('
').width(pct(100)).height(pct(100)).css('zIndex',320);var $sel=$('
').css({position:'absolute',zIndex:300}).insertBefore($img).append($img_holder,$hdl_holder);var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var xlimit,ylimit,xmin,ymin;var xscale,yscale,enabled=true;var docOffset=getPos($img),btndown,lastcurs,dimmed,animating,shift_down;var Coords=function() +{var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos) +{var pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];};function setCurrent(pos) +{var pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];};function getOffset() +{return[ox,oy];};function moveOffset(offset) +{var ox=offset[0],oy=offset[1];if(0>x1+ox)ox-=ox+x1;if(0>y1+oy)oy-=oy+y1;if(boundyboundx) +{xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}} +else +{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0) +{yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;} +else if(yy>boundy) +{yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}} +if(xx>x1){if(xx-x1max_x){xx=x1+max_x;} +if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xxmax_x){xx=x1-max_x;} +if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}} +if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;} +if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;} +return last=makeObj(flipCoords(x1,y1,xx,yy));};function rebound(p) +{if(p[0]<0)p[0]=0;if(p[1]<0)p[1]=0;if(p[0]>boundx)p[0]=boundx;if(p[1]>boundy)p[1]=boundy;return[p[0],p[1]];};function flipCoords(x1,y1,x2,y2) +{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2xlimit)) +x2=(xsize>0)?(x1+xlimit):(x1-xlimit);if(ylimit&&(Math.abs(ysize)>ylimit)) +y2=(ysize>0)?(y1+ylimit):(y1-ylimit);if(ymin&&(Math.abs(ysize)0)?(y1+ymin):(y1-ymin);if(xmin&&(Math.abs(xsize)0)?(x1+xmin):(x1-xmin);if(x1<0){x2-=x1;x1-=x1;} +if(y1<0){y2-=y1;y1-=y1;} +if(x2<0){x1-=x2;x2-=x2;} +if(y2<0){y1-=y2;y2-=y2;} +if(x2>boundx){var delta=x2-boundx;x1-=delta;x2-=delta;} +if(y2>boundy){var delta=y2-boundy;y1-=delta;y2-=delta;} +if(x1>boundx){var delta=x1-boundy;y2-=delta;y1-=delta;} +if(y1>boundy){var delta=y1-boundy;y2-=delta;y1-=delta;} +return makeObj(flipCoords(x1,y1,x2,y2));};function makeObj(a) +{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};};return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}();var Selection=function() +{var start,end,dragmode,awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;if(options.drawBorders){borders={top:insertBorder('hline').css('top',$.browser.msie?px(-1):px(0)),bottom:insertBorder('hline'),left:insertBorder('vline'),right:insertBorder('vline')};} +if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');} +options.sideHandles&&createHandles(['n','s','e','w']);options.cornerHandles&&createHandles(['sw','nw','ne','se']);function insertBorder(type) +{var jq=$('
').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;};function dragDiv(ord,zi) +{var jq=$('
').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi});$hdl_holder.append(jq);return jq;};function insertHandle(ord) +{return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).addClass(cssClass('handle'));};function insertDragbar(ord) +{var s=options.handleSize,o=hhs,h=s,w=s,t=o,l=o;switch(ord) +{case'n':case's':w=pct(100);break;case'e':case'w':h=pct(100);break;} +return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});};function createHandles(li) +{for(i in li)handle[li[i]]=insertHandle(li[i]);};function moveHandles(c) +{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;'e'in handle&&handle.e.css({top:px(midvert),left:px(east)})&&handle.w.css({top:px(midvert)})&&handle.s.css({top:px(south),left:px(midhoriz)})&&handle.n.css({left:px(midhoriz)});'ne'in handle&&handle.ne.css({left:px(east)})&&handle.se.css({top:px(south),left:px(east)})&&handle.sw.css({top:px(south)});'b'in handle&&handle.b.css({top:px(south)})&&handle.r.css({left:px(east)});};function moveto(x,y) +{$img2.css({top:px(-y),left:px(-x)});$sel.css({top:px(y),left:px(x)});};function resize(w,h) +{$sel.width(w).height(h);};function refresh() +{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();};function updateVisible() +{if(awake)return update();};function update() +{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);options.drawBorders&&borders['right'].css({left:px(c.w-1)})&&borders['bottom'].css({top:px(c.h-1)});seehandles&&moveHandles(c);awake||show();options.onChange(unscale(c));};function show() +{$sel.show();$img.css('opacity',options.bgOpacity);awake=true;};function release() +{disableHandles();$sel.hide();$img.css('opacity',1);awake=false;};function showHandles() +{if(seehandles) +{moveHandles(Coords.getFixed());$hdl_holder.show();}};function enableHandles() +{seehandles=true;if(options.allowResize) +{moveHandles(Coords.getFixed());$hdl_holder.show();return true;}};function disableHandles() +{seehandles=false;$hdl_holder.hide();};function animMode(v) +{(animating=v)?disableHandles():enableHandles();};function done() +{animMode(false);refresh();};var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360}) +$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,done:done};}();var Tracker=function() +{var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;if(!trackDoc) +{$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);} +function toFront() +{$trk.css({zIndex:450});if(trackDoc) +{$(document).mousemove(trackMove).mouseup(trackUp);}} +function toBack() +{$trk.css({zIndex:290});if(trackDoc) +{$(document).unbind('mousemove',trackMove).unbind('mouseup',trackUp);}} +function trackMove(e) +{onMove(mouseAbs(e));};function trackUp(e) +{e.preventDefault();e.stopPropagation();if(btndown) +{btndown=false;onDone(mouseAbs(e));options.onSelect(unscale(Coords.getFixed()));toBack();onMove=function(){};onDone=function(){};} +return false;};function activateHandlers(move,done) +{btndown=true;onMove=move;onDone=done;toFront();return false;};function setCursor(t){$trk.css('cursor',t);};$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}();var KeyManager=function() +{var $keymgr=$('').css({position:'absolute',left:'-30px'}).keypress(parseKey).blur(onBlur),$keywrap=$('
').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys() +{if(options.keySupport) +{$keymgr.show();$keymgr.focus();}};function onBlur(e) +{$keymgr.hide();};function doNudge(e,x,y) +{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible();};e.preventDefault();e.stopPropagation();};function parseKey(e) +{if(e.ctrlKey)return true;shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode) +{case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:Selection.release();break;case 9:return true;} +return nothing(e);};if(options.keySupport)$keywrap.insertBefore($img);return{watchKeys:watchKeys};}();function px(n){return''+parseInt(n)+'px';};function pct(n){return''+parseInt(n)+'%';};function cssClass(cl){return options.baseClass+'-'+cl;};function getPos(obj) +{var pos=$(obj).offset();return[pos.left,pos.top];};function mouseAbs(e) +{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];};function myCursor(type) +{if(type!=lastcurs) +{Tracker.setCursor(type);lastcurs=type;}};function startDragMode(mode,pos) +{docOffset=getPos($img);Tracker.setCursor(mode=='move'?mode:mode+'-resize');if(mode=='move') +return Tracker.activateHandlers(createMover(pos),doneSelect);var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);};function dragmodeHandler(mode,f) +{return function(pos){if(!options.aspectRatio)switch(mode) +{case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;} +else switch(mode) +{case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;} +Coords.setCurrent(pos);Selection.update();};};function createMover(pos) +{var lloc=pos;KeyManager.watchKeys();return function(pos) +{Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};};function oppLockCorner(ord) +{switch(ord) +{case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';};};function createDragger(ord) +{return function(e){if(options.disabled)return false;if((ord=='move')&&!options.allowMove)return false;btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};};function presize($obj,w,h) +{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0) +{nw=w;nh=(w/$obj.width())*$obj.height();} +if((nh>h)&&h>0) +{nh=h;nw=(h/$obj.height())*$obj.width();} +xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);};function unscale(c) +{return{x:parseInt(c.x*xscale),y:parseInt(c.y*yscale),x2:parseInt(c.x2*xscale),y2:parseInt(c.y2*yscale),w:parseInt(c.w*xscale),h:parseInt(c.h*yscale)};};function doneSelect(pos) +{var c=Coords.getFixed();if(c.w>options.minSelect[0]&&c.h>options.minSelect[1]) +{Selection.enableHandles();Selection.done();} +else +{Selection.release();} +Tracker.setCursor(options.allowSelect?'crosshair':'default');};function newSelection(e) +{if(options.disabled)return false;if(!options.allowSelect)return false;btndown=true;docOffset=getPos($img);Selection.disableHandles();myCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();Selection.update();e.stopPropagation();e.preventDefault();return false;};function selectDrag(pos) +{Coords.setCurrent(pos);Selection.update();};function newTracker() +{var trk=$('
').addClass(cssClass('tracker'));$.browser.msie&&trk.css({opacity:0,backgroundColor:'white'});return trk;};function animateTo(a) +{var x1=a[0]/xscale,y1=a[1]/yscale,x2=a[2]/xscale,y2=a[3]/yscale;if(animating)return;var animto=Coords.flipCoords(x1,y1,x2,y2);var c=Coords.getFixed();var animat=initcr=[c.x,c.y,c.x2,c.y2];var interv=options.animationDelay;var x=animat[0];var y=animat[1];var x2=animat[2];var y2=animat[3];var ix1=animto[0]-initcr[0];var iy1=animto[1]-initcr[1];var ix2=animto[2]-initcr[2];var iy2=animto[3]-initcr[3];var pcent=0;var velocity=options.swingSpeed;Selection.animMode(true);var animator=function() +{return function() +{pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent<100)animateStart();else Selection.done();if(pcent>=99.8)pcent=100;setSelectRaw(animat);};}();function animateStart() +{window.setTimeout(animator,interv);};animateStart();};function setSelect(rect) +{setSelectRaw([rect[0]/xscale,rect[1]/yscale,rect[2]/xscale,rect[3]/yscale]);};function setSelectRaw(l) +{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();};function setOptions(opt) +{if(typeof(opt)!='object')opt={};options=$.extend(options,opt);if(typeof(options.onChange)!=='function') +options.onChange=function(){};if(typeof(options.onSelect)!=='function') +options.onSelect=function(){};};function tellSelect() +{return unscale(Coords.getFixed());};function tellScaled() +{return Coords.getFixed();};function setOptionsNew(opt) +{setOptions(opt);interfaceUpdate();};function disableCrop() +{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');};function enableCrop() +{options.disabled=false;interfaceUpdate();};function cancelCrop() +{Selection.done();Tracker.activateHandlers(null,null);};function destroy() +{$div.remove();$origimg.show();};function interfaceUpdate(alt) +{options.allowResize?alt?Selection.enableOnly():Selection.enableHandles():Selection.disableHandles();Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');$div.css('backgroundColor',options.bgColor);if('setSelect'in options){setSelect(opt.setSelect);Selection.done();delete(options.setSelect);} +if('trueSize'in options){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;} +xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if('outerImage'in options) +{$img.attr('src',options.outerImage);delete(options.outerImage);} +Selection.refresh();};$hdl_holder.hide();interfaceUpdate(true);var api={animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},release:Selection.release,destroy:destroy};$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options) +{function attachWhenDone(from) +{var loadsrc=options.useImg||from.src;var img=new Image();img.onload=function(){$.Jcrop(from,options);};img.src=loadsrc;};if(typeof(options)!=='object')options={};this.each(function() +{if($(this).data('Jcrop')) +{if(options=='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);} +else attachWhenDone(this);});return this;};})(jQuery); \ No newline at end of file diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 33820e0ac..0a03f6697 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -167,7 +167,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20090123'); $scripts->add_data( 'thickbox', 'group', 1 ); - $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.5-1'); + $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8'); if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) { $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.2.0-20081031'); @@ -442,7 +442,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081210' ); $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090319' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' ); - $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.5' ); + $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); foreach ( $rtl_styles as $rtl_style ) $styles->add_data( $rtl_style, 'rtl', true );