aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Revert "Remove a global variable, deeplinkingUrl"

Browse source 
This reverts commit ea746bad29.
This commit is contained in:
Yuya Ochiai 2017-10-25 21:05:17 +09:00
parent a47dabe8cb
commit d2c4aa0546
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main.js
View file

@ -46,6 +46,7 @@ const assetsDir = path.resolve(app.getAppPath(), 'assets');
// be closed automatically when the JavaScript object is garbage collected. // be closed automatically when the JavaScript object is garbage collected.
var mainWindow = null; var mainWindow = null;
let spellChecker = null; let spellChecker = null;
let deeplinkingUrl = null;
let scheme = null; let scheme = null;
var argv = require('yargs').parse(process.argv.slice(1)); var argv = require('yargs').parse(process.argv.slice(1));
@ -157,12 +158,10 @@ if (app.makeSingleInstance((commandLine/*, workingDirectory*/) => {
if (process.platform === 'win32') { if (process.platform === 'win32') {
// Keep only command line / deep linked arguments // Keep only command line / deep linked arguments
if (Array.isArray(commandLine.slice(1)) && commandLine.slice(1).length > 0) { if (Array.isArray(commandLine.slice(1)) && commandLine.slice(1).length > 0) {
const deeplinkingUrl = getDeeplinkingUrl(commandLine.slice(1)[0]); setDeeplinkingUrl(commandLine.slice(1)[0]);
if (deeplinkingUrl) {
mainWindow.webContents.send('protocol-deeplink', deeplinkingUrl); mainWindow.webContents.send('protocol-deeplink', deeplinkingUrl);
} }
} }
}
// Someone tried to run a second instance, we should focus our window. // Someone tried to run a second instance, we should focus our window.
if (mainWindow) { if (mainWindow) {
@ -343,20 +342,17 @@ if (isDev) {
app.setAsDefaultProtocolClient(scheme); app.setAsDefaultProtocolClient(scheme);
} }
function getDeeplinkingUrl(url) { function setDeeplinkingUrl(url) {
if (scheme) { if (scheme) {
return url.replace(new RegExp('^' + scheme), 'https'); deeplinkingUrl = url.replace(new RegExp('^' + scheme), 'https');
} }
return null;
} }
// Protocol handler for osx // Protocol handler for osx
app.on('open-url', (event, url) => { app.on('open-url', (event, url) => {
event.preventDefault(); event.preventDefault();
const deeplinkingUrl = getDeeplinkingUrl(url); setDeeplinkingUrl(url);
if (deeplinkingUrl) {
mainWindow.webContents.send('protocol-deeplink', deeplinkingUrl); mainWindow.webContents.send('protocol-deeplink', deeplinkingUrl);
}
mainWindow.show(); mainWindow.show();
}); });
@ -372,8 +368,6 @@ app.on('ready', () => {
catch((err) => console.log('An error occurred: ', err)); catch((err) => console.log('An error occurred: ', err));
} }
let deeplinkingUrl = null;
// Protocol handler for win32 // Protocol handler for win32
if (process.platform === 'win32') { if (process.platform === 'win32') {
// Keep only command line / deep linked argument. Make sure it's not squirrel command // Keep only command line / deep linked argument. Make sure it's not squirrel command
@ -382,7 +376,7 @@ app.on('ready', () => {
Array.isArray(tmpArgs) && tmpArgs.length > 0 && Array.isArray(tmpArgs) && tmpArgs.length > 0 &&
tmpArgs[0].match(/^--squirrel-/) === null tmpArgs[0].match(/^--squirrel-/) === null
) { ) {
deeplinkingUrl = getDeeplinkingUrl(tmpArgs[0]); setDeeplinkingUrl(tmpArgs[0]);
} }
} }