Misterzym
/
Rambox-CE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #2111 from maxerbox/fix/electron-update-3.1.3 

Fix/electron update 3.1.3
pull/2139/head
Ramiro Saenz 6 years ago committed by GitHub
parent
f0182d9355 382c382bca
commit
16e8323799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 64 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/ux/Auth0.js
  2. 2
      app/ux/WebView.js
  3. 25
      electron/main.js
  4. 103
      package-lock.json
  5. 2
      package.json

4
app/ux/Auth0.js
Unescape View File

@ -270,8 +270,8 @@ Ext.define('Rambox.ux.Auth0', {
authWindow.loadURL(me.authService.requestAuthCode()); authWindow.loadURL(me.authService.requestAuthCode());
authWindow.webContents.on('did-get-redirect-request', function(e, oldUrl, newUrl) { authWindow.webContents.on('did-navigate', function(e, url) {
me.authService.requestAccessCode(newUrl, me.onLogin.bind(me), authWindow); me.authService.requestAccessCode(url, me.onLogin.bind(me), authWindow);
}); });
} }

2
app/ux/WebView.js
Unescape View File

@ -514,7 +514,7 @@ Ext.define('Rambox.ux.WebView',{
}); });
} }
webview.addEventListener('did-get-redirect-request', function( e ) { webview.addEventListener('did-navigate', function( e ) {
if ( e.isMainFrame && me.record.get('type') === 'tweetdeck' ) Ext.defer(function() { webview.loadURL(e.newURL); }, 1000); // Applied a defer because sometimes is not redirecting. TweetDeck 2FA is an example. if ( e.isMainFrame && me.record.get('type') === 'tweetdeck' ) Ext.defer(function() { webview.loadURL(e.newURL); }, 1000); // Applied a defer because sometimes is not redirecting. TweetDeck 2FA is an example.
}); });

25
electron/main.js
Unescape View File

@ -312,21 +312,22 @@ ipcMain.on('relaunchApp', function(event) {
app.exit(0); app.exit(0);
}); });
const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => { const shouldQuit = app.requestSingleInstanceLock()
// Someone tried to run a second instance, we should focus our window. if (!shouldQuit) {
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.focus();
mainWindow.show();
mainWindow.setSkipTaskbar(false);
if (app.dock && app.dock.show) app.dock.show();
}
});
if (shouldQuit) {
app.quit(); app.quit();
return; return;
} }
app.on('second-instance', (event, commandLine, workingDirectory) => {
// Someone tried to run a second instance, we should focus our window.
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.focus();
mainWindow.show();
mainWindow.setSkipTaskbar(false);
if (app.dock && app.dock.show) app.dock.show();
}
});
// Code for downloading images as temporal files // Code for downloading images as temporal files
// Credit: Ghetto Skype (https://github.com/stanfieldr/ghetto-skype) // Credit: Ghetto Skype (https://github.com/stanfieldr/ghetto-skype)

103
package-lock.json generated
Unescape View File

@ -44,9 +44,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "8.10.38", "version": "8.10.40",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.40.tgz",
"integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==", "integrity": "sha512-RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ==",
"dev": true "dev": true
}, },
"abbrev": { "abbrev": {
@ -1712,13 +1712,13 @@
"dev": true "dev": true
}, },
"electron": { "electron": {
"version": "2.0.14", "version": "3.1.4",
"resolved": "https://registry.npmjs.org/electron/-/electron-2.0.14.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-3.1.4.tgz",
"integrity": "sha512-8HLVZuscZxVhoMUL6RlF5kMcwGUAMWw5HNwrEmRgzZyBIBbdCO4aMo9z0qknnPTUDROz8xXZFNhFvBXDu61g5Q==", "integrity": "sha512-YJEvfq45K7MmhLXY4mpGLG/cH5BU/1NUOcNMRzLxs3wVS/fKY2ZkJrOTncxhi1VOC1EJOQslcSdupitrW/FSig==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^8.0.24", "@types/node": "^8.0.24",
"electron-download": "^3.0.1", "electron-download": "^4.1.0",
"extract-zip": "^1.0.3" "extract-zip": "^1.0.3"
} }
}, },
@ -1815,59 +1815,62 @@
} }
}, },
"electron-download": { "electron-download": {
"version": "3.3.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz", "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
"integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=", "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^2.2.0", "debug": "^3.0.0",
"fs-extra": "^0.30.0", "env-paths": "^1.0.0",
"home-path": "^1.0.1", "fs-extra": "^4.0.1",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"nugget": "^2.0.0", "nugget": "^2.0.1",
"path-exists": "^2.1.0", "path-exists": "^3.0.0",
"rc": "^1.1.2", "rc": "^1.2.1",
"semver": "^5.3.0", "semver": "^5.4.1",
"sumchecker": "^1.2.0" "sumchecker": "^2.0.2"
}, },
"dependencies": { "dependencies": {
"fs-extra": { "debug": {
"version": "0.30.0", "version": "3.2.6",
"resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"graceful-fs": "^4.1.2", "ms": "^2.1.1"
"jsonfile": "^2.1.0",
"klaw": "^1.0.0",
"path-is-absolute": "^1.0.0",
"rimraf": "^2.2.8"
} }
}, },
"minimist": { "fs-extra": {
"version": "1.2.0", "version": "4.0.3",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
"dev": true
},
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true, "dev": true,
"requires": { "requires": {
"pinkie-promise": "^2.0.0" "graceful-fs": "^4.1.2",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
} }
}, },
"sumchecker": { "jsonfile": {
"version": "1.3.1", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^2.2.0", "graceful-fs": "^4.1.6"
"es6-promise": "^4.0.5"
} }
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
},
"ms": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true
} }
} }
}, },
@ -2133,12 +2136,6 @@
"is-arrayish": "^0.2.1" "is-arrayish": "^0.2.1"
} }
}, },
"es6-promise": {
"version": "4.2.5",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
"integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
"dev": true
},
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@ -2756,12 +2753,6 @@
"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
"dev": true "dev": true
}, },
"home-path": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
"integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==",
"dev": true
},
"hosted-git-info": { "hosted-git-info": {
"version": "2.6.0", "version": "2.6.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",

2
package.json
Unescape View File

@ -173,7 +173,7 @@
"chai": "3.5.0", "chai": "3.5.0",
"crowdin": "1.0.0", "crowdin": "1.0.0",
"csvjson": "4.3.3", "csvjson": "4.3.3",
"electron": "^2.0.14", "electron": "^3.1.4",
"electron-builder": "^20.28.3", "electron-builder": "^20.28.3",
"electron-packager": "^12.1.0", "electron-packager": "^12.1.0",
"mocha": "^5.2.0", "mocha": "^5.2.0",

Write Preview
Loading…
Cancel
Save