fixed javascript not loading bug

DM164 · Oct 21, 2019 · b5179f6 · b5179f6
1 parent 005cb35
commit b5179f6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/main.js b/main.js
@@ -131,28 +131,30 @@ function createWindow () {
     mainWindow.webContents.send('volume-down')
   })
 
-mainWindow.webContents.executeJavaScript(`
-
-const topBarJS = document.createElement('script');
-topBarJS.setAttribute('src', 'https://dl.dropbox.com/s/dhoar8i0zkhhhd4/topBar.js?dl=0')
-topBarJS.setAttribute('defer', '')
-document.querySelector('body').prepend(topBarJS);
-
-const retrieveServerData = document.createElement('script');
-retrieveServerData.setAttribute('src', 'https://dl.dropbox.com/s/q45u3wo8zaqthnv/serverData.js?dl=0')
-retrieveServerData.setAttribute('defer', '')
-document.querySelector('body').prepend(retrieveServerData);
-
-const javascript = document.createElement('script');
-javascript.setAttribute('src', 'https://dl.dropbox.com/s/uaa8zh8b3zjogon/customscript.js?dl=0')
-javascript.setAttribute('defer', '')
-document.querySelector('body').prepend(javascript);
-
-const stylesheet = document.createElement('link');
-stylesheet.setAttribute("rel", "stylesheet");
-stylesheet.setAttribute("href", "https://dl.dropbox.com/s/sgb2h7emq0uk8y4/style.css?dl=0");
-document.querySelector('head').appendChild(stylesheet);
-`)
+  mainWindow.webContents.on('dom-ready', function(){
+    mainWindow.webContents.executeJavaScript(`
+    
+    const topBarJS = document.createElement('script');
+    topBarJS.setAttribute('src', 'https://dl.dropbox.com/s/dhoar8i0zkhhhd4/topBar.js?dl=0')
+    topBarJS.setAttribute('defer', '')
+    document.querySelector('body').prepend(topBarJS);
+    
+    const retrieveServerData = document.createElement('script');
+    retrieveServerData.setAttribute('src', 'https://dl.dropbox.com/s/q45u3wo8zaqthnv/serverData.js?dl=0')
+    retrieveServerData.setAttribute('defer', '')
+    document.querySelector('body').prepend(retrieveServerData);
+    
+    const javascript = document.createElement('script');
+    javascript.setAttribute('src', 'https://dl.dropbox.com/s/uaa8zh8b3zjogon/customscript.js?dl=0')
+    javascript.setAttribute('defer', '')
+    document.querySelector('body').prepend(javascript);
+    
+    const stylesheet = document.createElement('link');
+    stylesheet.setAttribute("rel", "stylesheet");
+    stylesheet.setAttribute("href", "https://dl.dropbox.com/s/sgb2h7emq0uk8y4/style.css?dl=0");
+    document.querySelector('head').appendChild(stylesheet);
+    `)
+  })
 
 //Opens the Github page to download the latest version of the client
 ipcMain.on('openReleases', function(){

diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --icon=assets/icons/mac/icon.icns --prune=true --out=release-builds",
     "package-win": "electron-packager . \"YouTube Music by DM\" --overwrite --platform=win32 --arch=ia32 --icon=assets/icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=\"Grandpa Mining\" --version-string.FileDescription=\"Desktop app built with electron for the YT Music service.\" --version-string.ProductName=\"YouTube Music App\"",
     "package-linux": "electron-packager .  \"YouTube Music by DM\" --overwrite --asar=true --platform=linux --arch=x64 --icon=assets/icons/png/icon.png --prune=true --out=release-builds",
+
     "setup": "electron-installer-windows --src \"release-builds/YouTube Music by DM-win32-ia32/\" --dest installers/win/ --options.exe \"YouTube Music by DM.exe\" --options.icon assets/icons/win/icon.ico",
     "setup-mac": "electron-installer-dmg \"release-builds/YouTube Music by DM-win32-ia32/\" \"YouTube Music by DM\"",
     "setup-debian": "electron-installer-debian --src \"release-builds/YouTube Music by DM-linux-x64/\" --dest installers/linux/ --options.icon assets/icons/png/icon.png --arch amd64"