From 4e55c7310a27ff2c4e15358a24a60b6393da336f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 17 Aug 2016 13:36:17 +0200 Subject: [PATCH 1/6] Filter can't be named invert in FF --- settings/js/apps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index f8ad9c7918cd3..9a68ebf90acd8 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -237,8 +237,8 @@ OC.Settings.Apps = OC.Settings.Apps || { if (appfromstore) { img += ''; } else { - img += ''; - img += ''; + img += ''; + img += ''; } return img; }, From 3b2a5850b285586d04073e73625718d0b8f49ab1 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 17 Aug 2016 14:45:08 +0200 Subject: [PATCH 2/6] Introduce weird hack for Firefox * everything is 4 times as big (doubled width and doubled height) --- settings/js/apps.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/settings/js/apps.js b/settings/js/apps.js index 9a68ebf90acd8..5a94a78381248 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -234,6 +234,11 @@ OC.Settings.Apps = OC.Settings.Apps || { imageUrl : function (url, appfromstore) { var img = ''; + // weird hack because in Firefox everything is 4 times as big (doubled in width and doubled in height) + // TODO: replace this with a proper solution + if($.browser.mozilla) { + img = ''; + } if (appfromstore) { img += ''; } else { From 271602c70e73f9760ce18c232664b2b5f9b93f73 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 17 Aug 2016 15:16:48 +0200 Subject: [PATCH 3/6] Remove hack --- settings/js/apps.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 5a94a78381248..2e2bf6830c7c1 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -234,11 +234,7 @@ OC.Settings.Apps = OC.Settings.Apps || { imageUrl : function (url, appfromstore) { var img = ''; - // weird hack because in Firefox everything is 4 times as big (doubled in width and doubled in height) - // TODO: replace this with a proper solution - if($.browser.mozilla) { - img = ''; - } + if (appfromstore) { img += ''; } else { From 94043ba7cc73fa433cb48c0b2cd4751cbb8d4111 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 17 Aug 2016 15:23:51 +0200 Subject: [PATCH 4/6] Add viewBox to app icons If we don't add a viewbox a lot of browsers will just say NOPE!!! when we ask them to scale. --- apps/comments/img/comments.svg | 2 +- apps/files_external/img/app.svg | 2 +- apps/files_sharing/img/app.svg | 1 + apps/files_trashbin/img/app.svg | 1 + apps/files_versions/img/app.svg | 1 + apps/systemtags/img/app.svg | 2 +- apps/testing/img/app.svg | 2 +- apps/user_ldap/img/app.svg | 2 +- core/img/default-app-icon.svg | 2 +- 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/comments/img/comments.svg b/apps/comments/img/comments.svg index 5cdc84a25d7f5..1eabeec334713 100644 --- a/apps/comments/img/comments.svg +++ b/apps/comments/img/comments.svg @@ -1,4 +1,4 @@ - + diff --git a/apps/files_external/img/app.svg b/apps/files_external/img/app.svg index 6cafe174f60ab..f1fd591ca703e 100644 --- a/apps/files_external/img/app.svg +++ b/apps/files_external/img/app.svg @@ -1,4 +1,4 @@ - + diff --git a/apps/files_sharing/img/app.svg b/apps/files_sharing/img/app.svg index d64e44b70b0e3..11a1a37a2992e 100644 --- a/apps/files_sharing/img/app.svg +++ b/apps/files_sharing/img/app.svg @@ -9,6 +9,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="16" width="16" + viewBox="0 0 16 16" version="1.1" id="svg2" inkscape:version="0.48.5 r10040" diff --git a/apps/files_trashbin/img/app.svg b/apps/files_trashbin/img/app.svg index b749f9879e658..cd169009e7669 100644 --- a/apps/files_trashbin/img/app.svg +++ b/apps/files_trashbin/img/app.svg @@ -9,6 +9,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="16" width="16" + viewBox="0 0 16 16" version="1.1" id="svg2" inkscape:version="0.48.5 r10040" diff --git a/apps/files_versions/img/app.svg b/apps/files_versions/img/app.svg index 862b0a6885ec9..831ef7fedde24 100644 --- a/apps/files_versions/img/app.svg +++ b/apps/files_versions/img/app.svg @@ -9,6 +9,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="16" width="16" + viewBox="0 0 16 16" version="1.0" id="svg2" inkscape:version="0.48.5 r10040" diff --git a/apps/systemtags/img/app.svg b/apps/systemtags/img/app.svg index 8bfd246078e8a..4f201c6c76961 100644 --- a/apps/systemtags/img/app.svg +++ b/apps/systemtags/img/app.svg @@ -1,4 +1,4 @@ - + diff --git a/apps/testing/img/app.svg b/apps/testing/img/app.svg index b6ae35211a39c..ad789050c9aa1 100644 --- a/apps/testing/img/app.svg +++ b/apps/testing/img/app.svg @@ -1,4 +1,4 @@ - + diff --git a/apps/user_ldap/img/app.svg b/apps/user_ldap/img/app.svg index 0ce7ed867bd8a..5642ad9c9e1f2 100644 --- a/apps/user_ldap/img/app.svg +++ b/apps/user_ldap/img/app.svg @@ -1,5 +1,5 @@ - + diff --git a/core/img/default-app-icon.svg b/core/img/default-app-icon.svg index b6ae35211a39c..ad789050c9aa1 100644 --- a/core/img/default-app-icon.svg +++ b/core/img/default-app-icon.svg @@ -1,4 +1,4 @@ - + From dd5690fca62558597ff5f95eaf59f6a14f4f5e34 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 17 Aug 2016 15:59:30 +0200 Subject: [PATCH 5/6] Empty tags are not allowed for image and feColorMatrix in IE11 and below --- core/templates/layout.user.php | 8 ++++---- settings/js/apps.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index be5c769ab768a..2c0d3f05297ee 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -114,8 +114,8 @@ class="active"> - - + + @@ -132,8 +132,8 @@ class="active"> - - + + diff --git a/settings/js/apps.js b/settings/js/apps.js index 2e2bf6830c7c1..89b446ed3b94f 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -238,8 +238,8 @@ OC.Settings.Apps = OC.Settings.Apps || { if (appfromstore) { img += ''; } else { - img += ''; - img += ''; + img += ''; + img += ''; } return img; }, From 98382e39c5454d5b9f5c270d4aabb9fbee6f6d5b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 17 Aug 2016 16:04:53 +0200 Subject: [PATCH 6/6] Fix null reference in IE --- settings/js/apps.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 89b446ed3b94f..ac259dd7989be 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -196,13 +196,13 @@ OC.Settings.Apps = OC.Settings.Apps || { if (app.preview && !OC.Util.isIE()) { var currentImage = new Image(); currentImage.src = app.preview; - } - currentImage.onload = function() { - page.find('.app-image') - .append(OC.Settings.Apps.imageUrl(app.preview, app.detailpage)) - .fadeIn(); - }; + currentImage.onload = function() { + page.find('.app-image') + .append(OC.Settings.Apps.imageUrl(app.preview, app.detailpage)) + .fadeIn(); + }; + } // set group select properly if(OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||