diff --git a/core/img/actions/add.png b/core/img/actions/add.png deleted file mode 100644 index 8ae17cfe11..0000000000 Binary files a/core/img/actions/add.png and /dev/null differ diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png deleted file mode 100644 index 97c64c6a72..0000000000 Binary files a/core/img/actions/caret-dark.png and /dev/null differ diff --git a/core/img/actions/caret.png b/core/img/actions/caret.png deleted file mode 100644 index 3a8dd99176..0000000000 Binary files a/core/img/actions/caret.png and /dev/null differ diff --git a/core/img/actions/checkbox-checked-disabled.png b/core/img/actions/checkbox-checked-disabled.png deleted file mode 100644 index 55980ba730..0000000000 Binary files a/core/img/actions/checkbox-checked-disabled.png and /dev/null differ diff --git a/core/img/actions/checkbox-checked-white.png b/core/img/actions/checkbox-checked-white.png deleted file mode 100644 index ed8e3d3d55..0000000000 Binary files a/core/img/actions/checkbox-checked-white.png and /dev/null differ diff --git a/core/img/actions/checkbox-checked.png b/core/img/actions/checkbox-checked.png deleted file mode 100644 index a8a07193ab..0000000000 Binary files a/core/img/actions/checkbox-checked.png and /dev/null differ diff --git a/core/img/actions/checkbox-disabled-white.png b/core/img/actions/checkbox-disabled-white.png deleted file mode 100644 index e1f48439d2..0000000000 Binary files a/core/img/actions/checkbox-disabled-white.png and /dev/null differ diff --git a/core/img/actions/checkbox-disabled.png b/core/img/actions/checkbox-disabled.png deleted file mode 100644 index a2ead20996..0000000000 Binary files a/core/img/actions/checkbox-disabled.png and /dev/null differ diff --git a/core/img/actions/checkbox-mixed-white.png b/core/img/actions/checkbox-mixed-white.png deleted file mode 100644 index 0b81f998fc..0000000000 Binary files a/core/img/actions/checkbox-mixed-white.png and /dev/null differ diff --git a/core/img/actions/checkbox-mixed.png b/core/img/actions/checkbox-mixed.png deleted file mode 100644 index cc27ec651e..0000000000 Binary files a/core/img/actions/checkbox-mixed.png and /dev/null differ diff --git a/core/img/actions/checkbox-white.png b/core/img/actions/checkbox-white.png deleted file mode 100644 index f0f903c77c..0000000000 Binary files a/core/img/actions/checkbox-white.png and /dev/null differ diff --git a/core/img/actions/checkbox.png b/core/img/actions/checkbox.png deleted file mode 100644 index 770b7ef820..0000000000 Binary files a/core/img/actions/checkbox.png and /dev/null differ diff --git a/core/img/actions/checkmark-color.png b/core/img/actions/checkmark-color.png deleted file mode 100644 index a8ab849cad..0000000000 Binary files a/core/img/actions/checkmark-color.png and /dev/null differ diff --git a/core/img/actions/checkmark-white.png b/core/img/actions/checkmark-white.png deleted file mode 100644 index 27f17204b1..0000000000 Binary files a/core/img/actions/checkmark-white.png and /dev/null differ diff --git a/core/img/actions/checkmark.png b/core/img/actions/checkmark.png deleted file mode 100644 index c1a8be786c..0000000000 Binary files a/core/img/actions/checkmark.png and /dev/null differ diff --git a/core/img/actions/close.png b/core/img/actions/close.png deleted file mode 100644 index 66e3c26cc6..0000000000 Binary files a/core/img/actions/close.png and /dev/null differ diff --git a/core/img/actions/comment.png b/core/img/actions/comment.png deleted file mode 100644 index 08867cf636..0000000000 Binary files a/core/img/actions/comment.png and /dev/null differ diff --git a/core/img/actions/confirm.png b/core/img/actions/confirm.png deleted file mode 100644 index 3021d4c27d..0000000000 Binary files a/core/img/actions/confirm.png and /dev/null differ diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png deleted file mode 100644 index ed12640df7..0000000000 Binary files a/core/img/actions/delete-hover.png and /dev/null differ diff --git a/core/img/actions/delete-white.png b/core/img/actions/delete-white.png deleted file mode 100644 index 07a5de3425..0000000000 Binary files a/core/img/actions/delete-white.png and /dev/null differ diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png deleted file mode 100644 index 20e894c7f7..0000000000 Binary files a/core/img/actions/delete.png and /dev/null differ diff --git a/core/img/actions/details.png b/core/img/actions/details.png deleted file mode 100644 index 9145025be2..0000000000 Binary files a/core/img/actions/details.png and /dev/null differ diff --git a/core/img/actions/download-white.png b/core/img/actions/download-white.png deleted file mode 100644 index 815b551354..0000000000 Binary files a/core/img/actions/download-white.png and /dev/null differ diff --git a/core/img/actions/download.png b/core/img/actions/download.png deleted file mode 100644 index 1f8e1a4f7e..0000000000 Binary files a/core/img/actions/download.png and /dev/null differ diff --git a/core/img/actions/edit.png b/core/img/actions/edit.png deleted file mode 100644 index 7ca20eba36..0000000000 Binary files a/core/img/actions/edit.png and /dev/null differ diff --git a/core/img/actions/error-color.png b/core/img/actions/error-color.png deleted file mode 100644 index 7d00282312..0000000000 Binary files a/core/img/actions/error-color.png and /dev/null differ diff --git a/core/img/actions/error-white.png b/core/img/actions/error-white.png deleted file mode 100644 index 6e15865401..0000000000 Binary files a/core/img/actions/error-white.png and /dev/null differ diff --git a/core/img/actions/error.png b/core/img/actions/error.png deleted file mode 100644 index 61df76b53e..0000000000 Binary files a/core/img/actions/error.png and /dev/null differ diff --git a/core/img/actions/external.png b/core/img/actions/external.png deleted file mode 100644 index af03dbf3e0..0000000000 Binary files a/core/img/actions/external.png and /dev/null differ diff --git a/core/img/actions/history.png b/core/img/actions/history.png deleted file mode 100644 index ec2bbd0587..0000000000 Binary files a/core/img/actions/history.png and /dev/null differ diff --git a/core/img/actions/info-white.png b/core/img/actions/info-white.png deleted file mode 100644 index 670d7309c4..0000000000 Binary files a/core/img/actions/info-white.png and /dev/null differ diff --git a/core/img/actions/info.png b/core/img/actions/info.png deleted file mode 100644 index b280a019ab..0000000000 Binary files a/core/img/actions/info.png and /dev/null differ diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png deleted file mode 100644 index ad230de98f..0000000000 Binary files a/core/img/actions/logout.png and /dev/null differ diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png deleted file mode 100644 index 6d06259cd0..0000000000 Binary files a/core/img/actions/mail.png and /dev/null differ diff --git a/core/img/actions/menu.png b/core/img/actions/menu.png deleted file mode 100644 index 583ce31917..0000000000 Binary files a/core/img/actions/menu.png and /dev/null differ diff --git a/core/img/actions/more.png b/core/img/actions/more.png deleted file mode 100644 index 880d5dccce..0000000000 Binary files a/core/img/actions/more.png and /dev/null differ diff --git a/core/img/actions/password.png b/core/img/actions/password.png deleted file mode 100644 index 3619fabab9..0000000000 Binary files a/core/img/actions/password.png and /dev/null differ diff --git a/core/img/actions/pause-big.png b/core/img/actions/pause-big.png deleted file mode 100644 index 054281c631..0000000000 Binary files a/core/img/actions/pause-big.png and /dev/null differ diff --git a/core/img/actions/pause.png b/core/img/actions/pause.png deleted file mode 100644 index d4b865e340..0000000000 Binary files a/core/img/actions/pause.png and /dev/null differ diff --git a/core/img/actions/play-add.png b/core/img/actions/play-add.png deleted file mode 100644 index ccf77d2a06..0000000000 Binary files a/core/img/actions/play-add.png and /dev/null differ diff --git a/core/img/actions/play-big.png b/core/img/actions/play-big.png deleted file mode 100644 index 7d4916cb20..0000000000 Binary files a/core/img/actions/play-big.png and /dev/null differ diff --git a/core/img/actions/play-next.png b/core/img/actions/play-next.png deleted file mode 100644 index 50cd91d240..0000000000 Binary files a/core/img/actions/play-next.png and /dev/null differ diff --git a/core/img/actions/play-previous.png b/core/img/actions/play-previous.png deleted file mode 100644 index c380e96bb5..0000000000 Binary files a/core/img/actions/play-previous.png and /dev/null differ diff --git a/core/img/actions/play.png b/core/img/actions/play.png deleted file mode 100644 index 7994424c65..0000000000 Binary files a/core/img/actions/play.png and /dev/null differ diff --git a/core/img/actions/public.png b/core/img/actions/public.png deleted file mode 100644 index 772838ad20..0000000000 Binary files a/core/img/actions/public.png and /dev/null differ diff --git a/core/img/actions/radio-checked-disabled.png b/core/img/actions/radio-checked-disabled.png deleted file mode 100644 index 09abc410f6..0000000000 Binary files a/core/img/actions/radio-checked-disabled.png and /dev/null differ diff --git a/core/img/actions/radio-checked.png b/core/img/actions/radio-checked.png deleted file mode 100644 index 94933b7b69..0000000000 Binary files a/core/img/actions/radio-checked.png and /dev/null differ diff --git a/core/img/actions/radio-disabled.png b/core/img/actions/radio-disabled.png deleted file mode 100644 index ac7f49ed53..0000000000 Binary files a/core/img/actions/radio-disabled.png and /dev/null differ diff --git a/core/img/actions/radio-white.png b/core/img/actions/radio-white.png deleted file mode 100644 index 04beefdff0..0000000000 Binary files a/core/img/actions/radio-white.png and /dev/null differ diff --git a/core/img/actions/radio.png b/core/img/actions/radio.png deleted file mode 100644 index 70ac4741b9..0000000000 Binary files a/core/img/actions/radio.png and /dev/null differ diff --git a/core/img/actions/rename.png b/core/img/actions/rename.png deleted file mode 100644 index 975bd2d703..0000000000 Binary files a/core/img/actions/rename.png and /dev/null differ diff --git a/core/img/actions/search-white.png b/core/img/actions/search-white.png deleted file mode 100644 index 9812c44a3d..0000000000 Binary files a/core/img/actions/search-white.png and /dev/null differ diff --git a/core/img/actions/search.png b/core/img/actions/search.png deleted file mode 100644 index 5f4767a6f4..0000000000 Binary files a/core/img/actions/search.png and /dev/null differ diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png deleted file mode 100644 index 3ab939ca37..0000000000 Binary files a/core/img/actions/settings.png and /dev/null differ diff --git a/core/img/actions/share.png b/core/img/actions/share.png deleted file mode 100644 index fdacbbabeb..0000000000 Binary files a/core/img/actions/share.png and /dev/null differ diff --git a/core/img/actions/shared.png b/core/img/actions/shared.png deleted file mode 100644 index fdacbbabeb..0000000000 Binary files a/core/img/actions/shared.png and /dev/null differ diff --git a/core/img/actions/sound-off.png b/core/img/actions/sound-off.png deleted file mode 100644 index 0457de8e4d..0000000000 Binary files a/core/img/actions/sound-off.png and /dev/null differ diff --git a/core/img/actions/sound.png b/core/img/actions/sound.png deleted file mode 100644 index e849b4d248..0000000000 Binary files a/core/img/actions/sound.png and /dev/null differ diff --git a/core/img/actions/star.png b/core/img/actions/star.png deleted file mode 100644 index 88e4ad5458..0000000000 Binary files a/core/img/actions/star.png and /dev/null differ diff --git a/core/img/actions/starred.png b/core/img/actions/starred.png deleted file mode 100644 index 22e68c757e..0000000000 Binary files a/core/img/actions/starred.png and /dev/null differ diff --git a/core/img/actions/toggle-filelist.png b/core/img/actions/toggle-filelist.png deleted file mode 100644 index 0926a726d5..0000000000 Binary files a/core/img/actions/toggle-filelist.png and /dev/null differ diff --git a/core/img/actions/toggle-pictures.png b/core/img/actions/toggle-pictures.png deleted file mode 100644 index 7499d5b780..0000000000 Binary files a/core/img/actions/toggle-pictures.png and /dev/null differ diff --git a/core/img/actions/toggle.png b/core/img/actions/toggle.png deleted file mode 100644 index 24a6a4d47d..0000000000 Binary files a/core/img/actions/toggle.png and /dev/null differ diff --git a/core/img/actions/triangle-e.png b/core/img/actions/triangle-e.png deleted file mode 100644 index 4ce1086f61..0000000000 Binary files a/core/img/actions/triangle-e.png and /dev/null differ diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png deleted file mode 100644 index 2042d66532..0000000000 Binary files a/core/img/actions/triangle-n.png and /dev/null differ diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png deleted file mode 100644 index 97c64c6a72..0000000000 Binary files a/core/img/actions/triangle-s.png and /dev/null differ diff --git a/core/img/actions/upload-white.png b/core/img/actions/upload-white.png deleted file mode 100644 index 28693f855d..0000000000 Binary files a/core/img/actions/upload-white.png and /dev/null differ diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png deleted file mode 100644 index 8955ed9641..0000000000 Binary files a/core/img/actions/upload.png and /dev/null differ diff --git a/core/img/actions/user.png b/core/img/actions/user.png deleted file mode 100644 index 5f2fddc0ea..0000000000 Binary files a/core/img/actions/user.png and /dev/null differ diff --git a/core/img/actions/view-close.png b/core/img/actions/view-close.png deleted file mode 100644 index eae9acc7a4..0000000000 Binary files a/core/img/actions/view-close.png and /dev/null differ diff --git a/core/img/actions/view-download.png b/core/img/actions/view-download.png deleted file mode 100644 index 29e1b6fec7..0000000000 Binary files a/core/img/actions/view-download.png and /dev/null differ diff --git a/core/img/actions/view-next.png b/core/img/actions/view-next.png deleted file mode 100644 index be8cc15cec..0000000000 Binary files a/core/img/actions/view-next.png and /dev/null differ diff --git a/core/img/actions/view-pause.png b/core/img/actions/view-pause.png deleted file mode 100644 index 94cd1a5dc6..0000000000 Binary files a/core/img/actions/view-pause.png and /dev/null differ diff --git a/core/img/actions/view-play.png b/core/img/actions/view-play.png deleted file mode 100644 index a8398d5758..0000000000 Binary files a/core/img/actions/view-play.png and /dev/null differ diff --git a/core/img/actions/view-previous.png b/core/img/actions/view-previous.png deleted file mode 100644 index 86e2a80962..0000000000 Binary files a/core/img/actions/view-previous.png and /dev/null differ diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png deleted file mode 100644 index 5556920aa7..0000000000 Binary files a/core/img/breadcrumb.png and /dev/null differ diff --git a/core/img/desktopapp.png b/core/img/desktopapp.png deleted file mode 100644 index 272397c949..0000000000 Binary files a/core/img/desktopapp.png and /dev/null differ diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png deleted file mode 100644 index c215094eaa..0000000000 Binary files a/core/img/filetypes/application-pdf.png and /dev/null differ diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png deleted file mode 100644 index d9db3b9114..0000000000 Binary files a/core/img/filetypes/application.png and /dev/null differ diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png deleted file mode 100644 index 3d52756341..0000000000 Binary files a/core/img/filetypes/audio.png and /dev/null differ diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png deleted file mode 100644 index 74add13f27..0000000000 Binary files a/core/img/filetypes/file.png and /dev/null differ diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png deleted file mode 100644 index 1124a02982..0000000000 Binary files a/core/img/filetypes/folder-drag-accept.png and /dev/null differ diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png deleted file mode 100644 index dd8343d245..0000000000 Binary files a/core/img/filetypes/folder-external.png and /dev/null differ diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png deleted file mode 100644 index 3da67f85f7..0000000000 Binary files a/core/img/filetypes/folder-public.png and /dev/null differ diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png deleted file mode 100644 index d24e1d7af4..0000000000 Binary files a/core/img/filetypes/folder-shared.png and /dev/null differ diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png deleted file mode 100644 index 4b847bf69e..0000000000 Binary files a/core/img/filetypes/folder-starred.png and /dev/null differ diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png deleted file mode 100644 index e811e9cdfd..0000000000 Binary files a/core/img/filetypes/folder.png and /dev/null differ diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png deleted file mode 100644 index 8ff5e6c119..0000000000 Binary files a/core/img/filetypes/image.png and /dev/null differ diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png deleted file mode 100644 index 68117e0d07..0000000000 Binary files a/core/img/filetypes/package-x-generic.png and /dev/null differ diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png deleted file mode 100644 index f21c3a9951..0000000000 Binary files a/core/img/filetypes/text-calendar.png and /dev/null differ diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png deleted file mode 100644 index 69744e499e..0000000000 Binary files a/core/img/filetypes/text-code.png and /dev/null differ diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png deleted file mode 100644 index 087eadaabd..0000000000 Binary files a/core/img/filetypes/text-vcard.png and /dev/null differ diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png deleted file mode 100644 index d6bec70cf4..0000000000 Binary files a/core/img/filetypes/text.png and /dev/null differ diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png deleted file mode 100644 index 7cc1ecdc46..0000000000 Binary files a/core/img/filetypes/video.png and /dev/null differ diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png deleted file mode 100644 index 3bc2f08d1f..0000000000 Binary files a/core/img/filetypes/x-office-document.png and /dev/null differ diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png deleted file mode 100644 index 644fb85200..0000000000 Binary files a/core/img/filetypes/x-office-presentation.png and /dev/null differ diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png deleted file mode 100644 index 8f79c32fe0..0000000000 Binary files a/core/img/filetypes/x-office-spreadsheet.png and /dev/null differ diff --git a/core/img/logo-icon.png b/core/img/logo-icon.png deleted file mode 100644 index 6874c83673..0000000000 Binary files a/core/img/logo-icon.png and /dev/null differ diff --git a/core/img/places/calendar-dark.png b/core/img/places/calendar-dark.png deleted file mode 100644 index 9dc21d8a7b..0000000000 Binary files a/core/img/places/calendar-dark.png and /dev/null differ diff --git a/core/img/places/contacts-dark.png b/core/img/places/contacts-dark.png deleted file mode 100644 index fe03bbfe1a..0000000000 Binary files a/core/img/places/contacts-dark.png and /dev/null differ diff --git a/core/img/places/files.png b/core/img/places/files.png deleted file mode 100644 index e317fc3c72..0000000000 Binary files a/core/img/places/files.png and /dev/null differ diff --git a/core/img/places/home.png b/core/img/places/home.png deleted file mode 100644 index 2e0313d59a..0000000000 Binary files a/core/img/places/home.png and /dev/null differ diff --git a/core/img/places/link.png b/core/img/places/link.png deleted file mode 100644 index 8ba9f6530f..0000000000 Binary files a/core/img/places/link.png and /dev/null differ diff --git a/core/img/places/music.png b/core/img/places/music.png deleted file mode 100644 index 0670544fed..0000000000 Binary files a/core/img/places/music.png and /dev/null differ diff --git a/core/img/places/picture.png b/core/img/places/picture.png deleted file mode 100644 index 171af526e9..0000000000 Binary files a/core/img/places/picture.png and /dev/null differ diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index ea034f0aff..15b58f9e08 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -145,7 +145,7 @@ break; case 'closeButton': if(value) { - var $closeButton = $(''); + var $closeButton = $(''); this.$dialog.prepend($closeButton); $closeButton.on('click', function() { self.close(); diff --git a/core/js/js.js b/core/js/js.js index 7f98668dcb..07ed396bec 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -327,8 +327,8 @@ var OC={ * @return {string} */ imagePath:function(app,file){ - if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support - file+=(OC.Util.hasSVGSupport())?'.svg':'.png'; + if(file.indexOf('.')==-1){//if no extension is given, use svg + file+='.svg'; } return OC.filePath(app,'img',file); }, @@ -592,7 +592,7 @@ var OC={ var arrowclass = settings.hasClass('topright') ? 'up' : 'left'; var jqxhr = $.get(OC.filePath(props.appid, '', props.scriptName), function(data) { popup.html(data).ready(function() { - popup.prepend('

'+t('core', 'Settings')+'

').show(); + popup.prepend('

'+t('core', 'Settings')+'

').show(); popup.find('.close').bind('click', function() { popup.remove(); }); @@ -613,9 +613,6 @@ var OC={ throw e; }); } - if(!OC.Util.hasSVGSupport()) { - OC.Util.replaceSVG(); - } }).show(); }, 'html'); } @@ -1357,49 +1354,6 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ }; } -/** - * check if the browser support svg images - * @return {boolean} - */ -function SVGSupport() { - 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); - if(parts.length===2){ - var value=parts[1].trim(); - if(value[0]==='"'){ - value=value.substr(1,value.length-2); - } - headers[parts[0].toLowerCase()]=value; - } - } - }); - if(headers["content-type"]!=='image/svg+xml'){ - OC.Util.replaceSVG(); - SVGSupport.checkMimeType.correct=false; - } - } - }); -}; -SVGSupport.checkMimeType.correct=true; - -/** - * Replace all svg images with png for browser compatibility - * @param $el - * @deprecated use OC.Util.replaceSVG instead - */ -function replaceSVG($el){ - return OC.Util.replaceSVG($el); -} - /** * prototypical inheritance functions * @todo Write documentation @@ -1517,12 +1471,6 @@ function initCore() { initSessionHeartBeat(); } - if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that don't support svg - OC.Util.replaceSVG(); - }else{ - SVGSupport.checkMimeType(); - } - OC.registerMenu($('#expand'), $('#expanddiv')); // toggle for menus @@ -1791,24 +1739,21 @@ OC.Util = { }, /** * Returns whether the browser supports SVG + * @deprecated SVG is always supported (since 9.0) * @return {boolean} true if the browser supports SVG, false otherwise */ - // TODO: replace with original function - hasSVGSupport: SVGSupport, + hasSVGSupport: function(){ + return true + }, /** * If SVG is not supported, replaces the given icon's extension * from ".svg" to ".png". * If SVG is supported, return the image path as is. * @param {string} file image path with svg extension + * @deprecated SVG is always supported (since 9.0) * @return {string} fixed image path with png extension if SVG is not supported */ replaceSVGIcon: function(file) { - if (file && !OC.Util.hasSVGSupport()) { - var i = file.lastIndexOf('.svg'); - if (i >= 0) { - file = file.substr(0, i) + '.png' + file.substr(i+4); - } - } return file; }, /** @@ -1816,39 +1761,9 @@ OC.Util = { * with PNG images. * * @param $el root element from which to search, defaults to $('body') + * @deprecated SVG is always supported (since 9.0) */ - replaceSVG: function($el) { - if (!$el) { - $el = $('body'); - } - $el.find('img.svg').each(function(index,element){ - element=$(element); - var src=element.attr('src'); - element.attr('src',src.substr(0, src.length-3) + 'png'); - }); - $el.find('.svg').each(function(index,element){ - element = $(element); - var background = element.css('background-image'); - if (background){ - var i = background.lastIndexOf('.svg'); - if (i >= 0){ - background = background.substr(0,i) + '.png' + background.substr(i + 4); - element.css('background-image', background); - } - } - element.find('*').each(function(index, element) { - element = $(element); - var background = element.css('background-image'); - if (background) { - var i = background.lastIndexOf('.svg'); - if(i >= 0){ - background = background.substr(0,i) + '.png' + background.substr(i + 4); - element.css('background-image', background); - } - } - }); - }); - }, + replaceSVG: function($el) {}, /** * Fix image scaling for IE8, since background-size is not supported. diff --git a/core/js/mimetype.js b/core/js/mimetype.js index 3cc33ce283..0d30da26c2 100644 --- a/core/js/mimetype.js +++ b/core/js/mimetype.js @@ -29,7 +29,7 @@ OC.MimeType = { * Cache that maps mimeTypes to icon urls */ _mimeTypeIcons: {}, - + /** * Return the file icon we want to use for the given mimeType. * The file needs to be present in the supplied file list @@ -60,7 +60,7 @@ OC.MimeType = { return null; }, - + /** * Return the url to icon of the given mimeType * @@ -91,19 +91,14 @@ OC.MimeType = { path += icon; } } - + // If we do not yet have an icon fall back to the default if (gotIcon === null) { path = OC.webroot + '/core/img/filetypes/'; path += OC.MimeType._getFile(mimeType, OC.MimeTypeList.files); } - // Use svg if we can - if(OC.Util.hasSVGSupport()){ - path += '.svg'; - } else { - path += '.png'; - } + path += '.svg'; // Cache the result OC.MimeType._mimeTypeIcons[mimeType] = path; @@ -111,5 +106,3 @@ OC.MimeType = { } }; - - diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 83fde15461..85dee97898 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -38,7 +38,7 @@ '' + '' + '' + - '{{crudsLabel}}' + + '{{crudsLabel}}' + '' + '{{/if}}' + '