diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-11-16 10:53:31 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-16 12:08:23 +0100 |
| commit | 44b0d3916e0cec34d30b0895eaf3aa4756247cbe (patch) | |
| tree | 41f36ff600ec36ca65f7dec703c9b36f4340343b | |
| parent | def8af3e7e1f4328860f5c2d0c1643e0553f58e0 (diff) | |
| download | nextcloud-server-44b0d3916e0cec34d30b0895eaf3aa4756247cbe.tar.gz nextcloud-server-44b0d3916e0cec34d30b0895eaf3aa4756247cbe.zip | |
Fix navigation layout for items that are added on a re-render
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | settings/js/apps.js | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 641e8999b19..70857a8f201 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -31,17 +31,22 @@ OC.Settings.Apps = OC.Settings.Apps || { if (container.children('li[data-id="' + entry.id + '"]').length === 0) { var li = $('<li></li>'); li.attr('data-id', entry.id); - var img = '<svg width="16" height="16" viewBox="0 0 16 16">'; - img += '<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>'; - img += '<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="' + entry.icon + '" class="app-icon" /></svg>'; + var img = '<svg width="20" height="20" viewBox="0 0 20 20" alt="">'; + if (OCA.Theming && OCA.Theming.inverted) { + img += '<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>'; + img += '<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="' + entry.icon + '" class="app-icon" />'; + } else { + img += '<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" xlink:href="' + entry.icon + '" class="app-icon" />'; + } + img += '</svg>'; var a = $('<a></a>').attr('href', entry.href); var filename = $('<span></span>'); var loading = $('<div class="icon-loading-dark"></div>').css('display', 'none'); - filename.text(entry.name); - a.prepend(filename); + filename.text(entry.name); filename.text(entry.name); a.prepend(loading); a.prepend(img); li.append(a); + li.append(filename); // add app icon to the navigation var previousElement = $('#navigation li[data-id=' + previousEntry.id + ']'); @@ -65,20 +70,23 @@ OC.Settings.Apps = OC.Settings.Apps || { if ($('#appmenu').children('li[data-id="' + entry.id + '"]').length === 0) { var li = $('<li></li>'); li.attr('data-id', entry.id); - var img = '<img src="' + entry.icon + '" class="app-icon">'; + // Generating svg embedded image (see layout.user.php) + var img = '<svg width="20" height="20" viewBox="0 0 20 20" alt="">'; if (OCA.Theming && OCA.Theming.inverted) { - img = '<svg width="20" height="20" viewBox="0 0 20 20">'; img += '<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>'; - img += '<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="' + entry.icon + '" class="app-icon" /></svg>'; + img += '<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="' + entry.icon + '" class="app-icon" />'; + } else { + img += '<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" xlink:href="' + entry.icon + '" class="app-icon" />'; } + img += '</svg>'; var a = $('<a></a>').attr('href', entry.href); var filename = $('<span></span>'); var loading = $('<div class="icon-loading-dark"></div>').css('display', 'none'); filename.text(entry.name); - a.prepend(filename); a.prepend(loading); a.prepend(img); li.append(a); + li.append(filename); // add app icon to the navigation var previousElement = $('#appmenu li[data-id=' + previousEntry.id + ']'); @@ -102,4 +110,4 @@ OC.Settings.Apps = OC.Settings.Apps || { } }); } -};
\ No newline at end of file +}; |