Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 11:39:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update js dependencies

Browse source
This commit is contained in:
RainLoop Team 2016-09-07 00:06:38 +03:00
parent ea1dafe233
commit 17bdc999f6
3 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/Common/Utils.js
View file

@ -3,13 +3,13 @@ import window from 'window';
import $ from '$';
import _ from '_';
import ko from 'ko';
import Autolinker from 'Autolinker';
import {$win, $div, dropdownVisibility, data as GlobalsData} from 'Common/Globals';
import {ComposeType, EventKeyCode, SaveSettingsStep, FolderType} from 'Common/Enums';
import {Mime} from 'Common/Mime';
import {jassl} from 'Common/Jassl';
import Autolinker from 'Autolinker';
const trim = $.trim;
const inArray = $.inArray;
const isArray = _.isArray;
@ -744,18 +744,18 @@ export function settingsSaveHelperSubscribeFunction(remote, settingName, type, f
export function findEmailAndLinks(html)
{
// return html;
return Autolinker.link(html, {
return Autolinker ? Autolinker.link(html, {
newWindow: true,
stripPrefix: false,
urls: true,
email: true,
twitter: false,
mention: false,
phone: false,
hashtag: false,
replaceFn: function(autolinker, match) {
return !(autolinker && match && 'url' === match.getType() && match.matchedText && 0 !== match.matchedText.indexOf('http'));
replaceFn: function(match) {
return !(match && 'url' === match.getType() && match.matchedText && 0 !== match.matchedText.indexOf('http'));
}
});
}) : html;
}
/**