From 81819dab76f0d30160fcd3f18a7cf26f9a1438be Mon Sep 17 00:00:00 2001 From: Plastikmensch Date: Tue, 24 Oct 2017 09:32:36 +0200 Subject: [PATCH] fixed blank screen bug, added more logging, updated readme --- README.md | 4 ---- src/main.js | 9 +++++++-- src/package.json | 25 +++++++++++++------------ tweetdeck.png | Bin 0 -> 7040 bytes 4 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 tweetdeck.png diff --git a/README.md b/README.md index 08ad3f9..4604598 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,3 @@ customProxy =foopy:80 Or use the in-app settings! Press `Alt` -> `App` -> `Settings` ## Packaging source you can use [electron-packager](https://github.com/electron-userland/electron-packager) -```sh -# make sure to always include --asar-unpackDir or else Tor won't run -electron-packager --asar.unpackDir="tor-win32-0.3.0.9" -``` diff --git a/src/main.js b/src/main.js index 5746fa6..54698b8 100644 --- a/src/main.js +++ b/src/main.js @@ -52,6 +52,7 @@ function createWindow (Settings) { console.log("Not using Tor or custom Proxy") } mainWindow.webContents.on('did-fail-load', () => { + console.log("failed to load. Retrying...") mainWindow.loadURL(home) if(retries==3) mainWindow.loadURL(url2) retries++ @@ -60,8 +61,9 @@ function createWindow (Settings) { if(!Settings[1][0]) { mainWindow.webContents.insertCSS(".avatar{border-radius:0 !important}")// makes profile pics angular shaped again Woohoo! + console.log("inserted code for angular profile pics") } - if(Settings[2][0]) + if(Settings[2][0] && mainWindow.webContents.getURL().search("https://tweetdeck.twitter.com/") == 0) { mainWindow.webContents.insertCSS("\ .cmp-replyto{background-color: #222426 !important}\ @@ -94,6 +96,7 @@ function createWindow (Settings) { .list-link:hover{background-color: #0e0e0e !important}\ .mdl,.mdl-inner,.mdl-column,.mdl-col-settings,.bg-seamful-faint-gray,.bg-seamful-faded-gray{background-color: #222426 !important}\ .frm,.a-list-link,.list-link,.mdl-header,.mdl-dismiss,.non-selectable-item{color: #fff !important}") + console.log("inserted code for dark theme") } }) mainWindow.webContents.on('new-window', (event,url) => { @@ -101,6 +104,7 @@ function createWindow (Settings) { { event.preventDefault() shell.openExternal(url) + console.log("opened link external") } }) mainWindow.webContents.on('will-navigate', (event, url) => { @@ -179,11 +183,12 @@ function startTor() { if(process.platform == 'win32') { var child = require('child_process').execFile(tor) + console.log("started Tor") } } app.on('ready', () => { - +app.commandLine.appendSwitch('disable-gpu-compositing')//fixes blank screen bug... fucking hell... if(!fs.existsSync(settingsFile)) { dialog.showMessageBox({type:'question', buttons:['No','Yes'],message:'Do you want to use Tor?'}, (response)=>{ diff --git a/src/package.json b/src/package.json index d26166a..ba65519 100644 --- a/src/package.json +++ b/src/package.json @@ -1,12 +1,13 @@ -{ - "productName" : "Tweelectron", - "version" : "1.0.6", - "main" : "main.js", - "description": "TweetDeck for Desktop", - "author": { - "name": "Plastikmensch" - }, - "devDependencies": { - "electron": "^1.7.0" - } -} +{ + "productName": "Tweelectron", + "version": "1.0.6", + "main": "main.js", + "description": "TweetDeck for Desktop", + "author": { + "name": "Plastikmensch" + }, + "devDependencies": { + "electron": "^1.7.9" + }, + "dependencies": {} +} diff --git a/tweetdeck.png b/tweetdeck.png new file mode 100644 index 0000000000000000000000000000000000000000..e82a0272239523d71f642879fa2844c7b5a24dda GIT binary patch literal 7040 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 literal 0 HcmV?d00001