mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some improvements in automatic svg replacement

This commit is contained in:
Robin Appelman 2011-08-22 15:20:24 +02:00
parent 13b7cb59eb
commit d5ba4ec825
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/js/js.js
View File

@ -180,8 +180,32 @@ if (!Array.prototype.indexOf){
* check if the browser support svg images * check if the browser support svg images
*/ */
function SVGSupport() { function SVGSupport() {
return !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', "svg").createSVGRect; return SVGSupport.checkMimeType.correct && !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', "svg").createSVGRect;
} }
SVGSupport.checkMimeType=function(){
$.ajax({
url: OC.imagePath('core','breadcrumb.svg'),
success:function(data,text,xhr){
var headerParts=xhr.getAllResponseHeaders().split("\n");
var headers={};
$.each(headerParts,function(i,text){
if(text){
var parts=text.split(':',2);
var value=parts[1].trim();
if(value[0]=='"'){
value=value.substr(1,value.length-2);
}
headers[parts[0]]=value;
}
});
if(headers["Content-Type"]!='image/svg+xml'){
replaceSVG();
SVGSupport.checkMimeType.correct=false
}
}
});
}
SVGSupport.checkMimeType.correct=true;
//replace all svg images with png for browser compatibility //replace all svg images with png for browser compatibility
function replaceSVG(){ function replaceSVG(){
@ -223,27 +247,9 @@ function object(o) {
$(document).ready(function(){ $(document).ready(function(){
if(!SVGSupport()){//replace all svg images with png images for browser that dont support svg if(!SVGSupport()){//replace all svg images with png images for browser that dont support svg
replaceSVG(); replaceSVG();
}; }else{
$.ajax({ SVGSupport.checkMimeType();
url: OC.imagePath('core','breadcrumb.svg'), }
success:function(data,text,xhr){
var headerParts=xhr.getAllResponseHeaders().split("\n");
var headers={};
$.each(headerParts,function(i,text){
if(text){
var parts=text.split(':',2);
var value=parts[1].trim();
if(value[0]=='"'){
value=value.substr(1,value.length-2);
}
headers[parts[0]]=value;
}
});
if(headers["Content-Type"]!='image/svg+xml'){
replaceSVG();
}
}
});
$('form.searchbox').submit(function(event){ $('form.searchbox').submit(function(event){
event.preventDefault(); event.preventDefault();
}) })

9
files/js/fileactions.js
View File

@ -85,6 +85,9 @@ FileActions={
} }
if(actions['Delete']){ if(actions['Delete']){
var img=FileActions.icons['Delete']; var img=FileActions.icons['Delete'];
if(img.call){
img=img(file);
}
var html='<a href="#" title="Delete" class="action" />'; var html='<a href="#" title="Delete" class="action" />';
var element=$(html); var element=$(html);
if(img){ if(img){
@ -121,15 +124,15 @@ FileActions={
} }
} }
FileActions.register('all','Download',OC.imagePath('core','actions/download'),function(filename){ FileActions.register('all','Download',function(){return OC.imagePath('core','actions/download')},function(filename){
window.location='ajax/download.php?files='+filename+'&dir='+$('#dir').val(); window.location='ajax/download.php?files='+filename+'&dir='+$('#dir').val();
}); });
FileActions.register('all','Delete',OC.imagePath('core','actions/delete'),function(filename){ FileActions.register('all','Delete',function(){return OC.imagePath('core','actions/delete')},function(filename){
FileList.delete(filename); FileList.delete(filename);
}); });
FileActions.register('all','Rename',OC.imagePath('core','actions/rename'),function(filename){ FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){
FileList.rename(filename); FileList.rename(filename);
}); });