Merge pull request #10 from alexkim205/hotfix-9

no media shown after login -> fixed
alexkim205 · Mar 25, 2019 · 842f244 · 842f244
2 parents 17d5f76 + ec6874b
commit 842f244
Show file tree

Hide file tree

Showing 13 changed files with 472 additions and 15 deletions.
diff --git a/.idea/Google-Drive-Electron.iml b/.idea/Google-Drive-Electron.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ Inside the zipped folder is an executable that can be run.
 
 ### Releases
 
+- v.fugue-state / 0.1.0
 - v.dean-town / 0.0.3
 - v.funky-duck / 0.0.2
 - v.aunt-leslie / 0.0.1

diff --git a/TODO.md b/TODO.md
@@ -1,9 +1,10 @@
 # TODO
-An incomprehensive list of features to work on.
+A list of features to work on.
 
 * Dark Mode
 * Use Google Drive API to actually develop app features instead of just loading webview.
 * Don't use <webview>
+* ~~Fix Issue 9 - can't see files~~
 * ~~Fix Cmd+Q button~~
 * ~~Implement reload~~
 * ~~Implement zoom~~

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gdelectron",
   "productName": "Google Drive Electron",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "A Google Drive desktop app made with Electron",
   "main": "app.js",
   "scripts": {

diff --git a/src/javascripts/childwindow.js b/src/javascripts/childwindow.js
@@ -31,6 +31,9 @@ var createChildWindow = function(e) {
     minHeight: 300,
     scrollBounce: false,
     show: false,
+    webPreferences: {
+      preload: path.join(path.join(app.getAppPath(), 'build/javascripts/preload')),
+    }
   })
 
   windowSettings = {

diff --git a/src/javascripts/mainwindow.js b/src/javascripts/mainwindow.js
@@ -31,7 +31,10 @@ var createMainWindow = () => {
     minWidth: 300,
     minHeight: 300,
     scrollBounce: false,
-    show: false
+    show: false,
+    webPreferences: {
+      preload: path.join(path.join(app.getAppPath(), 'build/javascripts/preload')),
+    }
   })
 
   /**

diff --git a/src/javascripts/preload.js b/src/javascripts/preload.js
@@ -0,0 +1,3 @@
+if (!window.chrome) {
+  window.chrome = {}
+}
diff --git a/src/templates/index.pug b/src/templates/index.pug
@@ -8,7 +8,7 @@ block dragcontent
 
 block content
 
-  webview(preload='./preload.js', src='')
+  webview(preload='../javascripts/preload.js', src='')
 
 block scripts
   script.