summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-08-18 19:21:07 +0200
committerGitHub <noreply@github.com>2016-08-18 19:21:07 +0200
commit7f96e4e6754cf421b6325e757477e69badd5f579 (patch)
treec16f9df2fbee9fd7e0e075f8dcfbb1ac5ede8d51
parent6d7c5e226563c8a22f1031da3f82fa2ccc7c1a1f (diff)
parent59da5972f67cb01a95ac9be90640b64c17e9030c (diff)
downloadnextcloud-server-7f96e4e6754cf421b6325e757477e69badd5f579.tar.gz
nextcloud-server-7f96e4e6754cf421b6325e757477e69badd5f579.zip
Merge pull request #937 from nextcloud/fix_app_search
SVG defintions always take the first one
-rw-r--r--settings/js/apps.js1
-rw-r--r--settings/templates/apps.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 985b117feff..99246f323fe 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -238,7 +238,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
if (appfromstore) {
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon" /></svg>';
} else {
- img += '<defs><filter id="invertIcon"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>';
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>';
}
return img;
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index be8a911c1aa..ea62acd9945 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -180,6 +180,9 @@ script(
</div>
</div>
<div id="app-content">
+ <svg height="0">
+ <defs><filter id="invertIcon"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
+ </svg>
<div id="apps-list" class="icon-loading"></div>
<div id="apps-list-empty" class="hidden emptycontent emptycontent-search">
<div class="icon-search"></div>