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

[IE8] Fix file type sizes and popover menus in file list

25 files changed, 53 insertions, 0 deletions

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 9207a133cdf..1d4d0774482 100644
--- a/apps/files/css/files.css
+++ b/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,
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 39a00d0a5a5..b50e92dea8c 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/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)
 			});
 		}
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index b07999821d5..0a67aba202b 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -212,6 +212,7 @@
 					fileType: 'folder'
 				}]
 			}));
+			OC.Util.scaleFixForIE8(this.$('.svg'));
 		},
 
 		/**
diff --git a/core/css/apps.css b/core/css/apps.css
index 23e0c519d00..3122a2b48a1 100644
--- a/core/css/apps.css
+++ b/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 {
diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 4029f8aead1..c215094eaa7 100644
--- a/core/img/filetypes/application-pdf.png
+++ b/core/img/filetypes/application-pdf.png
diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
index 9be7361d1b6..d9db3b9114c 100644
--- a/core/img/filetypes/application.png
+++ b/core/img/filetypes/application.png
diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 4eb8ab78e3f..3d52756341a 100644
--- a/core/img/filetypes/audio.png
+++ b/core/img/filetypes/audio.png
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 3bd7463cfc9..74add13f276 100644
--- a/core/img/filetypes/file.png
+++ b/core/img/filetypes/file.png
diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
index 80ab53b72b9..1124a02982f 100644
--- a/core/img/filetypes/folder-drag-accept.png
+++ b/core/img/filetypes/folder-drag-accept.png
diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
index 5262d72e627..dd8343d245a 100644
--- a/core/img/filetypes/folder-external.png
+++ b/core/img/filetypes/folder-external.png
diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
index 17c3ee2a8d9..3da67f85f79 100644
--- a/core/img/filetypes/folder-public.png
+++ b/core/img/filetypes/folder-public.png
diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
index be5e59cbf28..d24e1d7af4e 100644
--- a/core/img/filetypes/folder-shared.png
+++ b/core/img/filetypes/folder-shared.png
diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png
index b083a9d2d11..4b847bf69ea 100644
--- a/core/img/filetypes/folder-starred.png
+++ b/core/img/filetypes/folder-starred.png
diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
index 1dbb1154100..e811e9cdfdc 100644
--- a/core/img/filetypes/folder.png
+++ b/core/img/filetypes/folder.png
diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 0feaecf2830..8ff5e6c119f 100644
--- a/core/img/filetypes/image.png
+++ b/core/img/filetypes/image.png
diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
index 287a1f18869..68117e0d070 100644
--- a/core/img/filetypes/package-x-generic.png
+++ b/core/img/filetypes/package-x-generic.png
diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
index ff3ced62531..f21c3a9951d 100644
--- a/core/img/filetypes/text-calendar.png
+++ b/core/img/filetypes/text-calendar.png
diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
index 5505102f60e..69744e499e6 100644
--- a/core/img/filetypes/text-code.png
+++ b/core/img/filetypes/text-code.png
diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
index 77ac138fe1c..087eadaabd1 100644
--- a/core/img/filetypes/text-vcard.png
+++ b/core/img/filetypes/text-vcard.png
diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
index 5fca7cb69d7..d6bec70cf43 100644
--- a/core/img/filetypes/text.png
+++ b/core/img/filetypes/text.png
diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
index 308e81cca83..7cc1ecdc46a 100644
--- a/core/img/filetypes/video.png
+++ b/core/img/filetypes/video.png
diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
index d9c5b890583..3bc2f08d1f9 100644
--- a/core/img/filetypes/x-office-document.png
+++ b/core/img/filetypes/x-office-document.png
diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
index 5b3733b7121..644fb852009 100644
--- a/core/img/filetypes/x-office-presentation.png
+++ b/core/img/filetypes/x-office-presentation.png
diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
index 5a20026ebdd..8f79c32fe01 100644
--- a/core/img/filetypes/x-office-spreadsheet.png
+++ b/core/img/filetypes/x-office-spreadsheet.png
diff --git a/core/js/js.js b/core/js/js.js
index 397fea8e3c5..e40141ac617 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1597,6 +1597,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
 	 *
 	 * @param {Date} date date