self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Electron: Fixes #598: Allow opening any URL with a valid protocol in an external app

Browse Source
This commit is contained in:
Laurent Cozic 2018-06-11 00:35:01 +01:00
parent ced14e578f
commit b08dcdfd90
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ElectronClient/app/gui/NoteText.jsx
View File

@ -24,6 +24,7 @@ const {clipboard} = require('electron')
const md5 = require('md5'); const md5 = require('md5');
const mimeUtils = require('lib/mime-utils.js').mime; const mimeUtils = require('lib/mime-utils.js').mime;
const ArrayUtils = require('lib/ArrayUtils'); const ArrayUtils = require('lib/ArrayUtils');
const urlUtils = require('lib/urlUtils');
require('brace/mode/markdown'); require('brace/mode/markdown');
// https://ace.c9.io/build/kitchen-sink.html // https://ace.c9.io/build/kitchen-sink.html
@ -379,8 +380,6 @@ class NoteTextComponent extends React.Component {
const newBody = this.mdToHtml_.handleCheckboxClick(msg, this.state.note.body); const newBody = this.mdToHtml_.handleCheckboxClick(msg, this.state.note.body);
this.saveOneProperty('body', newBody); this.saveOneProperty('body', newBody);
} else if (msg.toLowerCase().indexOf('http') === 0) {
require('electron').shell.openExternal(msg);
} else if (msg === 'percentScroll') { } else if (msg === 'percentScroll') {
this.ignoreNextEditorScroll_ = true; this.ignoreNextEditorScroll_ = true;
this.setEditorPercentScroll(arg0); this.setEditorPercentScroll(arg0);
@ -441,6 +440,8 @@ class NoteTextComponent extends React.Component {
} else { } else {
throw new Error('Unsupported item type: ' + item.type_); throw new Error('Unsupported item type: ' + item.type_);
} }
} else if (urlUtils.urlProtocol(msg)) {
require('electron').shell.openExternal(msg);
} else { } else {
bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg)); bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
} }