From 55c1b4f3a0686221d3efc6ad3eb2a8870b8c75a7 Mon Sep 17 00:00:00 2001 From: patdenice Date: Fri, 15 Apr 2011 15:40:23 +0000 Subject: [PATCH] feature:2259 Add thumbnails regeneration in batch manager git-svn-id: http://piwigo.org/svn/trunk@10389 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/batch_manager_global.php | 66 +++++++ .../default/template/batch_manager_global.tpl | 105 ++++++++++ themes/default/images/progressbar.gif | Bin 0 -> 120 bytes themes/default/images/progressbg_black.gif | Bin 0 -> 1626 bytes themes/default/images/progressbg_green.gif | Bin 0 -> 1308 bytes themes/default/images/progressbg_orange.gif | Bin 0 -> 1308 bytes themes/default/images/progressbg_red.gif | Bin 0 -> 1308 bytes themes/default/images/progressbg_yellow.gif | Bin 0 -> 1308 bytes .../default/js/plugins/jquery.progressbar.js | 186 ++++++++++++++++++ .../js/plugins/jquery.progressbar.min.js | 20 ++ 10 files changed, 377 insertions(+) create mode 100644 themes/default/images/progressbar.gif create mode 100644 themes/default/images/progressbg_black.gif create mode 100644 themes/default/images/progressbg_green.gif create mode 100644 themes/default/images/progressbg_orange.gif create mode 100644 themes/default/images/progressbg_red.gif create mode 100644 themes/default/images/progressbg_yellow.gif create mode 100644 themes/default/js/plugins/jquery.progressbar.js create mode 100644 themes/default/js/plugins/jquery.progressbar.min.js diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php index 11cafe02d..065fa318f 100644 --- a/admin/batch_manager_global.php +++ b/admin/batch_manager_global.php @@ -33,6 +33,15 @@ if (!defined('PHPWG_ROOT_PATH')) } include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); +include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php'); +prepare_upload_configuration(); + +$upload_form_config = get_upload_form_config(); +foreach ($upload_form_config as $param_shortname => $param) +{ + $param_name = 'upload_form_'.$param_shortname; + $form_values[$param_shortname] = $conf[$param_name]; +} // +-----------------------------------------------------------------------+ // | Check Access and exit when user status is not ok | @@ -394,6 +403,61 @@ SELECT id, path ); } + if ('regenerateThumbnails' == $action) + { + if ($_POST['regenerateSuccess'] != '0') + array_push($page['infos'], sprintf(l10n('%s thumbnails have been regenerated'), $_POST['regenerateSuccess'])); + + if ($_POST['regenerateError'] != '0') + array_push($page['warnings'], sprintf(l10n('%s thumbnails have been regenerated'), $_POST['regenerateError'])); + + // Update configuration + $fields = array('thumb_maxwidth', 'thumb_maxheight', 'thumb_quality'); + $updates = array(); + foreach ($fields as $field) + { + $value = null; + if (!empty($_POST[$field])) + { + $value = $_POST[$field]; + } + + if (preg_match($upload_form_config[$field]['pattern'], $value) + and $value >= $upload_form_config[$field]['min'] + and $value <= $upload_form_config[$field]['max']) + { + $conf['upload_form_'.$field] = $value; + $updates[] = array( + 'param' => 'upload_form_'.$field, + 'value' => $value + ); + } + else + { + $updates = null; + break; + } + $form_values[$field] = $value; + } + if (!empty($updates)) + { + mass_updates( + CONFIG_TABLE, + array( + 'primary' => array('param'), + 'update' => array('value') + ), + $updates + ); + } + function regenerateThumbnails_prefilter($content, $smarty) + { + return str_replace('{$thumbnail.TN_SRC}', '{$thumbnail.TN_SRC}?rand='.md5(uniqid(rand(), true)), $content); + } + $template->set_prefilter('batch_manager_global', 'regenerateThumbnails_prefilter'); + $template->delete_compiled_templates(); + } + trigger_action('element_set_global_action', $action, $collection); } @@ -430,6 +494,8 @@ $template->assign( 'prefilters' => $prefilters, 'filter' => $_SESSION['bulk_manager_filter'], 'selection' => $collection, + 'all_elements' => $page['cat_elements_id'], + 'upload_form_settings' => $form_values, 'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')), 'F_ACTION'=>$base_url.get_query_string_diff(array('cat')), ) diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index cce2b74c8..e97a53ad6 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -6,6 +6,8 @@ {/literal}{/footer_script} {combine_script id='jquery.fcbkcomplete' load='footer' require='jquery' path='themes/default/js/plugins/jquery.fcbkcomplete.js'} +{combine_script id='jquery.progressBar' load='footer' path='plugins/regenerateThumbnails/js/jquery.progressbar.min.js'} +{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'} {footer_script require='jquery.fcbkcomplete'}{literal} jQuery(document).ready(function() { @@ -26,11 +28,20 @@ jQuery(document).ready(function() { var nb_thumbs_page = {$nb_thumbs_page}; var nb_thumbs_set = {$nb_thumbs_set}; var applyOnDetails_pattern = "{'on the %d selected photos'|@translate}"; +var elements = new Array(); +var all_elements = [{','|@implode:$all_elements}]; var selectedMessage_pattern = "{'%d of %d photos selected'|@translate}"; var selectedMessage_none = "{'No photo selected, %d photos in current set'|@translate}"; var selectedMessage_all = "{'All %d photos are selected'|@translate}"; +var regenerateThumbnailsMessage = "{'Thumbnails generation in progress...'|@translate}"; {literal} +var queuedManagerThumbnails = $.manageAjax.create('queued', { + queue: true, + cacheResponse: false, + maxRequests: 3 +}); + function str_repeat(i, m) { for (var o = []; m > 0; o[--m] = i); return o.join(''); @@ -78,6 +89,21 @@ function sprintf() { return o.join(''); } +function progress(val, max, success) { + jQuery('#progressBar').progressBar(val, { + max: max, + textFormat: 'fraction', + boxImage: 'themes/default/images/progressbar.gif', + barImage: 'themes/default/images/progressbg_orange.gif' + }); + type = success ? 'regenerateSuccess': 'regenerateError' + s = jQuery('[name="'+type+'"]').val(); + jQuery('[name="'+type+'"]').val(++s); + + if (val == max) + jQuery('#applyAction').click(); +} + $(document).ready(function() { function checkPermitAction() { var nbSelected = 0; @@ -300,6 +326,58 @@ $(document).ready(function() { return false; }); + jQuery('#applyAction').click(function() { + if (jQuery('[name="selectAction"]').val() == 'regenerateThumbnails') { + if (elements.length != 0) + return true; + + if (jQuery('input[name="setSelected"]').attr('checked')) + elements = all_elements; + else + jQuery('input[name="selection[]"]').each(function() { + if (jQuery(this).attr('checked')) { + elements.push(jQuery(this).val()); + } + }); + + maxwidth = jQuery('input[name="thumb_maxwidth"]').val(); + maxheight = jQuery('input[name="thumb_maxheight"]').val(); + progressBar_max = elements.length; + todo = 0; + + jQuery('#thumb_config').hide(); + jQuery('#applyActionBlock').hide(); + jQuery('select[name="selectAction"]').hide(); + jQuery('#regenerationMsg').show(); + jQuery('#regenerationText').html(regenerateThumbnailsMessage); + jQuery('#progressBar').progressBar(0, { + max: progressBar_max, + textFormat: 'fraction', + boxImage: 'themes/default/images/progressbar.gif', + barImage: 'themes/default/images/progressbg_orange.gif' + }); + + for (i=0;i{'add to caddie'|@translate} {/if} + {if !empty($element_set_global_plugins_actions)} {foreach from=$element_set_global_plugins_actions item=action} @@ -559,6 +638,32 @@ jQuery(window).load(function() {
+ +
+ + + + + + + + + + + + + +
{'Maximum Width'|@translate} {'pixels'|@translate}
{'Maximum Height'|@translate} {'pixels'|@translate}
{'Image Quality'|@translate} %
+
+ + + + {if !empty($element_set_global_plugins_actions)} {foreach from=$element_set_global_plugins_actions item=action} diff --git a/themes/default/images/progressbar.gif b/themes/default/images/progressbar.gif new file mode 100644 index 0000000000000000000000000000000000000000..abe588c15c4eda53bcecc0ab00434c925cb1b45f GIT binary patch literal 120 zcmV-;0EhoaNk%w1VS4}!0FeLyVr61;d3%F}ga7~kA^8LW2LJ;AEC2ui0DAxo0006> zT!5*|?GK}zlnMie-n{z{hT=$;rU?ky$+qqbpGZvC_U+C1&iA733kq?-q4CHnBA3kE astJWEqtqebP|XTcn2Prc4vQz30suSWax&ro literal 0 HcmV?d00001 diff --git a/themes/default/images/progressbg_black.gif b/themes/default/images/progressbg_black.gif new file mode 100644 index 0000000000000000000000000000000000000000..74fd1f9b3e052e2ca18058526c39f6eaef580cba GIT binary patch literal 1626 zcmZ?wbhEHb{J_A&(9XcX%*^cP=jZS5KWEOIsZ*!+_xJbq_I7u7Po6xvt*x!5rlz8z zqNJpxtgNh|p`od%simc*s;a84uI|&PPaPc{A3uIfN=iydNQjM%jgODd%*;$nOG{5r zPf1CMh=_=aihB3%-TU|Nqobqm-@kwF-n}bVu3Wx+`ND+@=g*&K7zLvtFwh~O19AW; zFR*j`V_@Wv@z}87U^9oXR?LYF3lFz5DtXQE*tqCuw*)hXz=S}h<9!PDO?xyhJz`*D z4O(VWut2qOI!B0{$ASb#W;WiUS0x`FFt*GWkh>7GVDmxWIW~>o{;X7R3Y^O$!xGE2 zW!c5m?n{|?xfGc$uC^@nda-j$I@9_@X`hJG+t%LRUhw$TT<`7c?(VMOl(=zv(^Ez+ z)_`?6KN~d8Ei#|{Pv!T4mx&vAmrRO{u~_?biJiK1T}`Ob;|2cRNy~11T^2Z}B6xM& z*CcuP@U=g>N5ZM( z98XO4{d0SF-`>Bu_McUQ?(C+o7Z$Cay|*u7P0;2Y7oUIeF+2F_aKB{FS6)TOnlC~c zqEl)=t$cd7kwZ;GJb=$cqcL72V8Vg?Igw^z`NDPucLOi6M%>SzPmaB8WhqTXBHCGO?JoqBI#G|eBVX^Ka zj+=FR|BB4-cvr|8TafA5@OXN{y0n9=5-AfJS*3CoJY$n7xX{QhU-N)*PT{#q$JyCM z8ywk-E?KJ2Enj!?*}TG2kr@lcpX^-5T5v8iV{YfGndJrM*oLi{Ib!fRl z3&X1wOQvP5TDho8>eb5StGrgN{l-8QXmriN1DRn$(WUcyk>e=jGJ1cdzed|0k z=eHi}Y+O{ul)Yl9e2Rj`yc)LK&o@*&JGo+hU)6@3*^}Pw)Lbs-arz*~i$&f}yI!rc zZrc53nK#p(kDI*L@A`VrI)BgaYuW4fGu*D$-~WHn>g+9-|DDp@R5;6e#jLAgvvf8d z?aF?;_0p!7uV%0&F4){+iX5-{rS(P3m*4tN-o%)USoX0Uz*qCoZ;!28)r=_D=;|B%iXp0TKlh^ zMTe@p4wNoDlGU@EHO;z8<51l6xjDx()1$x5&pW;Ijne}4FTGCp8`$4%f6(wh*5aXt zL|xOvE@i!n$1U!4KORkBKeyw_MDxBw&U4D&{d~T_+2xXlWMRmq7fbw0etE23elO60 G!5RRh`|ElD literal 0 HcmV?d00001 diff --git a/themes/default/images/progressbg_green.gif b/themes/default/images/progressbg_green.gif new file mode 100644 index 0000000000000000000000000000000000000000..f3f3bf681141982dc72429b21b4c8af7dbfd2b70 GIT binary patch literal 1308 zcmZ?wbhEHb{J_A&(9Xb+l$vz#b;JHwRXbng?Rb&B?RnasS0x*s#jbelz3h?O(udAV z9y+ak61L%K)Yq?HH$P8Y{Uo6GmT=cio{6`mr`}bWa!0ZCI#bJahEJb9wclWS_Uzf+ zyLWHhy2UUGMnhmIgn$mnk)XW5&hd|dkweB~!-9j&9Ku>LCpIiR+%BN(HOFIP(jf*W zwhS4E28YIeHYceEFFrCfv2cm4h}qfT*gV}pdWOr%qNS&2=%+7Rb5kh&++^$Qdq+5@ zr2Ege3b%?lwPoeyib#-+FZ^@S*8xJ(IGrLXtbE9F|#f27UKe5 ze|J*~xABYU9Yq^o-95d1ef*l(y>+$)4F@6)^1Qisbmol}Ub}dutlM;c>fAZiotzZ* zYy0Ns=NHVbt9AIH+I(O!zd^woA*M@L*Tg;!Ia}5EX2zD}{nu=zw_Ut&pqYDq)d3S` zHUT*fwcK6ba%Y~ceBSf!N9D&8=L&-4Me zP3E%uP5-?5zPkJV`T6-R96~G>jI5#}84p;*Vir7T;&w}T(9B_^v9Ot6Ok!aRZ&*fR zlZ2K>Vyk%455*RlvKI<$8p~EZ>eAWv;!(H3F^$JPCf76^*(4(j9yO{aX*9Npw!BcD z;NcrZz&%;MSPv^WQ~ z{>*hd6K7|Xy-1r7pts`*Tg9`L&*#;Ad-;5R1Dn>11ubG#YLk*?Sw3g!Jms0P*jb5d y`I5e%sLV#0lvOX6%_)2Ja`}Qbtye3SOv_s3x?NSD+|H4{TcmQQK=FDE)AcBZPoF;Bh+}*9?AhJB zcW>Rg#V`s+LtrR`fDXu!puE7&@sEL#L&jsnf`iQ*!dfvWHY_~cE}-l+$75sCAqFP4 z3>k+8hsJ(3C#eT7J~A}1aEYym+1cROJl#NghReyKrKe};r!QM`Qz-r1Wb5pEM>waX z`_H!uw~9EmW##4N0gJundTm{Gb#(-9$(J7+4>YqgyG{CYqhZ;_g%)Q&xkv}E4VbTg zcT){F>Okb+!c!2O@x`_~7tAX8S&wrq>5&iEggpEB^fJ^sDeq z=Cb=u|GfIXy8Hh5`S~pzLM#@HtfC?r4_L%v7CdO;c1w8B%weRlu$f;>Vqpt!SVm%# zgqBBQt9a56#TJ>e7Yb||%T_$<(%JUnQMbV{jmJGE*EAg2BqIzSHL50QG`5MhyilIt zcNYT3{5OtVk=^HHaIplm6UjSaxxt#o13T(!py3=Ih_x zl)`QNB6>&B##eVwZ(kq3CU$R~Z9&6j7-=kQ<`8D%fhCIsm1c*0ikY~}NLHQ!!7pWncy^ wFDNRrQ6^>8%Vl%QUcFqtpiS%5iY3#sR=KWNw(8ZYHQQdjTFuPH%EDj`0N~Rv?EnA( literal 0 HcmV?d00001 diff --git a/themes/default/images/progressbg_yellow.gif b/themes/default/images/progressbg_yellow.gif new file mode 100644 index 0000000000000000000000000000000000000000..fdb0dfc981cbbfbca4e80f4ff5ccfac247b3be91 GIT binary patch literal 1308 zcmZ?wbhEHb{J_A&(9Xb+nws?bX~U~0RWBaqy?B`Y{6X5Q$0g71#Xi36{phCK!yC>I zZ#X@<6ZZ6O)Yq?HpFc=^awp){dEuMqcy3>izI$2a&Lzd`r?arL;I#qs z_3v&<;WmB|y`yO3tGlPSua937ySL7^py5EoL7q4Fj?TQX!fO|=ly#fVPn|obx|5T_ zer@0U{QQF1b+ryZRGSYh<~JxYCWcA!n-^-^|#Oy#Jc5^tOu^4m5MmuR37D z%qAemp_aSrTkg!WmCt+L{iytS;#^_y^UPZ7^A8^!{>N-&c3vKR-Xeg+qwNf{|5JB;x^#Sj>V4P26q?51KiQG!{1Vi%BeO;SI}3 zY?9FONNg2P`k~k&Q}#lEO=H=LM_oGGUOehHIHvKq$K;xZBb#J|!J|giB#p*4(Uup= z6P&z$EN*i(s!-{$)$&Z4>=(A+;FOTC%%@W$(pEm57E|`}>GXuO1rH{vlvzBRoEGPx z)}Ogh1UM^qIruAyYl4)71Tvsex^=j3cZLeOfW@ck$VXy`OH^w~^ literal 0 HcmV?d00001 diff --git a/themes/default/js/plugins/jquery.progressbar.js b/themes/default/js/plugins/jquery.progressbar.js new file mode 100644 index 000000000..7239954f5 --- /dev/null +++ b/themes/default/js/plugins/jquery.progressbar.js @@ -0,0 +1,186 @@ +/* + * jQuery Progress Bar plugin + * Version 2.0 (06/22/2009) + * @requires jQuery v1.2.1 or later + * + * Copyright (c) 2008 Gary Teo + * http://t.wits.sg + +USAGE: + $(".someclass").progressBar(); + $("#progressbar").progressBar(); + $("#progressbar").progressBar(45); // percentage + $("#progressbar").progressBar({showText: false }); // percentage with config + $("#progressbar").progressBar(45, {showText: false }); // percentage with config +*/ +(function($) { + $.extend({ + progressBar: new function() { + + this.defaults = { + steps : 20, // steps taken to reach target + stepDuration : 20, + max : 100, // Upon 100% i'd assume, but configurable + showText : true, // show text with percentage in next to the progressbar? - default : true + textFormat : 'percentage', // Or otherwise, set to 'fraction' + width : 120, // Width of the progressbar - don't forget to adjust your image too!!! // Image to use in the progressbar. Can be a single image too: 'images/progressbg_green.gif' + height : 12, // Height of the progressbar - don't forget to adjust your image too!!! + callback : null, // Calls back with the config object that has the current percentage, target percentage, current image, etc + boxImage : 'images/progressbar.gif', // boxImage : image around the progress bar + barImage : { + 0: 'images/progressbg_red.gif', + 30: 'images/progressbg_orange.gif', + 70: 'images/progressbg_green.gif' + }, + + + // Internal use + running_value : 0, + value : 0, + image : null + }; + + /* public methods */ + this.construct = function(arg1, arg2) { + var argvalue = null; + var argconfig = null; + + if (arg1 != null) { + if (!isNaN(arg1)) { + argvalue = arg1; + if (arg2 != null) { + argconfig = arg2; + } + } else { + argconfig = arg1; + } + } + + return this.each(function(child) { + var pb = this; + var config = this.config; + + if (argvalue != null && this.bar != null && this.config != null) { + this.config.value = parseInt(argvalue) + if (argconfig != null) + pb.config = $.extend(this.config, argconfig); + config = pb.config; + } else { + var $this = $(this); + var config = $.extend({}, $.progressBar.defaults, argconfig); + config.id = $this.attr('id') ? $this.attr('id') : Math.ceil(Math.random() * 100000); // random id, if none provided + + if (argvalue == null) + argvalue = $this.html().replace("%","") // parse percentage + + config.value = parseInt(argvalue); + config.running_value = 0; + config.image = getBarImage(config); + + var numeric = ['steps', 'stepDuration', 'max', 'width', 'height', 'running_value', 'value']; + for (var i=0; i= parseInt(i)) { + image = config.barImage[i]; + } else { break; } + } + } + return image; + } + + function getText(config) { + if (config.showText) { + if (config.textFormat == 'percentage') { + return " " + Math.round(config.running_value) + "%"; + } else if (config.textFormat == 'fraction') { + return " " + config.running_value + '/' + config.max; + } + } + } + + config.increment = Math.round((config.value - config.running_value)/config.steps); + if (config.increment < 0) + config.increment *= -1; + if (config.increment < 1) + config.increment = 1; + + var t = setInterval(function() { + var pixels = config.width / 100; // Define how many pixels go into 1% + + if (config.running_value > config.value) { + if (config.running_value - config.increment < config.value) { + config.running_value = config.value; + } else { + config.running_value -= config.increment; + } + } + else if (config.running_value < config.value) { + if (config.running_value + config.increment > config.value) { + config.running_value = config.value; + } else { + config.running_value += config.increment; + } + } + + if (config.running_value == config.value) + clearInterval(t); + + var $bar = $("#" + config.id + "_pbImage"); + var $text = $("#" + config.id + "_pbText"); + var image = getBarImage(config); + if (image != config.image) { + $bar.css("background-image", "url(" + image + ")"); + config.image = image; + } + $bar.css("background-position", (((config.width * -1)) + (getPercentage(config) * pixels)) + 'px 50%'); + $bar.attr('title', getText(config)); + $text.html(getText(config)); + + if (config.callback != null && typeof(config.callback) == 'function') + config.callback(config); + + pb.config = config; + }, config.stepDuration); + }); + }; + } + }); + + $.fn.extend({ + progressBar: $.progressBar.construct + }); + +})(jQuery); \ No newline at end of file diff --git a/themes/default/js/plugins/jquery.progressbar.min.js b/themes/default/js/plugins/jquery.progressbar.min.js new file mode 100644 index 000000000..5001b8f85 --- /dev/null +++ b/themes/default/js/plugins/jquery.progressbar.min.js @@ -0,0 +1,20 @@ + +(function($){$.extend({progressBar:new function(){this.defaults={steps:20,stepDuration:20,max:100,showText:true,textFormat:'percentage',width:120,height:12,callback:null,boxImage:'images/progressbar.gif',barImage:{0:'images/progressbg_red.gif',30:'images/progressbg_orange.gif',70:'images/progressbg_green.gif'},running_value:0,value:0,image:null};this.construct=function(arg1,arg2){var argvalue=null;var argconfig=null;if(arg1!=null){if(!isNaN(arg1)){argvalue=arg1;if(arg2!=null){argconfig=arg2;}}else{argconfig=arg1;}} +return this.each(function(child){var pb=this;var config=this.config;if(argvalue!=null&&this.bar!=null&&this.config!=null){this.config.value=parseInt(argvalue) +if(argconfig!=null) +pb.config=$.extend(this.config,argconfig);config=pb.config;}else{var $this=$(this);var config=$.extend({},$.progressBar.defaults,argconfig);config.id=$this.attr('id')?$this.attr('id'):Math.ceil(Math.random()*100000);if(argvalue==null) +argvalue=$this.html().replace("%","") +config.value=parseInt(argvalue);config.running_value=0;config.image=getBarImage(config);var numeric=['steps','stepDuration','max','width','height','running_value','value'];for(var i=0;i=parseInt(i)){image=config.barImage[i];}else{break;}}} +return image;} +function getText(config){if(config.showText){if(config.textFormat=='percentage'){return" "+Math.round(config.running_value)+"%";}else if(config.textFormat=='fraction'){return" "+config.running_value+'/'+config.max;}}} +config.increment=Math.round((config.value-config.running_value)/config.steps);if(config.increment<0) +config.increment*=-1;if(config.increment<1) +config.increment=1;var t=setInterval(function(){var pixels=config.width/100;if(config.running_value>config.value){if(config.running_value-config.incrementconfig.value){config.running_value=config.value;}else{config.running_value+=config.increment;}} +if(config.running_value==config.value) +clearInterval(t);var $bar=$("#"+config.id+"_pbImage");var $text=$("#"+config.id+"_pbText");var image=getBarImage(config);if(image!=config.image){$bar.css("background-image","url("+image+")");config.image=image;} +$bar.css("background-position",(((config.width*-1))+(getPercentage(config)*pixels))+'px 50%');$bar.attr('title',getText(config));$text.html(getText(config));if(config.callback!=null&&typeof(config.callback)=='function') +config.callback(config);pb.config=config;},config.stepDuration);});};}});$.fn.extend({progressBar:$.progressBar.construct});})(jQuery); \ No newline at end of file