Merge pull request #939 from nextcloud/stable10-backport-937

[stable10] SVG defintions always take the first one
nextcloud · Aug 18, 2016 · df5a1e2 · df5a1e2
2 parents 0f926e0 + c07090e
commit df5a1e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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 + '"  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 + '"  class="app-icon"></image></svg>';
 		}
 		return img;

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
@@ -180,6 +180,9 @@
 	</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>