Browse Source

Merge pull request #19454 from owncloud/ie8-madness-returns

[IE8] Fix file type sizes and popover menus in file list
remotes/origin/certificate-external-storage-visibility
Thomas Müller 11 years ago
parent
commit
eeac6e2ab1
  1. 3
      apps/files/css/files.css
  2. 2
      apps/files/js/mainfileinfodetailview.js
  3. 1
      apps/files/js/newfilemenu.js
  4. 7
      core/css/apps.css
  5. BIN
      core/img/filetypes/application-pdf.png
  6. BIN
      core/img/filetypes/application.png
  7. BIN
      core/img/filetypes/audio.png
  8. BIN
      core/img/filetypes/file.png
  9. BIN
      core/img/filetypes/folder-drag-accept.png
  10. BIN
      core/img/filetypes/folder-external.png
  11. BIN
      core/img/filetypes/folder-public.png
  12. BIN
      core/img/filetypes/folder-shared.png
  13. BIN
      core/img/filetypes/folder-starred.png
  14. BIN
      core/img/filetypes/folder.png
  15. BIN
      core/img/filetypes/image.png
  16. BIN
      core/img/filetypes/package-x-generic.png
  17. BIN
      core/img/filetypes/text-calendar.png
  18. BIN
      core/img/filetypes/text-code.png
  19. BIN
      core/img/filetypes/text-vcard.png
  20. BIN
      core/img/filetypes/text.png
  21. BIN
      core/img/filetypes/video.png
  22. BIN
      core/img/filetypes/x-office-document.png
  23. BIN
      core/img/filetypes/x-office-presentation.png
  24. BIN
      core/img/filetypes/x-office-spreadsheet.png
  25. 40
      core/js/js.js

3
apps/files/css/files.css

@ -580,6 +580,9 @@ a.action > img {
#fileList .popovermenu {
margin-right: 21px;
}
.ie8 #fileList .popovermenu {
margin-top: -10px;
}
.ie8 #fileList a.action img,
#fileList tr:hover a.action,

2
apps/files/js/mainfileinfodetailview.js

@ -131,6 +131,7 @@
} else {
// TODO: special icons / shared / external
$iconDiv.css('background-image', 'url("' + OC.MimeType.getIconUrl('dir') + '")');
OC.Util.scaleFixForIE8($iconDiv);
}
this.$el.find('[title]').tooltip({placement: 'bottom'});
} else {
@ -214,6 +215,7 @@
$iconDiv.css({
'background-image': 'url("' + $iconDiv.previewImg + '")'
});
OC.Util.scaleFixForIE8($iconDiv);
}.bind(this)
});
}

1
apps/files/js/newfilemenu.js

@ -212,6 +212,7 @@
fileType: 'folder'
}]
}));
OC.Util.scaleFixForIE8(this.$('.svg'));
},
/**

7
core/css/apps.css

@ -308,6 +308,13 @@
-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
}
.ie8 .bubble {
border: 1px solid #eee;
margin-top: 18px;
}
.ie8 .bubble:after {
display: none;
}
/* miraculous border arrow stuff */
.bubble:after,
#app-navigation .app-navigation-entry-menu:after {

BIN
core/img/filetypes/application-pdf.png

Before

Width: 48  |  Height: 48  |  Size: 1022 B

After

Width: 32  |  Height: 32  |  Size: 892 B

BIN
core/img/filetypes/application.png

Before

Width: 48  |  Height: 48  |  Size: 614 B

After

Width: 32  |  Height: 32  |  Size: 805 B

BIN
core/img/filetypes/audio.png

Before

Width: 48  |  Height: 48  |  Size: 781 B

After

Width: 32  |  Height: 32  |  Size: 640 B

BIN
core/img/filetypes/file.png

Before

Width: 48  |  Height: 48  |  Size: 251 B

After

Width: 32  |  Height: 32  |  Size: 306 B

BIN
core/img/filetypes/folder-drag-accept.png

Before

Width: 48  |  Height: 48  |  Size: 188 B

After

Width: 32  |  Height: 32  |  Size: 283 B

BIN
core/img/filetypes/folder-external.png

Before

Width: 48  |  Height: 48  |  Size: 549 B

After

Width: 32  |  Height: 32  |  Size: 595 B

BIN
core/img/filetypes/folder-public.png

Before

Width: 48  |  Height: 48  |  Size: 602 B

After

Width: 32  |  Height: 32  |  Size: 693 B

BIN
core/img/filetypes/folder-shared.png

Before

Width: 48  |  Height: 48  |  Size: 726 B

After

Width: 32  |  Height: 32  |  Size: 655 B

BIN
core/img/filetypes/folder-starred.png

Before

Width: 48  |  Height: 48  |  Size: 683 B

After

Width: 32  |  Height: 32  |  Size: 655 B

BIN
core/img/filetypes/folder.png

Before

Width: 48  |  Height: 48  |  Size: 215 B

After

Width: 32  |  Height: 32  |  Size: 276 B

BIN
core/img/filetypes/image.png

Before

Width: 48  |  Height: 48  |  Size: 394 B

After

Width: 32  |  Height: 32  |  Size: 486 B

BIN
core/img/filetypes/package-x-generic.png

Before

Width: 48  |  Height: 48  |  Size: 210 B

After

Width: 32  |  Height: 32  |  Size: 302 B

BIN
core/img/filetypes/text-calendar.png

Before

Width: 48  |  Height: 48  |  Size: 572 B

After

Width: 32  |  Height: 32  |  Size: 570 B

BIN
core/img/filetypes/text-code.png

Before

Width: 48  |  Height: 48  |  Size: 314 B

After

Width: 32  |  Height: 32  |  Size: 591 B

BIN
core/img/filetypes/text-vcard.png

Before

Width: 48  |  Height: 48  |  Size: 1.1 KiB

After

Width: 32  |  Height: 32  |  Size: 889 B

BIN
core/img/filetypes/text.png

Before

Width: 48  |  Height: 48  |  Size: 270 B

After

Width: 32  |  Height: 32  |  Size: 382 B

BIN
core/img/filetypes/video.png

Before

Width: 48  |  Height: 48  |  Size: 239 B

After

Width: 32  |  Height: 32  |  Size: 318 B

BIN
core/img/filetypes/x-office-document.png

Before

Width: 48  |  Height: 48  |  Size: 270 B

After

Width: 32  |  Height: 32  |  Size: 380 B

BIN
core/img/filetypes/x-office-presentation.png

Before

Width: 48  |  Height: 48  |  Size: 179 B

After

Width: 32  |  Height: 32  |  Size: 259 B

BIN
core/img/filetypes/x-office-spreadsheet.png

Before

Width: 48  |  Height: 48  |  Size: 266 B

After

Width: 32  |  Height: 32  |  Size: 362 B

40
core/js/js.js

@ -1596,6 +1596,46 @@ OC.Util = {
});
},
/**
* Fix image scaling for IE8, since background-size is not supported.
*
* This scales the image to the element's actual size, the URL is
* taken from the "background-image" CSS attribute.
*
* @param {Object} $el image element
*/
scaleFixForIE8: function($el) {
if (!this.isIE8()) {
return;
}
var self = this;
$($el).each(function() {
var url = $(this).css('background-image');
var r = url.match(/url\(['"]?([^'")]*)['"]?\)/);
if (!r) {
return;
}
url = r[1];
url = self.replaceSVGIcon(url);
// TODO: escape
url = url.replace(/'/g, '%27');
$(this).css({
'filter': 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'' + url + '\', sizingMethod=\'scale\')',
'background-image': ''
});
});
return $el;
},
/**
* Returns whether this is IE8
*
* @return {bool} true if this is IE8, false otherwise
*/
isIE8: function() {
return $('html').hasClass('ie8');
},
/**
* Remove the time component from a given date
*

Loading…
Cancel
Save