diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index f3308f78..158cf251 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -167,12 +167,12 @@ export class BrowserWindow { page: "browsepage", component: ``, condition: `page == 'browse'`, - onEnter: `getBrowsePage();` + onEnter: `` }, { page: "listen_now", component: ``, condition: `page == 'listen_now'`, - onEnter: `getListenNow()` + onEnter: `` }, { page: "settings", component: ``, @@ -185,17 +185,17 @@ export class BrowserWindow { page: "library-songs", component: ``, condition: `page == 'library-songs'`, - onEnter: `getLibrarySongsFull()` + onEnter: `` }, { page: "library-albums", component: ``, condition: `page == 'library-albums'`, - onEnter: `getLibraryAlbumsFull(null, 1); getAlbumSort(); searchLibraryAlbums(1); getLibrarySongsFull() ;searchLibraryAlbums(1);` + onEnter: `` }, { page: "library-artists", component: ``, condition: `page == 'library-artists'`, - onEnter: `getLibraryArtistsFull(null, 0);` + onEnter: `` }, { page: "appleCurator", component: ``, diff --git a/src/renderer/views/pages/browse.ejs b/src/renderer/views/pages/browse.ejs index 4f4bfec1..f49ecc9e 100644 --- a/src/renderer/views/pages/browse.ejs +++ b/src/renderer/views/pages/browse.ejs @@ -42,5 +42,8 @@ app: this.$root } }, + mounted() { + this.$root.getBrowsePage(); + } }) \ No newline at end of file diff --git a/src/renderer/views/pages/library-albums.ejs b/src/renderer/views/pages/library-albums.ejs index 06c33ffc..961d2114 100644 --- a/src/renderer/views/pages/library-albums.ejs +++ b/src/renderer/views/pages/library-albums.ejs @@ -71,6 +71,13 @@ app : this.$root } }, + mounted() { + this.$root.getLibraryAlbumsFull(null, 1); + this.$root.getAlbumSort(); + this.$root.searchLibraryAlbums(1); + this.$root.getLibrarySongsFull() ; + this.$root.searchLibraryAlbums(1); + }, methods: { } }); diff --git a/src/renderer/views/pages/library-artists.ejs b/src/renderer/views/pages/library-artists.ejs index 967b8e10..87d9edc2 100644 --- a/src/renderer/views/pages/library-artists.ejs +++ b/src/renderer/views/pages/library-artists.ejs @@ -63,6 +63,7 @@ }, mounted() { let self = this; + this.$root.getLibraryArtistsFull(null, 0); this.$root.$on('ap-inlinecollection', function(e){ console.log("hey",e) self.clready = true; diff --git a/src/renderer/views/pages/library-songs.ejs b/src/renderer/views/pages/library-songs.ejs index b2e27ab5..bfe6a88e 100644 --- a/src/renderer/views/pages/library-songs.ejs +++ b/src/renderer/views/pages/library-songs.ejs @@ -80,6 +80,9 @@ app : this.$root } }, + mounted() { + this.$root.getLibrarySongsFull() + }, methods: { sayHello: function () { alert('Hello world!'); diff --git a/src/renderer/views/pages/listen_now.ejs b/src/renderer/views/pages/listen_now.ejs index fe84b52b..6bf87e36 100644 --- a/src/renderer/views/pages/listen_now.ejs +++ b/src/renderer/views/pages/listen_now.ejs @@ -15,6 +15,9 @@ Vue.component('cider-listen-now', { return { app : this.$root } + }, + mounted() { + this.$root.getListenNow() } })