]> source.dussan.org Git - nextcloud-server.git/commitdiff
Empty tags are not allowed for image and feColorMatrix in IE11 and below
authorMorris Jobke <hey@morrisjobke.de>
Wed, 17 Aug 2016 13:59:30 +0000 (15:59 +0200)
committerMorris Jobke <hey@morrisjobke.de>
Wed, 17 Aug 2016 14:27:12 +0000 (16:27 +0200)
core/templates/layout.user.php
settings/js/apps.js

index be5c769ab768a3d6e9d46fb9f58bb46b02d06d5c..2c0d3f05297ee753de52922d42acc01ab83e2bdd 100644 (file)
                                                <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
                                                        <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
                                                        <svg width="32" height="32" viewBox="0 0 32 32">
-                                                               <defs><filter id="invert"><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" /></filter></defs>
-                                                               <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped($entry['icon']); ?>"  class="app-icon"/>
+                                                               <defs><filter id="invert"><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>
+                                                               <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped($entry['icon']); ?>"  class="app-icon"></image>
                                                        </svg>
                                                        <div class="icon-loading-dark" style="display:none;"></div>
                                                        <span>
                                                <a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
                                                        <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
                                                        <svg width="32" height="32" viewBox="0 0 32 32" class="app-icon">
-                                                               <defs><filter id="invert"><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" /></filter></defs>
-                                                               <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg')); ?>"/>
+                                                               <defs><filter id="invert"><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>
+                                                               <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg')); ?>"></image>
                                                        </svg>
                                                        <div class="icon-loading-dark" style="display:none;"></div>
                                                        <span>
index 2e2bf6830c7c1f6c03c14d009457a905441bc6a3..89b446ed3b94f52a12334a5c579af89f36f843a5 100644 (file)
@@ -238,8 +238,8 @@ 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" /></filter></defs>';
-                       img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '"  class="app-icon" /></svg>';
+                       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;
        },