the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-23 14:26:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

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

24
npm-shrinkwrap.json generated
View file

@ -167,9 +167,9 @@
"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.0.tgz" "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.0.tgz"
}, },
"autolinker": { "autolinker": {
"version": "0.28.0", "version": "1.1.0",
"from": "autolinker@0.28.0", "from": "autolinker@1.1.0",
"resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.28.0.tgz" "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.1.0.tgz"
}, },
"autoprefixer": { "autoprefixer": {
"version": "6.4.0", "version": "6.4.0",
@ -2446,9 +2446,9 @@
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz" "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
}, },
"js-cookie": { "js-cookie": {
"version": "2.1.2", "version": "2.1.3",
"from": "js-cookie@>=2.1.2 <3.0.0", "from": "js-cookie@2.1.3",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.1.2.tgz" "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.1.3.tgz"
}, },
"js-tokens": { "js-tokens": {
"version": "2.0.0", "version": "2.0.0",
@ -3505,11 +3505,13 @@
"dependencies": { "dependencies": {
"isarray": { "isarray": {
"version": "1.0.0", "version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0" "from": "isarray@1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
}, },
"readable-stream": { "readable-stream": {
"version": "2.1.5", "version": "2.1.5",
"from": "readable-stream@>=2.0.0 <3.0.0" "from": "readable-stream@2.1.5",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
} }
} }
}, },
@ -4362,11 +4364,13 @@
"dependencies": { "dependencies": {
"async": { "async": {
"version": "0.2.10", "version": "0.2.10",
"from": "async@>=0.2.6 <0.3.0" "from": "async@0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
}, },
"yargs": { "yargs": {
"version": "3.10.0", "version": "3.10.0",
"from": "yargs@>=3.10.0 <3.11.0" "from": "yargs@3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
} }
} }
}, },

4
package.json
View file

@ -49,7 +49,7 @@
}, },
"devDependencies": { "devDependencies": {
"Progress.js": "github:usablica/progress.js", "Progress.js": "github:usablica/progress.js",
"autolinker": "^0.28.0", "autolinker": "^1.1.0",
"babel-core": "6.14.0", "babel-core": "6.14.0",
"babel-eslint": "^6.1.2", "babel-eslint": "^6.1.2",
"babel-loader": "^6.2.5", "babel-loader": "^6.2.5",
@ -91,7 +91,7 @@
"jquery-mousewheel": "^3.1.13", "jquery-mousewheel": "^3.1.13",
"jquery-scrollstop": "^1.2.0", "jquery-scrollstop": "^1.2.0",
"jquery.backstretch": "^2.1.13", "jquery.backstretch": "^2.1.13",
"js-cookie": "^2.1.2", "js-cookie": "^2.1.3",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"json3": "^3.3.2", "json3": "^3.3.2",
"knockout": "^3.4.0", "knockout": "^3.4.0",