Changeset 1031788
- Timestamp:
- 11/24/2014 01:47:45 PM (11 years ago)
- Location:
- advanced-uploader/trunk
- Files:
-
- 4 edited
-
js/upload.js (modified) (5 diffs)
-
js/upload.min.js (modified) (1 diff)
-
readme.txt (modified) (2 diffs)
-
upload.php (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
advanced-uploader/trunk/js/upload.js
r1027784 r1031788 254 254 file.status = plupload.FAILED; 255 255 up.trigger('QueueChanged', file); 256 var text = {response: "<div class='media-upload-error'><B>"+file.name+"</B> "+response.data.message+"</div>"} 256 var text = {response: "<div class='media-upload-error'><B>"+file.name+"</B> "+response.data.message+"</div>"}; 257 257 up.trigger('FileUploaded', file, text); 258 258 } … … 271 271 _wpPluploadSettings.defaults.preinit = adv_preinit; 272 272 max_file_size = parseInt(_wpPluploadSettings.defaults.filters.max_file_size); 273 updatehtml(); 273 274 if (typeof adv_uploader === 'boolean' && adv_uploader) 274 275 _wpPluploadSettings.defaults.filters.max_file_size = adv_max_file_size; … … 312 313 } 313 314 314 // do browser checks add listeners on document ready315 315 jQuery(document).ready(function() { 316 if( max_file_size > 0 ) 317 updatehtml(); 318 }); 319 320 // update the page HMTL so that page works correctly with plugin. 321 function updatehtml () { 316 322 jQuery('.media-upload-form').on('click.uploader', function(e) { 317 323 var target = jQuery(e.target); … … 333 339 334 340 //create checkbox for changing which uploader is used 335 if (adv_replace_default ) {341 if (adv_replace_default && max_file_size > 0) { 336 342 max_file_size_display = convertBytes (max_file_size); 337 343 adv_max_file_size_display = convertBytes (adv_max_file_size); … … 376 382 }); 377 383 } 378 } );384 } 379 385 380 386 function show_hide_uploader (e) { -
advanced-uploader/trunk/js/upload.min.js
r1027794 r1031788 1 'use strict';'use strict';var max_file_size=0;var max_file_size_display=0;var adv_max_file_size_display=0;var default_action;var default_url;var blobSlice;var requestFileSystem;var up_plupload;var msgProgLabel=document.createElement("label");msgProgLabel.className="pLabel";var msgProgress=document.createElement("progress");var msgProgressDiv=document.createElement("div");msgProgressDiv.className="progress";msgProgressDiv.appendChild(msgProgLabel);msgProgressDiv.appendChild(msgProgress);(function(j){j["mOxieFileAPIReader"]=function(i){return function(e,f,g){var h=new mOxie.FileReader();h.onload=function(a){var b=this.result.search(/;base64,/);var c=this.result.slice(b+8);var d=new D(window.atob(c));f(d)};h.readAsDataURL(i)}}})(this);var registerLog=function(a,b){jQuery('<div class="'+b+'">'+a+'</div>').appendTo('#log')};function adv_plupload_defaults(){var x={PostInit:function(b){var c=jQuery('#plupload-upload-ui');if(c.length!=0){setResize(getUserSetting('upload_resize',false));if(b.features.dragdrop&&!jQuery(document.body).hasClass('mobile')){c.addClass('drag-drop');jQuery('#drag-drop-area').bind('dragover.wp-uploader',function(){c.addClass('drag-over')}).bind('dragleave.wp-uploader, drop.wp-uploader',function(){c.removeClass('drag-over')})}else{c.removeClass('drag-drop');jQuery('#drag-drop-area').unbind('.wp-uploader')}if(b.runtime=='html4')jQuery('.upload-flash-bypass').hide()}default_action=b.settings.multipart_params['action'];default_url=b.settings.url;up_plupload=b;jQuery('.drop-instructions').show();b.settings.drop_element[0].addEventListener('dragenter',function(e){var a=document.getElementsByClassName('uploader-window');if(a.length>0){a[0].style.display='block';a[0].style.opacity=1;a[0].addEventListener('dragleave',function(e){a[0].style.display='none';a[0].style.opacity=0},false);a[0].addEventListener('drop',function(e){a[0].style.display='none';a[0].style.opacity=0},false)}},false);b.settings.resize=new Object;b.settings.resize.enabled=false;if(adv_uploader){b.settings.chunk_size=max_file_size-2048;b.settings.filters.max_file_size=adv_max_file_size}},FilesAdded:function(a,b){if(adv_uploader){a.settings.url=ajaxurl;a.settings.multipart_params['destinations']=JSON.stringify(destinations);a.settings.multipart_params['action']='adv_upload_plupload';a.settings.multipart_params['security']=security;var c=true;if(typeof b[0].dest==='undefined'){if(typeof wpUploaderInit==='object')c=false;selectDestination(c,b,function(){a.trigger("FilesAdded",b)});return false}else if(typeof b[0].dest==='undefined'){for(var i=0;i<b.length;i++)b[i].dest=0}}else{a.settings.url=default_url;a.settings.max_retries=0;delete a.settings.multipart_params['destinations'];a.settings.multipart_params['action']=default_action;delete a.settings.multipart_params['security']}},BeforeUpload:function(a,b){if(adv_uploader){a.settings.multipart_params['fileDest']=b.dest;a.settings.multipart_params['album']=b.album}},FileUploaded:function(q,r,s){if(adv_uploader){var t=function(d,f,g){var h=new FormData();h.append('action','adv_file_upload_thumbs');h.append('security',security);h.append('filename',u.data.name);if(typeof _wpPluploadSettings==='object')h.append('post_id',wp.media.model.settings.post.id);h.append('meta',JSON.stringify(f));h.append('fileDest',r.dest);h.append('album',r.album);h.append('destinations',JSON.stringify(destinations));for(var j=0;j<g.length;j++){var k=g[j];var l=atob(d[k].split(',')[1]);var m=[];for(var i=0;i<l.length;i++){m.push(l.charCodeAt(i))}var n=u.data.name.split('.').pop();if(n.match(/jpg/))var o=new Blob([new Uint8Array(m)],{type:'image/jpeg'});else var o=new Blob([new Uint8Array(m)],{type:'image/png'});h.append('thumbs[]',o,f[k].file)} var p=jQuery('#media-item-'+r.id);jQuery('.percent',p).html('Completing Upload');jQuery.ajax({'type':"post",'url':ajaxurl,'data':h,'enctype':'multipart/form-data','encoding':'multipart/form-data','cache':false,'processData':false,'contentType':false}).done(function(a){if(typeof a==='string'&&a!=''){if(typeof wpUploaderInit==='object'){try{var b=JSON.parse(a)}catch(e){q.trigger("FileUploaded",r,{'response':'media-upload-error'});return}if(b.success==false){q.trigger("FileUploaded",r,{'response':'media-upload-error'});return}if(b.data.id==false){var c=b.data.id;jQuery('#media-item-'+r.id+' .progress').remove();jQuery('#media-item-'+r.id+' .original').remove();jQuery('<img>').attr({src:b.data.url,class:'pinkynail'}).appendTo('#media-item-'+r.id);jQuery('<div>').attr({class:'filename new'}).html(b.data.name).appendTo('#media-item-'+r.id)}else var c=b.data.id.toString();q.trigger("FileUploaded",r,{'response':c})}else q.trigger("FileUploaded",r,{'response':a})}})};try{var u=JSON.parse(s.response)}catch(e){return}if(u.success=='file_complete'){var v=u.data.name.split('.').pop();if(destinations[r.dest][4]&&v.match(/jpg|jpeg|png/i)){var w=jQuery('#media-item-'+r.id);jQuery('.percent',w).html('Creating thumbs');createThumbImage(r,u.data.name,t,u.data.file)}else if(destinations[r.dest][4]&&v.match(/pdf/i)){var w=jQuery('#media-item-'+r.id);jQuery('.percent',w).html('Creating thumbs');pdf(u.data.file,u.data.name,t)}else t(null,null,new Array());return false}}},Error:function(a,b){alert()},ChunkUploaded:function(a,b,c){var d=jQuery.parseJSON(c.response);if(d&&!d.success){b.status=plupload.FAILED;a.trigger('QueueChanged',b);var e={response:"<div class='media-upload-error'><B>"+b.name+"</B> "+d.data.message+"</div>"};a.trigger('FileUploaded',b,e)}}};if(typeof wpUploaderInit==='object'){wpUploaderInit.preinit=x;max_file_size=parseInt(wpUploaderInit.filters.max_file_size);if(typeof adv_uploader==='boolean'&&adv_uploader)wpUploaderInit.filters.max_file_size=adv_max_file_size}if(typeof _wpPluploadSettings==='object'){_wpPluploadSettings.defaults.preinit=x;max_file_size=parseInt(_wpPluploadSettings.defaults.filters.max_file_size);if(typeof adv_uploader==='boolean'&&adv_uploader)_wpPluploadSettings.defaults.filters.max_file_size=adv_max_file_size}}function toggle_loader(a){if(a=='default'){jQuery('#adv_upload').toggleClass('hidden',true);jQuery('#default_upload').toggleClass('hidden',false)}else{jQuery('#default_upload').toggleClass('hidden',true);jQuery('#adv_upload').toggleClass('hidden',false)}jQuery.ajax({'type':"post",'url':ajaxurl,'data':{'action':"adv_file_upload_set_loader",'loader':a}})}function convertBytes(a){var b='Bytes';if((a%1024)==0){a=a/1024;b='KB'}if(b=='KB'&&(a%1024)==0){a=a/1024;b='MB'}if(b=='MB'&&(a%1024)==0){a=a/1024;b='GB'}return a+' '+b}jQuery(document).ready(function(){jQuery('.media-upload-form').on('click.uploader',function(e){var a=jQuery(e.target);if(a.is('.upload-flash-bypass a')||a.is('a.uploader-html')){var b=jQuery('.max-upload-size').html();b=b.replace(adv_max_file_size_display,max_file_size_display);jQuery('.max-upload-size').html(b);jQuery('#adv_uploader_checkbox_p').hide()}else if(a.is('.upload-html-bypass a')){jQuery('#adv_uploader_checkbox_p').show();if(adv_uploader){var b=jQuery('.max-upload-size').html();b=b.replace(max_file_size_display,adv_max_file_size_display);jQuery('.max-upload-size').html(b)}}});if(adv_replace_default){max_file_size_display=convertBytes(max_file_size);adv_max_file_size_display=convertBytes(adv_max_file_size);var c='';var d=max_file_size_display;if(adv_uploader){c='checked';d=adv_max_file_size_display}var f='<p id="adv_uploader_checkbox_p" style="cursor: pointer;">'+'<input type="checkbox" id="adv_uploader_checkbox" style="margin-right: 5px;" '+c+'>Use advanced uploader</p>';var g=document.getElementById('tmpl-uploader-inline');if(g!==null){var h=new RegExp(max_file_size_display+'|'+max_file_size_display.replace(/ /,''),'i');var i=g.innerHTML.search(h);var j=g.innerHTML.indexOf('</p>',i);g.innerHTML=g.innerHTML.substring(0,i)+d+g.innerHTML.substring(i+max_file_size_display.length,j+4)+f+g.innerHTML.substring(j+4)}var k=jQuery('.max-upload-size').html();if(typeof k==='string'){var h=new RegExp(max_file_size_display+'|'+max_file_size_display.replace(/ /,''),'i');var i=k.search(h);jQuery('.max-upload-size').html(k.substring(0,i)+d+k.substring(i+max_file_size_display.length)).after(f)}jQuery(document).on('click','#adv_uploader_checkbox_p',show_hide_uploader);jQuery(document).on('click','.media-menu-item',function(e){if(e.target.textContent=='Upload Files')if((!adv_uploader&&jQuery('#adv_uploader_checkbox').attr('checked')=='checked')||(adv_uploader&&jQuery('#adv_uploader_checkbox').attr('checked')==undefined))jQuery('#adv_uploader_checkbox_p').click()})}});function show_hide_uploader(e){if(e.target.id.indexOf('adv_uploader_checkbox')==-1)return;if(e.target.type=='checkbox')var a=e.target;else{var a=document.getElementById('adv_uploader_checkbox');if(a.checked)a.checked=false;else a.checked=true}if(a.checked){adv_uploader=true;up_plupload.settings.filters.max_file_size=adv_max_file_size;up_plupload.settings.chunk_size=max_file_size-2048;var b=jQuery('.max-upload-size').html();b=b.replace(max_file_size_display,adv_max_file_size_display);jQuery('.max-upload-size').html(b)}else{adv_uploader=false;up_plupload.settings.filters.max_file_size=max_file_size;up_plupload.settings.chunk_size=0;var b=jQuery('.max-upload-size').html();b=b.replace(adv_max_file_size_display,max_file_size_display);jQuery('.max-upload-size').html(b)}jQuery.ajax({'type':"post",'url':ajaxurl,'data':{'action':"adv_file_upload_set_loader",'loader':adv_uploader}})}var createThumbImage=function(o,p,q,r){var s=new Image();s.src=r;s.onload=function(){var a=s.width;var b=s.height;if(b>sizes['thumbnail']['height']||a>sizes['thumbnail']['width']){var c=new Object();var d=new Object();var e=new Array();var f=b;var g=a;var h='';for(var i in sizes){var b=f;var a=g;var j=sizes[i]['width'];var k=sizes[i]['height'];if(b>k||a>j){if(a>f){if(a>j){b*=j/a;a=j}}else{if(b>k){a*=k/b;b=k}}a=Math.round(a);b=Math.round(b);var l=p.replace(/\.(jpg|jpeg|png)$/i,"-"+a+"x"+b+".jpg");if(h.search(l)==-1){h+=l+';';var m=document.createElement('canvas');m.width=a;m.height=b;var n=m.getContext("2d");n.drawImage(this,0,0,a,b);e.push(i);d[i]=m.toDataURL("image/jpeg",0.9)}c[i]=new Object();c[i].file=l;c[i].width=a;c[i].height=b}}q(d,c,e)}else q(null,null,new Array())}};var pdf=function(p,q,r){PDFJS.disableWorker=true;var s=null;function renderPage(d){s.getPage(d).then(function(a){var b=new Array();for(var c in sizes)b.push(c);createPDFthumb(a,'',b,new Array(),new Object(),new Object())})}function createPDFthumb(a,b,c,d,e,f){var g=c.pop();var h=sizes[g]['width']/a.getViewport(1.0).width;var i=sizes[g]['height']/a.getViewport(1.0).height;var j=h>i?i:h;var k=a.getViewport(j);var l=document.createElement('canvas');var m=l.getContext('2d');l.height=k.height;l.width=k.width;var n=q+"-"+l.width+"x"+l.height+".png";e[g]=new Object();e[g].file=n;e[g].width=l.width;e[g].height=l.height;if(b.search(n)==-1){b+=n+';';var o={canvasContext:m,viewport:k};a.render(o).then(function(){d.push(g);f[g]=l.toDataURL("image/png");if(c.length>0)createPDFthumb(a,b,c,d,e,f);else{r(f,e,d)}})}else{if(c.length>0)createPDFthumb(a,b,c,d,e,f);else{r(f,e,d)}}}var t={};var u=new FileReader();u.onload=function webViewerChangeFileReaderOnload(b){var c=b.target.result;t.data=new Uint8Array(c);PDFJS.getDocument(t).then(function getPdfForm(a){s=a;renderPage(1)})};PDFJS.getDocument(p).then(function getPdfForm(a){s=a;renderPage(1)})};function handleDragOver(a){a.stopPropagation();a.preventDefault();a.dataTransfer.dropEffect='copy'}function handleDragEnter(a){a.currentTarget.classList.add('drag-over')}function handleDragLeave(a){a.currentTarget.classList.remove('drag-over')}function selectDestination(l,m,n){if(m.length==0){return}var o=0;if(l)for(var i=0;i<destinations.length;i++)if(destinations[i][4])o++;if(destinations.length==1||o==1){for(var i=0;i<m.length;i++)m[i].dest=0;n();return}var p='<option value="">Select Destination</option>';var q="";for(var i=0;i<destinations.length;i++){if(!l||(l&&destinations[i][4])){if(q!=destinations[i][2]){if(q!=""){p+='</optgroup>'}p+='<optgroup label="'+destinations[i][2]+'">'}p+='<option value="'+i+'">'+destinations[i][0]+'</option>';q=destinations[i][2]}}if(q!=""){p+='</optgroup>'}var r='<option value="">Select category</option>';for(var i=0;i<categories.length;i++){r+='<option class="'+categories[i][2]+'" value="'+i+'">'+categories[i][1]+'</option>'}var s='';if(l&&destinations.length>o)s+='<i>Can only upload to Library from this page.</i>';if(m.length>1)s+='<p>Select destination for all files';else s+='<p>Select destination for '+m[0].name;s+='<select id="dest">';s+=p;s+='</select>';s+='<span id="wg_" class="hide gallery_name"><input class="alignright" type=text />Gallery name: </span>';s+='<select id="cat" class="hide">';s+=r;s+='</select>';s+='</p>';if(m.length>1){s+='<div class="dashed"></div>';s+='<p>Or select destination for each file</p>';for(var i=0;i<m.length;i++){s+='<div class="option">'+m[i].name+'<select id="dest'+i+'" class="file" name="file'+i+'">';s+=p;s+='</select>';s+='<span id="wg_'+i+'" class="hide gallery_name"><input class="alignright" type=text />Gallery name:</span>';s+='<select id="cat'+i+'" class="hide">';s+=r;s+='</select></div>'}}var t=jQuery("<div id='dest-popup' />").html(s);var u=function(i){var b=m[i].getSource();b.index=i;if(b.name.split('.').pop()=='mp3'){ID3.loadTags(b.name,function(){var a=ID3.getAllTags(b.name);m[b.index].album=a.album;if(b.index<m.length-1)u(b.index+1)},{tags:["album"],dataReader:mOxieFileAPIReader(b)})}else if(b.index<m.length-1)u(b.index+1)};u(0);var v=function(e){jQuery('#dest-popup .error').remove();var d=jQuery('#dest :selected').val();var f=jQuery('.file :selected');if(e.target.id=="dest"&&d.length==0)return false;else if(d.length){for(var i=0;i<m.length;i++)m[i].dest=d;if(destinations[d]&&destinations[d][2]=='Category'){if(jQuery("#adv_cat").val()==''){jQuery("<div>").attr({'id':'adv_err_cat','class':'clear alignright media-item error'}).html('You must enter an existing category').insertAfter('#ac_cat');return false}for(var i=0;i<m.length;i++)m[i].album=jQuery("#adv_cat").val()}else if(destinations[d]&&destinations[d][2]=='Wordpress Gallery'&&destinations[d][3]=='new'){if(jQuery("#wg_ input").val()==''){jQuery("<div>").attr({'id':'adv_err_gal','class':'clear alignright media-item error'}).html('You must enter a name for the new gallery').insertAfter('#wg_ input');return false}jQuery.post(ajaxurl,{'action':'adv_file_upload_new_post','security':security,'title':JSON.stringify(new Array(jQuery("#wg_ input").val()))},function(a){for(var i=0;i<m.length;i++)m[i].album=a[0].id;n();t.dialog('close')},"json");return false}n();t.dialog('close')}else if(f.length){var g=false;var h=false;var j=new Object();for(var i=0;i<f.length;i++){var k=f[i].value;if(k.length==0){jQuery("<div>").attr({'class':'clear alignright media-item error'}).html('You must enter a destination').insertAfter('#dest'+i);g=true}else{m[i].dest=k;if(destinations[k]&&destinations[k][2]=='Category'){if(jQuery("#adv_cat"+i).val()==''){jQuery("<div>").attr({'id':'adv_err_cat'+i,'class':'clear alignright media-item error'}).html('You must enter an existing category').insertAfter('#ac_cat'+i);h=true}m[i].album=jQuery("#adv_cat"+i).val()}else if(destinations[k]&&destinations[k][2]=='Wordpress Gallery'&&destinations[k][3]=='new'){if(jQuery("#wg_"+i+" input").val()==''){jQuery("<div>").attr({'id':'adv_err_gal'+i,'class':'clear alignright media-item error'}).html('You must enter a name for the new gallery').insertAfter('#wg_'+i+' input');h=true}if(typeof j[jQuery("#wg_"+i+" input").val()]==='undefined')j[jQuery("#wg_"+i+" input").val()]=i.toString();else j[jQuery("#wg_"+i+" input").val()]+=','+i.toString()}}}if(g){jQuery("<div>").attr({'class':'clear alignright media-item error'}).html('You must enter a destination for all files').insertAfter('#dest');return false}if(h)return false;if(!jQuery.isEmptyObject(j)){jQuery.post(ajaxurl,{'action':'adv_file_upload_new_post','security':security,'title':JSON.stringify(Object.keys(j))},function(a){for(var b in a){var c=j[a[b].title].split(",");for(var i=0;i<c.length;i++)m[c[i]].album=a[b].id}n();t.dialog('close')},"json");return false}else{n();t.dialog('close')}}else{jQuery("<div>").attr({'class':'clear alignright media-item error'}).html('You must enter a destination').insertAfter('#dest');return false}};var w=function(e){var a=e.target.id.match(/^dest(.*)/)[1];var b='cat'+a;if(destinations[e.target.selectedIndex-1]&&destinations[e.target.selectedIndex-1][2]=='Category'){jQuery("#wg_"+a).hide();jQuery("#adv_err_gal"+a).remove();if(jQuery("#ac_"+b).length==0){jQuery("#"+b).combobox({desc:'adv_'+b,id:'ac_'+b});if(a=='')a=0;if(m[a].album)jQuery('#ac_'+b+' input').val(m[a].album)}else jQuery("#ac_"+b).show()}else if(destinations[e.target.selectedIndex-1]&&destinations[e.target.selectedIndex-1][2]=='Wordpress Gallery'&&destinations[e.target.selectedIndex-1][3]=='new'){jQuery("#ac_"+b).hide();jQuery("#adv_err_"+b).remove();jQuery("#wg_"+a).css("display","block")}else{jQuery("#wg_"+a).hide();jQuery("#ac_"+b).hide();jQuery("#adv_err_"+b).remove();jQuery("#adv_err_gal"+a).remove();if(a=='')v(e)}};jQuery(document).on('change','.ui-dialog select',w);t.dialog({title:'Destination',dialogClass:'wp-dialog',width:'auto',modal:true,autoOpen:false,closeOnEscape:true,buttons:[{'text':'Cancel','class':'button-primary','click':function(){jQuery(this).dialog('close')}},{'text':'Select','class':'button-primary','click':v}],close:function(){jQuery(this).dialog('destroy').remove()}});t.dialog('open')}(function($){$.widget("custom.combobox",{_create:function(){this.wrapper=$("<div>").addClass("custom-combobox").attr('id',this.options.id).insertAfter(this.element);this.element.hide();this._createAutocomplete();this._createShowAllButton()},_createAutocomplete:function(){var c=this.element.children(":selected"),value=c.val()?c.text():"";this.input=$("<input>").appendTo(this.wrapper).attr('id',this.options.desc).attr('name',this.options.desc).val(value).attr("title","").addClass("custom-combobox-input ui-widget ui-widget-content ui-state-default ui-corner-all").autocomplete({delay:0,minLength:0,source:$.proxy(this,"_source")});this._on(this.input,{autocompleteselect:function(a,b){b.item.option.selected=true;this._trigger("select",a,{item:b.item.option})},autocompletechange:"_removeIfInvalid"})},_createShowAllButton:function(){var a=this.input,wasOpen=false;$("<a>").attr("tabIndex",-1).attr("title","Show All Items").height($('#'+this.options.desc).innerHeight()-6).appendTo(this.wrapper).button({icons:{primary:"ui-icon-triangle-1-s"},text:false}).removeClass("ui-corner-all").addClass("custom-combobox-toggle").mousedown(function(){wasOpen=a.autocomplete("widget").is(":visible")}).click(function(){a.focus();if(wasOpen){return}a.autocomplete("search","")})},_source:function(b,c){var d=new RegExp($.ui.autocomplete.escapeRegex(b.term),"i");c(this.element.children("option").map(function(){var a=$(this).text();if(this.value&&(!b.term||d.test(a)))return{label:a,value:a,option:this}}))},_removeIfInvalid:function(a,b){if(b.item){return}var c=this.input.val(),valueLowerCase=c.toLowerCase(),valid=false;this.element.children("option").each(function(){if($(this).text().toLowerCase()===valueLowerCase){this.selected=valid=true;return false}});if(valid){return}this.input.val("");this.element.val("");this.input.data("ui-autocomplete").term=""},_destroy:function(){this.wrapper.remove();this.element.show()}})})(jQuery);1 'use strict';'use strict';var max_file_size=0;var max_file_size_display=0;var adv_max_file_size_display=0;var default_action;var default_url;var blobSlice;var requestFileSystem;var up_plupload;var msgProgLabel=document.createElement("label");msgProgLabel.className="pLabel";var msgProgress=document.createElement("progress");var msgProgressDiv=document.createElement("div");msgProgressDiv.className="progress";msgProgressDiv.appendChild(msgProgLabel);msgProgressDiv.appendChild(msgProgress);(function(j){j["mOxieFileAPIReader"]=function(i){return function(e,f,g){var h=new mOxie.FileReader();h.onload=function(a){var b=this.result.search(/;base64,/);var c=this.result.slice(b+8);var d=new D(window.atob(c));f(d)};h.readAsDataURL(i)}}})(this);var registerLog=function(a,b){jQuery('<div class="'+b+'">'+a+'</div>').appendTo('#log')};function adv_plupload_defaults(){var x={PostInit:function(b){var c=jQuery('#plupload-upload-ui');if(c.length!=0){setResize(getUserSetting('upload_resize',false));if(b.features.dragdrop&&!jQuery(document.body).hasClass('mobile')){c.addClass('drag-drop');jQuery('#drag-drop-area').bind('dragover.wp-uploader',function(){c.addClass('drag-over')}).bind('dragleave.wp-uploader, drop.wp-uploader',function(){c.removeClass('drag-over')})}else{c.removeClass('drag-drop');jQuery('#drag-drop-area').unbind('.wp-uploader')}if(b.runtime=='html4')jQuery('.upload-flash-bypass').hide()}default_action=b.settings.multipart_params['action'];default_url=b.settings.url;up_plupload=b;jQuery('.drop-instructions').show();b.settings.drop_element[0].addEventListener('dragenter',function(e){var a=document.getElementsByClassName('uploader-window');if(a.length>0){a[0].style.display='block';a[0].style.opacity=1;a[0].addEventListener('dragleave',function(e){a[0].style.display='none';a[0].style.opacity=0},false);a[0].addEventListener('drop',function(e){a[0].style.display='none';a[0].style.opacity=0},false)}},false);b.settings.resize=new Object;b.settings.resize.enabled=false;if(adv_uploader){b.settings.chunk_size=max_file_size-2048;b.settings.filters.max_file_size=adv_max_file_size}},FilesAdded:function(a,b){if(adv_uploader){a.settings.url=ajaxurl;a.settings.multipart_params['destinations']=JSON.stringify(destinations);a.settings.multipart_params['action']='adv_upload_plupload';a.settings.multipart_params['security']=security;var c=true;if(typeof b[0].dest==='undefined'){if(typeof wpUploaderInit==='object')c=false;selectDestination(c,b,function(){a.trigger("FilesAdded",b)});return false}else if(typeof b[0].dest==='undefined'){for(var i=0;i<b.length;i++)b[i].dest=0}}else{a.settings.url=default_url;a.settings.max_retries=0;delete a.settings.multipart_params['destinations'];a.settings.multipart_params['action']=default_action;delete a.settings.multipart_params['security']}},BeforeUpload:function(a,b){if(adv_uploader){a.settings.multipart_params['fileDest']=b.dest;a.settings.multipart_params['album']=b.album}},FileUploaded:function(q,r,s){if(adv_uploader){var t=function(d,f,g){var h=new FormData();h.append('action','adv_file_upload_thumbs');h.append('security',security);h.append('filename',u.data.name);if(typeof _wpPluploadSettings==='object')h.append('post_id',wp.media.model.settings.post.id);h.append('meta',JSON.stringify(f));h.append('fileDest',r.dest);h.append('album',r.album);h.append('destinations',JSON.stringify(destinations));for(var j=0;j<g.length;j++){var k=g[j];var l=atob(d[k].split(',')[1]);var m=[];for(var i=0;i<l.length;i++){m.push(l.charCodeAt(i))}var n=u.data.name.split('.').pop();if(n.match(/jpg/))var o=new Blob([new Uint8Array(m)],{type:'image/jpeg'});else var o=new Blob([new Uint8Array(m)],{type:'image/png'});h.append('thumbs[]',o,f[k].file)}console.log(h);var p=jQuery('#media-item-'+r.id);jQuery('.percent',p).html('Completing Upload');jQuery.ajax({'type':"post",'url':ajaxurl,'data':h,'enctype':'multipart/form-data','encoding':'multipart/form-data','cache':false,'processData':false,'contentType':false}).done(function(a){if(typeof a==='string'&&a!=''){if(typeof wpUploaderInit==='object'){try{var b=JSON.parse(a)}catch(e){q.trigger("FileUploaded",r,{'response':'media-upload-error'});return}if(b.success==false){q.trigger("FileUploaded",r,{'response':'media-upload-error'});return}if(b.data.id==false){var c=b.data.id;jQuery('#media-item-'+r.id+' .progress').remove();jQuery('#media-item-'+r.id+' .original').remove();jQuery('<img>').attr({src:b.data.url,class:'pinkynail'}).appendTo('#media-item-'+r.id);jQuery('<div>').attr({class:'filename new'}).html(b.data.name).appendTo('#media-item-'+r.id)}else var c=b.data.id.toString();q.trigger("FileUploaded",r,{'response':c})}else q.trigger("FileUploaded",r,{'response':a})}})};try{var u=JSON.parse(s.response)}catch(e){return}if(u.success=='file_complete'){var v=u.data.name.split('.').pop();if(destinations[r.dest][4]&&v.match(/jpg|jpeg|png/i)){var w=jQuery('#media-item-'+r.id);jQuery('.percent',w).html('Creating thumbs');createThumbImage(r,u.data.name,t,u.data.file)}else if(destinations[r.dest][4]&&v.match(/pdf/i)){var w=jQuery('#media-item-'+r.id);jQuery('.percent',w).html('Creating thumbs');pdf(u.data.file,u.data.name,t)}else t(null,null,new Array());return false}}},Error:function(a,b){alert()},ChunkUploaded:function(a,b,c){var d=jQuery.parseJSON(c.response);if(d&&!d.success){b.status=plupload.FAILED;a.trigger('QueueChanged',b);var e={response:"<div class='media-upload-error'><B>"+b.name+"</B> "+d.data.message+"</div>"};a.trigger('FileUploaded',b,e)}}};if(typeof wpUploaderInit==='object'){wpUploaderInit.preinit=x;max_file_size=parseInt(wpUploaderInit.filters.max_file_size);if(typeof adv_uploader==='boolean'&&adv_uploader)wpUploaderInit.filters.max_file_size=adv_max_file_size}if(typeof _wpPluploadSettings==='object'){_wpPluploadSettings.defaults.preinit=x;max_file_size=parseInt(_wpPluploadSettings.defaults.filters.max_file_size);updatehtml();if(typeof adv_uploader==='boolean'&&adv_uploader)_wpPluploadSettings.defaults.filters.max_file_size=adv_max_file_size}}function toggle_loader(a){if(a=='default'){jQuery('#adv_upload').toggleClass('hidden',true);jQuery('#default_upload').toggleClass('hidden',false)}else{jQuery('#default_upload').toggleClass('hidden',true);jQuery('#adv_upload').toggleClass('hidden',false)}jQuery.ajax({'type':"post",'url':ajaxurl,'data':{'action':"adv_file_upload_set_loader",'loader':a}})}function convertBytes(a){var b='Bytes';if((a%1024)==0){a=a/1024;b='KB'}if(b=='KB'&&(a%1024)==0){a=a/1024;b='MB'}if(b=='MB'&&(a%1024)==0){a=a/1024;b='GB'}return a+' '+b}jQuery(document).ready(function(){if(max_file_size>0)updatehtml()});function updatehtml(){jQuery('.media-upload-form').on('click.uploader',function(e){var a=jQuery(e.target);if(a.is('.upload-flash-bypass a')||a.is('a.uploader-html')){var b=jQuery('.max-upload-size').html();b=b.replace(adv_max_file_size_display,max_file_size_display);jQuery('.max-upload-size').html(b);jQuery('#adv_uploader_checkbox_p').hide()}else if(a.is('.upload-html-bypass a')){jQuery('#adv_uploader_checkbox_p').show();if(adv_uploader){var b=jQuery('.max-upload-size').html();b=b.replace(max_file_size_display,adv_max_file_size_display);jQuery('.max-upload-size').html(b)}}});if(adv_replace_default&&max_file_size>0){max_file_size_display=convertBytes(max_file_size);adv_max_file_size_display=convertBytes(adv_max_file_size);var c='';var d=max_file_size_display;if(adv_uploader){c='checked';d=adv_max_file_size_display}var f='<p id="adv_uploader_checkbox_p" style="cursor: pointer;">'+'<input type="checkbox" id="adv_uploader_checkbox" style="margin-right: 5px;" '+c+'>Use advanced uploader</p>';var g=document.getElementById('tmpl-uploader-inline');if(g!==null){var h=new RegExp(max_file_size_display+'|'+max_file_size_display.replace(/ /,''),'i');var i=g.innerHTML.search(h);var j=g.innerHTML.indexOf('</p>',i);g.innerHTML=g.innerHTML.substring(0,i)+d+g.innerHTML.substring(i+max_file_size_display.length,j+4)+f+g.innerHTML.substring(j+4)}var k=jQuery('.max-upload-size').html();if(typeof k==='string'){var h=new RegExp(max_file_size_display+'|'+max_file_size_display.replace(/ /,''),'i');var i=k.search(h);jQuery('.max-upload-size').html(k.substring(0,i)+d+k.substring(i+max_file_size_display.length)).after(f)}jQuery(document).on('click','#adv_uploader_checkbox_p',show_hide_uploader);jQuery(document).on('click','.media-menu-item',function(e){if(e.target.textContent=='Upload Files')if((!adv_uploader&&jQuery('#adv_uploader_checkbox').attr('checked')=='checked')||(adv_uploader&&jQuery('#adv_uploader_checkbox').attr('checked')==undefined))jQuery('#adv_uploader_checkbox_p').click()})}}function show_hide_uploader(e){if(e.target.id.indexOf('adv_uploader_checkbox')==-1)return;if(e.target.type=='checkbox')var a=e.target;else{var a=document.getElementById('adv_uploader_checkbox');if(a.checked)a.checked=false;else a.checked=true}if(a.checked){adv_uploader=true;up_plupload.settings.filters.max_file_size=adv_max_file_size;up_plupload.settings.chunk_size=max_file_size-2048;var b=jQuery('.max-upload-size').html();b=b.replace(max_file_size_display,adv_max_file_size_display);jQuery('.max-upload-size').html(b)}else{adv_uploader=false;up_plupload.settings.filters.max_file_size=max_file_size;up_plupload.settings.chunk_size=0;var b=jQuery('.max-upload-size').html();b=b.replace(adv_max_file_size_display,max_file_size_display);jQuery('.max-upload-size').html(b)}jQuery.ajax({'type':"post",'url':ajaxurl,'data':{'action':"adv_file_upload_set_loader",'loader':adv_uploader}})}var createThumbImage=function(o,p,q,r){var s=new Image();s.src=r;s.onload=function(){var a=s.width;var b=s.height;if(b>sizes['thumbnail']['height']||a>sizes['thumbnail']['width']){var c=new Object();var d=new Object();var e=new Array();var f=b;var g=a;var h='';for(var i in sizes){var b=f;var a=g;var j=sizes[i]['width'];var k=sizes[i]['height'];if(b>k||a>j){if(a>f){if(a>j){b*=j/a;a=j}}else{if(b>k){a*=k/b;b=k}}a=Math.round(a);b=Math.round(b);var l=p.replace(/\.(jpg|jpeg|png)$/i,"-"+a+"x"+b+".jpg");if(h.search(l)==-1){h+=l+';';var m=document.createElement('canvas');m.width=a;m.height=b;var n=m.getContext("2d");n.drawImage(this,0,0,a,b);e.push(i);d[i]=m.toDataURL("image/jpeg",0.9)}c[i]=new Object();c[i].file=l;c[i].width=a;c[i].height=b}}q(d,c,e)}else q(null,null,new Array())}};var pdf=function(p,q,r){PDFJS.disableWorker=true;var s=null;function renderPage(d){s.getPage(d).then(function(a){var b=new Array();for(var c in sizes)b.push(c);createPDFthumb(a,'',b,new Array(),new Object(),new Object())})}function createPDFthumb(a,b,c,d,e,f){var g=c.pop();var h=sizes[g]['width']/a.getViewport(1.0).width;var i=sizes[g]['height']/a.getViewport(1.0).height;var j=h>i?i:h;var k=a.getViewport(j);var l=document.createElement('canvas');var m=l.getContext('2d');l.height=k.height;l.width=k.width;var n=q+"-"+l.width+"x"+l.height+".png";e[g]=new Object();e[g].file=n;e[g].width=l.width;e[g].height=l.height;if(b.search(n)==-1){b+=n+';';var o={canvasContext:m,viewport:k};a.render(o).then(function(){d.push(g);f[g]=l.toDataURL("image/png");if(c.length>0)createPDFthumb(a,b,c,d,e,f);else{r(f,e,d)}})}else{if(c.length>0)createPDFthumb(a,b,c,d,e,f);else{r(f,e,d)}}}var t={};var u=new FileReader();u.onload=function webViewerChangeFileReaderOnload(b){var c=b.target.result;t.data=new Uint8Array(c);PDFJS.getDocument(t).then(function getPdfForm(a){s=a;renderPage(1)})};PDFJS.getDocument(p).then(function getPdfForm(a){s=a;renderPage(1)})};function handleDragOver(a){a.stopPropagation();a.preventDefault();a.dataTransfer.dropEffect='copy'}function handleDragEnter(a){a.currentTarget.classList.add('drag-over')}function handleDragLeave(a){a.currentTarget.classList.remove('drag-over')}function selectDestination(l,m,n){if(m.length==0){return}var o=0;if(l)for(var i=0;i<destinations.length;i++)if(destinations[i][4])o++;if(destinations.length==1||o==1){for(var i=0;i<m.length;i++)m[i].dest=0;n();return}var p='<option value="">Select Destination</option>';var q="";for(var i=0;i<destinations.length;i++){if(!l||(l&&destinations[i][4])){if(q!=destinations[i][2]){if(q!=""){p+='</optgroup>'}p+='<optgroup label="'+destinations[i][2]+'">'}p+='<option value="'+i+'">'+destinations[i][0]+'</option>';q=destinations[i][2]}}if(q!=""){p+='</optgroup>'}var r='<option value="">Select category</option>';for(var i=0;i<categories.length;i++){r+='<option class="'+categories[i][2]+'" value="'+i+'">'+categories[i][1]+'</option>'}var s='';if(l&&destinations.length>o)s+='<i>Can only upload to Library from this page.</i>';if(m.length>1)s+='<p>Select destination for all files';else s+='<p>Select destination for '+m[0].name;s+='<select id="dest">';s+=p;s+='</select>';s+='<span id="wg_" class="hide gallery_name"><input class="alignright" type=text />Gallery name: </span>';s+='<select id="cat" class="hide">';s+=r;s+='</select>';s+='</p>';if(m.length>1){s+='<div class="dashed"></div>';s+='<p>Or select destination for each file</p>';for(var i=0;i<m.length;i++){s+='<div class="option">'+m[i].name+'<select id="dest'+i+'" class="file" name="file'+i+'">';s+=p;s+='</select>';s+='<span id="wg_'+i+'" class="hide gallery_name"><input class="alignright" type=text />Gallery name:</span>';s+='<select id="cat'+i+'" class="hide">';s+=r;s+='</select></div>'}}var t=jQuery("<div id='dest-popup' />").html(s);var u=function(i){var b=m[i].getSource();b.index=i;if(b.name.split('.').pop()=='mp3'){ID3.loadTags(b.name,function(){var a=ID3.getAllTags(b.name);m[b.index].album=a.album;if(b.index<m.length-1)u(b.index+1)},{tags:["album"],dataReader:mOxieFileAPIReader(b)})}else if(b.index<m.length-1)u(b.index+1)};u(0);var v=function(e){jQuery('#dest-popup .error').remove();var d=jQuery('#dest :selected').val();var f=jQuery('.file :selected');if(e.target.id=="dest"&&d.length==0)return false;else if(d.length){for(var i=0;i<m.length;i++)m[i].dest=d;if(destinations[d]&&destinations[d][2]=='Category'){if(jQuery("#adv_cat").val()==''){jQuery("<div>").attr({'id':'adv_err_cat','class':'clear alignright media-item error'}).html('You must enter an existing category').insertAfter('#ac_cat');return false}for(var i=0;i<m.length;i++)m[i].album=jQuery("#adv_cat").val()}else if(destinations[d]&&destinations[d][2]=='Wordpress Gallery'&&destinations[d][3]=='new'){if(jQuery("#wg_ input").val()==''){jQuery("<div>").attr({'id':'adv_err_gal','class':'clear alignright media-item error'}).html('You must enter a name for the new gallery').insertAfter('#wg_ input');return false}jQuery.post(ajaxurl,{'action':'adv_file_upload_new_post','security':security,'title':JSON.stringify(new Array(jQuery("#wg_ input").val()))},function(a){for(var i=0;i<m.length;i++)m[i].album=a[0].id;n();t.dialog('close')},"json");return false}n();t.dialog('close')}else if(f.length){var g=false;var h=false;var j=new Object();for(var i=0;i<f.length;i++){var k=f[i].value;if(k.length==0){jQuery("<div>").attr({'class':'clear alignright media-item error'}).html('You must enter a destination').insertAfter('#dest'+i);g=true}else{m[i].dest=k;if(destinations[k]&&destinations[k][2]=='Category'){if(jQuery("#adv_cat"+i).val()==''){jQuery("<div>").attr({'id':'adv_err_cat'+i,'class':'clear alignright media-item error'}).html('You must enter an existing category').insertAfter('#ac_cat'+i);h=true}m[i].album=jQuery("#adv_cat"+i).val()}else if(destinations[k]&&destinations[k][2]=='Wordpress Gallery'&&destinations[k][3]=='new'){if(jQuery("#wg_"+i+" input").val()==''){jQuery("<div>").attr({'id':'adv_err_gal'+i,'class':'clear alignright media-item error'}).html('You must enter a name for the new gallery').insertAfter('#wg_'+i+' input');h=true}if(typeof j[jQuery("#wg_"+i+" input").val()]==='undefined')j[jQuery("#wg_"+i+" input").val()]=i.toString();else j[jQuery("#wg_"+i+" input").val()]+=','+i.toString()}}}if(g){jQuery("<div>").attr({'class':'clear alignright media-item error'}).html('You must enter a destination for all files').insertAfter('#dest');return false}if(h)return false;if(!jQuery.isEmptyObject(j)){jQuery.post(ajaxurl,{'action':'adv_file_upload_new_post','security':security,'title':JSON.stringify(Object.keys(j))},function(a){for(var b in a){var c=j[a[b].title].split(",");for(var i=0;i<c.length;i++)m[c[i]].album=a[b].id}n();t.dialog('close')},"json");return false}else{n();t.dialog('close')}}else{jQuery("<div>").attr({'class':'clear alignright media-item error'}).html('You must enter a destination').insertAfter('#dest');return false}};var w=function(e){var a=e.target.id.match(/^dest(.*)/)[1];var b='cat'+a;if(destinations[e.target.selectedIndex-1]&&destinations[e.target.selectedIndex-1][2]=='Category'){jQuery("#wg_"+a).hide();jQuery("#adv_err_gal"+a).remove();if(jQuery("#ac_"+b).length==0){jQuery("#"+b).combobox({desc:'adv_'+b,id:'ac_'+b});if(a=='')a=0;if(m[a].album)jQuery('#ac_'+b+' input').val(m[a].album)}else jQuery("#ac_"+b).show()}else if(destinations[e.target.selectedIndex-1]&&destinations[e.target.selectedIndex-1][2]=='Wordpress Gallery'&&destinations[e.target.selectedIndex-1][3]=='new'){jQuery("#ac_"+b).hide();jQuery("#adv_err_"+b).remove();jQuery("#wg_"+a).css("display","block")}else{jQuery("#wg_"+a).hide();jQuery("#ac_"+b).hide();jQuery("#adv_err_"+b).remove();jQuery("#adv_err_gal"+a).remove();if(a=='')v(e)}};jQuery(document).on('change','.ui-dialog select',w);t.dialog({title:'Destination',dialogClass:'wp-dialog',width:'auto',modal:true,autoOpen:false,closeOnEscape:true,buttons:[{'text':'Cancel','class':'button-primary','click':function(){jQuery(this).dialog('close')}},{'text':'Select','class':'button-primary','click':v}],close:function(){jQuery(this).dialog('destroy').remove()}});t.dialog('open')}(function($){$.widget("custom.combobox",{_create:function(){this.wrapper=$("<div>").addClass("custom-combobox").attr('id',this.options.id).insertAfter(this.element);this.element.hide();this._createAutocomplete();this._createShowAllButton()},_createAutocomplete:function(){var c=this.element.children(":selected"),value=c.val()?c.text():"";this.input=$("<input>").appendTo(this.wrapper).attr('id',this.options.desc).attr('name',this.options.desc).val(value).attr("title","").addClass("custom-combobox-input ui-widget ui-widget-content ui-state-default ui-corner-all").autocomplete({delay:0,minLength:0,source:$.proxy(this,"_source")});this._on(this.input,{autocompleteselect:function(a,b){b.item.option.selected=true;this._trigger("select",a,{item:b.item.option})},autocompletechange:"_removeIfInvalid"})},_createShowAllButton:function(){var a=this.input,wasOpen=false;$("<a>").attr("tabIndex",-1).attr("title","Show All Items").height($('#'+this.options.desc).innerHeight()-6).appendTo(this.wrapper).button({icons:{primary:"ui-icon-triangle-1-s"},text:false}).removeClass("ui-corner-all").addClass("custom-combobox-toggle").mousedown(function(){wasOpen=a.autocomplete("widget").is(":visible")}).click(function(){a.focus();if(wasOpen){return}a.autocomplete("search","")})},_source:function(b,c){var d=new RegExp($.ui.autocomplete.escapeRegex(b.term),"i");c(this.element.children("option").map(function(){var a=$(this).text();if(this.value&&(!b.term||d.test(a)))return{label:a,value:a,option:this}}))},_removeIfInvalid:function(a,b){if(b.item){return}var c=this.input.val(),valueLowerCase=c.toLowerCase(),valid=false;this.element.children("option").each(function(){if($(this).text().toLowerCase()===valueLowerCase){this.selected=valid=true;return false}});if(valid){return}this.input.val("");this.element.val("");this.input.data("ui-autocomplete").term=""},_destroy:function(){this.wrapper.remove();this.element.show()}})})(jQuery); -
advanced-uploader/trunk/readme.txt
r1027784 r1031788 51 51 52 52 == Changelog == 53 = 2.03 = 54 * increased compatability with other plugins 53 55 = 2.02 = 54 56 * added scan uploads directory function … … 97 99 98 100 == Upgrade Notice == 101 = 2.03 = minor bugfixes 99 102 = 2.02 = added scan uploads directory function and bugfixes 100 103 = 2.01 = corrected error in minified javascript file -
advanced-uploader/trunk/upload.php
r1027784 r1031788 4 4 Plugin URI: 5 5 Description: This plugin provides an interface for uploading files. Features - large files to upload to your site even on shared host with http upload limit. creates thumbnails in the browser including pdf thumbnails. 6 Version: 2.0 26 Version: 2.03 7 7 Author: Oli Redmond 8 8 Author URI: … … 24 24 // if replacing default uploader make sure plupload is dependant on upload.js 25 25 if( get_option('adv_file_upload_replace_default') ) { 26 wp_register_script( 'adv-file-upload', plugins_url('/js/upload.min.js', __FILE__), array( 'pdf-js', 'id3-js', 'jquery-ui-autocomplete', 'jquery-ui-dialog'), '2. 1');26 wp_register_script( 'adv-file-upload', plugins_url('/js/upload.min.js', __FILE__), array( 'pdf-js', 'id3-js', 'jquery-ui-autocomplete', 'jquery-ui-dialog'), '2.2'); 27 27 //add upload.js to the dependaces for plupload 28 global $wp_scripts;28 /*global $wp_scripts; 29 29 30 30 $plupload_script = $wp_scripts->query( 'plupload', 'registered' ); 31 31 if( is_object( $plupload_script ) ) 32 32 if( !in_array( 'adv-file-upload', $plupload_script->deps ) ) 33 $plupload_script->deps[] = 'adv-file-upload'; 33 $plupload_script->deps[] = 'adv-file-upload';*/ 34 34 } else 35 wp_register_script( 'adv-file-upload', plugins_url('/js/upload.min.js', __FILE__), array( 'plupload2', 'pdf-js', 'id3-js', 'jquery-ui-autocomplete', 'jquery-ui-dialog'), '2. 1');35 wp_register_script( 'adv-file-upload', plugins_url('/js/upload.min.js', __FILE__), array( 'plupload2', 'pdf-js', 'id3-js', 'jquery-ui-autocomplete', 'jquery-ui-dialog'), '2.2'); 36 36 37 37 //TBD wp_register_script( 'spark-md5', plugins_url('/js/spark-md5.min.js', __FILE__) ); … … 218 218 } 219 219 220 $js_var .= "var destinations = new Array();\n";220 $js_var .= 'var destinations = new Array();'."\n"; 221 221 //add default location 222 222 $js_var .= "destinations[0] = new Array();\n"; 223 $js_var .= "destinations[0][0] = 'Default';\n";224 $js_var .= "destinations[0][1] = '$default_dir';\n";225 $js_var .= "destinations[0][2] = '';\n";226 $js_var .= "destinations[0][3] = '';\n";227 $js_var .= "destinations[0][4] = true;\n";223 $js_var .= "destinations[0][0] = \"Default\";\n"; 224 $js_var .= 'destinations[0][1] = "'.$default_dir."\";\n"; 225 $js_var .= 'destinations[0][2] = "";'."\n"; 226 $js_var .= 'destinations[0][3] = "";'."\n"; 227 $js_var .= 'destinations[0][4] = true;'."\n"; 228 228 229 229 $index = 1; 230 230 foreach( $destinations as $dest ) { 231 231 if( !isset( $dest['error'] ) && is_dir(ABSPATH . $dest['dest']) ) { 232 $js_var .= "destinations[" . $index . "] = new Array();\n";233 $js_var .= "destinations[" . $index . "][0] = '" . $dest['label'] . "';\n";234 $js_var .= "destinations[" . $index . "][1] = '" . $dest['dest'] . "';\n";235 $js_var .= "destinations[" . $index . "][2] = '" . $dest['type'] . "';\n";236 $js_var .= "destinations[" . $index . "][3] = '" . $dest['id'] . "';\n";232 $js_var .= 'destinations[' . $index . '] = new Array();'."\n"; 233 $js_var .= 'destinations[' . $index . '][0] = "' . $dest['label'] . "\";\n"; 234 $js_var .= 'destinations[' . $index . '][1] = "' . $dest['dest'] . "\";\n"; 235 $js_var .= 'destinations[' . $index . '][2] = "' . $dest['type'] . "\";\n"; 236 $js_var .= 'destinations[' . $index . '][3] = "' . $dest['id'] . "\";\n"; 237 237 $lib = ($dest['library']) ? "true" : "false"; 238 $js_var .= "destinations[" . $index . "][4] = " .$lib . ";\n";238 $js_var .= 'destinations[' . $index . '][4] = ' .$lib . ';'."\n"; 239 239 $index++; 240 240 } … … 243 243 //show categories 244 244 if ($cat) { 245 $js_var .= "destinations[" . $index . "] = new Array();\n";246 $js_var .= "destinations[" . $index . "][0] = 'Add to category';\n";247 $js_var .= "destinations[" . $index . "][1] = '$default_dir';\n";248 $js_var .= "destinations[" . $index . "][2] = 'Category';\n";249 $js_var .= "destinations[" . $index . "][3] = '';\n";250 $js_var .= "destinations[" . $index . "][4] = true;\n";251 } 252 253 $js_var .= "var categories = new Array();\n";245 $js_var .= 'destinations[' . $index . '] = new Array();'."\n"; 246 $js_var .= 'destinations[' . $index . '][0] = "Add to category";'."\n"; 247 $js_var .= 'destinations[' . $index . '][1] = "'.$default_dir."\";\n"; 248 $js_var .= 'destinations[' . $index . '][2] = "Category";'."\n"; 249 $js_var .= 'destinations[' . $index . '][3] = "";'."\n"; 250 $js_var .= 'destinations[' . $index . '][4] = true;'."\n"; 251 } 252 253 $js_var .= 'var categories = new Array();'."\n"; 254 254 $index = 0; 255 255 foreach( $cats as $value ) { 256 $js_var .= "categories[". $index . "] = new Array();\n";257 $js_var .= "categories[" . $index . "][0] = '" . $value['id'] . "';\n";258 $js_var .= "categories[" . $index . "][1] = '" . $value['name'] . "';\n";259 $js_var .= "categories[" . $index . "][2] = '" . $value['parent'] . "';\n";256 $js_var .= 'categories[' . $index . "] = new Array();\n"; 257 $js_var .= 'categories[' . $index . '][0] = "' . $value['id'] . "\";\n"; 258 $js_var .= 'categories[' . $index . '][1] = "' . $value['name'] . "\";\n"; 259 $js_var .= 'categories[' . $index . '][2] = "' . $value['parent'] . "\";\n"; 260 260 $index++; 261 261 } 262 262 263 $js_var .= "var pluginPath = '".plugins_url( '' , __FILE__ )."/js/';\n";264 $js_var .= "var security = '" . wp_create_nonce( 'alt_upl_nonce' . get_current_user_id() ) . "';\n";263 $js_var .= 'var pluginPath = "'.plugins_url( '' , __FILE__ ).'/js/";'."\n"; 264 $js_var .= 'var security = "' . wp_create_nonce( 'alt_upl_nonce' . get_current_user_id() ) . "\";\n"; 265 265 266 266 return $js_var; … … 280 280 } 281 281 282 //add_action('admin_enqueue_scripts', 'adv_file_upload_admin_scripts');282 add_action('admin_enqueue_scripts', 'adv_file_upload_admin_scripts'); 283 283 } 284 284 285 285 function adv_file_upload_admin_scripts($hook) { 286 global $adv_file_upload_admin_page, $post; 287 288 if( !($adv_file_upload_admin_page == $hook || 289 (($hook == 'media-new.php' || $hook == 'post-new.php' || $hook == 'post.php' || $hook == 'upload.php') && 290 get_option('adv_file_upload_replace_default'))) 291 || (is_object($post) && $post->post_type == "attachment" )) 292 return; 293 294 adv_file_upload_load_scripts($hook); 295 } 296 297 function adv_file_upload_load_scripts($hook='') { 298 //global $adv_file_upload_admin_page; 299 // Only enqueue when not replacing default 300 if( $adv_file_upload_admin_page == $hook && !get_option('adv_file_upload_replace_default') ) 286 global $adv_file_upload_admin_page; 287 if( $adv_file_upload_admin_page == $hook || get_option('adv_file_upload_replace_default') ) { 301 288 wp_enqueue_script( 'adv-file-upload' ); 302 303 wp_enqueue_style( 'adv-file-upload-css' ); 304 305 // js varaibles to page 306 return adv_admin_inline_js($hook); 289 wp_enqueue_style( 'adv-file-upload-css' ); 290 } 307 291 } 308 292 … … 942 926 943 927 //add functions to plupload default settings 944 function adv_pre_plupload( $args) {945 global $pagenow ;928 function adv_pre_plupload() { 929 global $pagenow, $adv_file_upload_admin_page; 946 930 $screen = get_current_screen(); 947 931 948 if( ( $pagenow == 'media-new.php' && get_option('adv_file_upload_replace_default') ) || $screen->id == 'media_page_adv-file-upload' ) { 949 echo "<script type='text/javascript'>\n"; 950 echo adv_file_upload_load_scripts($pagenow); 951 echo "adv_plupload_defaults();\n"; 952 echo "</script>\n"; 953 } 954 return $args; 955 } 956 add_action( 'pre-plupload-upload-ui', 'adv_pre_plupload'); 932 if( ( $pagenow == 'media-new.php' && get_option('adv_file_upload_replace_default') ) || $screen->id == $adv_file_upload_admin_page ) { 933 echo "<script type='text/javascript'>\n" 934 . adv_admin_inline_js($screen->id) 935 . "adv_plupload_defaults();\n" 936 . "</script>\n"; 937 } 938 } 939 add_action( 'pre-html-upload-ui', 'adv_pre_plupload'); 957 940 958 941 function adv_plupload_default_script () { 959 global $wp_scripts, $pagenow ;942 global $wp_scripts, $pagenow, $adv_file_upload_admin_page; 960 943 $screen = get_current_screen(); 961 944 962 if( get_option('adv_file_upload_replace_default') && !( $pagenow == 'media-new.php' || $screen->id == 'media_page_adv-file-upload') ) {963 $script = adv_ file_upload_load_scripts($pagenow) . "jQuery().ready( function() { adv_plupload_defaults(); } );\n";945 if( get_option('adv_file_upload_replace_default') && !( $pagenow == 'media-new.php' || $screen->id == $adv_file_upload_admin_page ) ) { 946 $script = adv_admin_inline_js($screen->id) . "jQuery().ready( function() { adv_plupload_defaults(); } );\n"; 964 947 965 948 $data = $wp_scripts->get_data( 'wp-plupload', 'data' ); … … 972 955 } 973 956 } 957 add_action( 'customize_controls_print_footer_scripts', 'adv_plupload_default_script'); 974 958 add_action( 'admin_footer', 'adv_plupload_default_script'); 975 959
Note: See TracChangeset
for help on using the changeset viewer.