diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2019-12-17 16:28:19 +0300 |
|---|---|---|
| committer | npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com> | 2019-12-17 16:29:07 +0300 |
| commit | c8ecad15391a3dd8814d852249bbb417983431c5 (patch) | |
| tree | 29883bb4215c83d82f425c04a86ee453a381cf27 /src | |
| parent | 12428a3a94db031feaa7dc10a5f4296b5e8abda7 (diff) | |
| parent | c726044fbb17c598369f581e499d26dcbc1dd389 (diff) | |
Merge branch 'master' into enh/perfs
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Photos.vue | 2 | ||||
| -rw-r--r-- | src/main.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Photos.vue b/src/Photos.vue index 50766d90..f19d5f27 100644 --- a/src/Photos.vue +++ b/src/Photos.vue @@ -26,7 +26,7 @@ <AppNavigationItem :to="{name: 'root'}" class="app-navigation__photos" :title="t('photos', 'Your photos')" - icon="icon-photos" + icon="icon-yourphotos" exact /> <AppNavigationItem to="/favorites" :title="t('photos', 'Favorites')" icon="icon-favorite" /> <AppNavigationItem :to="{name: 'albums'}" :title="t('photos', 'Your albums')" icon="icon-files-dark" /> diff --git a/src/main.js b/src/main.js index 301632ed..f8dddeb3 100644 --- a/src/main.js +++ b/src/main.js @@ -47,11 +47,13 @@ Vue.prototype.t = translate Vue.prototype.n = translatePlural // TODO: remove when we have a proper fileinfo standalone library +// original scripts are loaded from +// https://github.com/nextcloud/server/blob/5bf3d1bb384da56adbf205752be8f840aac3b0c5/lib/private/legacy/template.php#L120-L122 window.addEventListener('DOMContentLoaded', () => { - // register unused client for the sidebar to have access to its parser methods if (!window.OCA.Files) { window.OCA.Files = {} } + // register unused client for the sidebar to have access to its parser methods Object.assign(window.OCA.Files, { App: { fileList: { filesClient: OC.Files.getClient() } } }, window.OCA.Files) }) |