the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-11-10 09:02:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes and improvements

Browse source
This commit is contained in:
RainLoop Team 2018-07-10 00:05:02 +03:00
parent f5b92b8b65
commit 791f0ff6ad
9 changed files with 6100 additions and 6350 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.docker/node/Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:alpine
FROM node:9.11.2-alpine
RUN apk add --no-cache git
RUN yarn global add gulp@3.9.1

4
.eslintrc.js
View file

@ -11,7 +11,7 @@ module.exports = {
'commonjs': true,
'es6': true
},
'plugins': ['compat'],
// 'plugins': ['compat'],
'globals': {
'RL_COMMUNITY': true,
'RL_ES6': true
@ -20,7 +20,7 @@ module.exports = {
// http://eslint.org/docs/rules/
'rules': {
// plugins
'compat/compat': 2,
// 'compat/compat': 2,
// errors
'no-cond-assign': [2, 'always'],

16
dev/Common/Booter.js
View file

@ -225,7 +225,7 @@ function runApp()
p.setOptions({theme: 'rainloop'});
p.start().set(5);
const libs = jassl(appData.StaticLibJsLink).then(() => {
const libs = () => jassl(appData.StaticLibJsLink).then(() => {
if (window.$)
{
window.$('#rl-check').remove();
@ -243,12 +243,14 @@ function runApp()
}
});
const common = window.Promise.all([
jassl(appData.TemplatesLink),
jassl(appData.LangLink)
]);
window.Promise.all([libs, common])
libs()
.then(() => {
p.set(20);
return window.Promise.all([
jassl(appData.TemplatesLink),
jassl(appData.LangLink)
]);
})
.then(() => {
p.set(30);
return jassl(useJsNextBundle ? appData.StaticAppJsNextLink : appData.StaticAppJsLink);

4
dev/External/ko.js vendored
View file

@ -1209,7 +1209,7 @@ ko.observable.fn.validateEmail = function() {
this.hasError = ko.observable(false);
this.subscribe((value) => {
this.hasError('' !== value && !(/^[^@\s]+@[^@\s]+$/.test(value)));
this.hasError('' !== value && !((/^[^@\s]+@[^@\s]+$/).test(value)));
});
this.valueHasMutated();
@ -1221,7 +1221,7 @@ ko.observable.fn.validateSimpleEmail = function() {
this.hasError = ko.observable(false);
this.subscribe((value) => {
this.hasError('' !== value && !(/^.+@.+$/.test(value)));
this.hasError('' !== value && !((/^.+@.+$/).test(value)));
});
this.valueHasMutated();

2
dev/View/Popup/AddOpenPgpKey.js
View file

@ -38,7 +38,7 @@ class AddOpenPgpKeyPopupView extends AbstractViewNext
let keyTrimmed = trim(this.key());
if (/[\n]/.test(keyTrimmed))
if ((/[\n]/).test(keyTrimmed))
{
keyTrimmed = keyTrimmed.replace(/[\r]+/g, '').replace(/[\n]{2,}/g, '\n\n');
}

2
dev/View/Popup/Contacts.js
View file

@ -327,7 +327,7 @@ class ContactsPopupView extends AbstractViewNext
properties = [];
_.each(this.viewProperties(), (oItem) => {
if (oItem.type() && '' !== trim(oItem.value()))
if (oItem.type() && oItem.type() !== ContactPropertyType.FullName && '' !== trim(oItem.value()))
{
properties.push([oItem.type(), oItem.value(), oItem.typeStr()]);
}

2
dev/View/User/MailBox/MessageList.js
View file

@ -465,7 +465,7 @@ class MessageListMailBoxUserView extends AbstractViewNext
return false;
}
if (/is:unseen/.test(this.mainMessageListSearch()))
if ((/is:unseen/).test(this.mainMessageListSearch()))
{
return false;
}

48
package.json
View file

@ -3,14 +3,14 @@
"title": "RainLoop Webmail",
"description": "Simple, modern & fast web-based email client",
"private": true,
"version": "1.12.0",
"ownCloudVersion": "5.1.0",
"homepage": "http://rainloop.net",
"version": "1.12.1",
"ownCloudVersion": "5.1.1",
"homepage": "https://www.rainloop.net",
"main": "gulpfile.js",
"author": {
"name": "RainLoop Team",
"email": "support@rainloop.net",
"web": "http://www.rainloop.net"
"web": "https://www.rainloop.net"
},
"repository": {
"type": "git",
@ -24,7 +24,7 @@
},
{
"type": "RainLoop Software License",
"ulr": "http://www.rainloop.net/licensing/"
"ulr": "https://www.rainloop.net/licensing/"
}
],
"bugs": {
@ -43,40 +43,36 @@
"openpgp"
],
"readmeFilename": "README.md",
"engines": {
"node": ">= 4"
},
"browserslist": [
"last 3 versions",
"ie >= 9",
"IE >= 9",
"firefox esr"
],
"devDependencies": {
"autolinker": "1.6.2",
"babel-core": "6.26.3",
"babel-eslint": "8.2.3",
"babel-loader": "7.1.4",
"babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-eslint": "8.2.5",
"babel-loader": "7.1.5",
"babel-plugin-transform-decorators-legacy": "1.3.5",
"babel-plugin-transform-runtime": "6.23.0",
"babel-preset-env": "1.6.1",
"babel-preset-env": "1.7.0",
"babel-preset-stage-0": "6.24.1",
"babel-runtime": "6.26.0",
"classnames": "2.2.5",
"copy-webpack-plugin": "4.5.1",
"classnames": "2.2.6",
"copy-webpack-plugin": "4.5.2",
"element-dataset": "2.2.6",
"emailjs-addressparser": "2.0.2",
"es6-object-assign": "1.1.0",
"es6-promise-polyfill": "1.2.0",
"eslint": "4.19.1",
"eslint-plugin-compat": "2.2.0",
"eslint": "5.1.0",
"gulp": "3.9.1",
"gulp-autoprefixer": "5.0.0",
"gulp-cached": "1.1.1",
"gulp-chmod": "2.0.0",
"gulp-clean-css": "3.9.3",
"gulp-clean-css": "3.9.4",
"gulp-concat-util": "0.5.5",
"gulp-eol": "0.2.0",
"gulp-eslint": "4.0.2",
"gulp-eslint": "5.0.0",
"gulp-expect-file": "0.0.7",
"gulp-filter": "5.1.0",
"gulp-header": "2.0.5",
@ -85,8 +81,8 @@
"gulp-livereload": "3.8.1",
"gulp-notify": "3.2.0",
"gulp-plumber": "1.2.0",
"gulp-rename": "1.2.2",
"gulp-replace": "0.6.1",
"gulp-rename": "1.3.0",
"gulp-replace": "1.0.0",
"gulp-rimraf": "0.2.2",
"gulp-size": "3.0.0",
"gulp-stripbom": "1.0.4",
@ -107,8 +103,8 @@
"knockout-sortable": "1.1.0",
"knockout-transformations": "2.1.0",
"lozad": "1.4.0",
"matchmedia-polyfill": "0.3.0",
"moment": "2.22.1",
"matchmedia-polyfill": "0.3.1",
"moment": "2.22.2",
"node-fs": "0.1.7",
"node-notifier": "5.2.1",
"normalize.css": "8.0.0",
@ -118,10 +114,10 @@
"raw-loader": "0.5.1",
"rimraf": "2.6.2",
"run-sequence": "2.2.1",
"simplestatemanager": "4.1.0",
"simplestatemanager": "4.1.1",
"style-loader": "0.21.0",
"underscore": "1.9.0",
"webpack": "4.6.0",
"underscore": "1.9.1",
"webpack": "4.15.1",
"webpack-notifier": "1.6.0"
}
}

12370
yarn.lock
View file

File diff suppressed because it is too large Load diff