diff --git a/dev/Html/PreviewMessage.html b/dev/Html/PreviewMessage.html
deleted file mode 100644
index 0aa25cfd0..000000000
--- a/dev/Html/PreviewMessage.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 5967e1df7..e3da3070a 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -18,8 +18,6 @@ import { MimeHeaderCollectionModel } from 'Model/MimeHeaderCollection';
//import { MimeHeaderAutocryptModel } from 'Model/MimeHeaderAutocrypt';
import { AbstractModel } from 'Knoin/AbstractModel';
-import PreviewHTML from 'Html/PreviewMessage.html';
-
import { LanguageStore } from 'Stores/Language';
import Remote from 'Remote/User/Fetch';
@@ -27,6 +25,62 @@ import Remote from 'Remote/User/Fetch';
import { MimeToMessage } from 'Mime/Utils';
const
+ PreviewHTML = `
+
+
+
+
+
+
+`,
+
msgHtml = msg => cleanHtml(msg.html(), msg.attachments(), '#rl-msg-' + msg.hash),
toggleTag = (message, keyword) => {
diff --git a/package.json b/package.json
index 50d136272..6f54eb604 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
"gulp-terser": "^2.1.0",
"rollup": "^2.56.3",
"rollup-plugin-external-globals": "^0.6.1",
- "rollup-plugin-html": "^0.2.1",
"rollup-plugin-includepaths": "^0.2.4",
"rollup-plugin-terser": "^7.0.2"
}
diff --git a/tasks/rollup.js b/tasks/rollup.js
index 097d5ca5c..b4cc1f37c 100644
--- a/tasks/rollup.js
+++ b/tasks/rollup.js
@@ -2,14 +2,13 @@
const rollup2 = require('gulp-rollup-2');
const includePaths = require('rollup-plugin-includepaths');
const externalGlobals = require('rollup-plugin-external-globals');
-const html = require('rollup-plugin-html');
const { config } = require('./config');
let includePathOptions = {
include: {},
paths: ['dev'],
external: [],
- extensions: ['.js', '.html']
+ extensions: ['.js']
};
exports.rollupJS = (inputFile) =>
@@ -23,9 +22,6 @@ exports.rollupJS = (inputFile) =>
includePaths(includePathOptions),
externalGlobals({
ko: 'ko'
- }),
- html({
- include: '**/*.html'
})
]
});
diff --git a/yarn.lock b/yarn.lock
index 7f7f6f454..3ac1d0184 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -622,14 +622,6 @@
"resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
"version" "3.1.0"
-"camel-case@3.0.x":
- "integrity" "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w=="
- "resolved" "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"
- "version" "3.0.0"
- dependencies:
- "no-case" "^2.2.0"
- "upper-case" "^1.1.1"
-
"chalk@^2.1.0", "chalk@^2.3.0", "chalk@^2.4.2":
"integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
"resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -683,7 +675,7 @@
optionalDependencies:
"fsevents" "~2.3.2"
-"clean-css@4.2.3", "clean-css@4.2.x":
+"clean-css@4.2.3":
"integrity" "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="
"resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"
"version" "4.2.3"
@@ -774,16 +766,6 @@
"resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
"version" "2.20.3"
-"commander@~2.19.0":
- "integrity" "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
- "resolved" "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"
- "version" "2.19.0"
-
-"commander@2.17.x":
- "integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
- "resolved" "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"
- "version" "2.17.1"
-
"concat-map@0.0.1":
"integrity" "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
"resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
@@ -1153,11 +1135,6 @@
"resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
"version" "5.3.0"
-"estree-walker@^0.2.1":
- "integrity" "sha512-6/I1dwNKk0N9iGOU3ydzAAurz4NPo/ttxZNCqgIVbWFvWyzWBSNonRrJ5CpjDuyBfmM7ENN7WCzUi9aT/UPXXQ=="
- "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz"
- "version" "0.2.1"
-
"estree-walker@^1.0.1":
"integrity" "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
"resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
@@ -1724,11 +1701,6 @@
dependencies:
"function-bind" "^1.1.2"
-"he@1.2.x":
- "integrity" "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
- "resolved" "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
- "version" "1.2.0"
-
"homedir-polyfill@^1.0.1":
"integrity" "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="
"resolved" "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
@@ -1736,19 +1708,6 @@
dependencies:
"parse-passwd" "^1.0.0"
-"html-minifier@^3.0.2":
- "integrity" "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="
- "resolved" "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz"
- "version" "3.5.21"
- dependencies:
- "camel-case" "3.0.x"
- "clean-css" "4.2.x"
- "commander" "2.17.x"
- "he" "1.2.x"
- "param-case" "2.1.x"
- "relateurl" "0.2.x"
- "uglify-js" "3.4.x"
-
"iconv-lite@^0.4.24":
"integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
"resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
@@ -2137,11 +2096,6 @@
"resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
"version" "4.17.21"
-"lower-case@^1.1.1":
- "integrity" "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA=="
- "resolved" "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"
- "version" "1.1.4"
-
"magic-string@^0.25.7":
"integrity" "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="
"resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
@@ -2190,7 +2144,7 @@
"resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
"version" "2.1.0"
-"minimatch@^3.0.2", "minimatch@^3.0.4", "minimatch@^3.1.1":
+"minimatch@^3.0.4", "minimatch@^3.1.1":
"integrity" "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
"resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
"version" "3.1.2"
@@ -2258,13 +2212,6 @@
"resolved" "https://registry.npmjs.org/njfs/-/njfs-1.2.5.tgz"
"version" "1.2.5"
-"no-case@^2.2.0":
- "integrity" "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="
- "resolved" "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"
- "version" "2.3.2"
- dependencies:
- "lower-case" "^1.1.1"
-
"normalize-path@^3.0.0", "normalize-path@~3.0.0", "normalize-path@3.0.0":
"integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
"resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
@@ -2359,13 +2306,6 @@
dependencies:
"aggregate-error" "^3.0.0"
-"param-case@2.1.x":
- "integrity" "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w=="
- "resolved" "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz"
- "version" "2.1.1"
- dependencies:
- "no-case" "^2.2.0"
-
"parent-module@^1.0.0":
"integrity" "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="
"resolved" "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
@@ -2601,11 +2541,6 @@
"resolved" "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
"version" "3.2.0"
-"relateurl@0.2.x":
- "integrity" "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
- "resolved" "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"
- "version" "0.2.7"
-
"remove-trailing-separator@^1.0.1", "remove-trailing-separator@^1.1.0":
"integrity" "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
"resolved" "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
@@ -2716,14 +2651,6 @@
"is-reference" "^1.2.1"
"magic-string" "^0.25.7"
-"rollup-plugin-html@^0.2.1":
- "integrity" "sha512-qnyToGUAjjG69+M+KitUsHnfnLjpjtZdO3nIP0LN50KG/r6zEoBq/pfneAwWkxY/z13zM5aFFXSBY6+6M7bvUw=="
- "resolved" "https://registry.npmjs.org/rollup-plugin-html/-/rollup-plugin-html-0.2.1.tgz"
- "version" "0.2.1"
- dependencies:
- "html-minifier" "^3.0.2"
- "rollup-pluginutils" "^1.5.0"
-
"rollup-plugin-includepaths@^0.2.4":
"integrity" "sha512-iZen+XKVExeCzk7jeSZPJKL7B67slZNr8GXSC5ROBXtDGXDBH8wdjMfdNW5hf9kPt+tHyIvWh3wlE9bPrZL24g=="
"resolved" "https://registry.npmjs.org/rollup-plugin-includepaths/-/rollup-plugin-includepaths-0.2.4.tgz"
@@ -2739,14 +2666,6 @@
"serialize-javascript" "^4.0.0"
"terser" "^5.0.0"
-"rollup-pluginutils@^1.5.0":
- "integrity" "sha512-SjdWWWO/CUoMpDy8RUbZ/pSpG68YHmhk5ROKNIoi2En9bJ8bTt3IhYi254RWiTclQmL7Awmrq+rZFOhZkJAHmQ=="
- "resolved" "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz"
- "version" "1.5.2"
- dependencies:
- "estree-walker" "^0.2.1"
- "minimatch" "^3.0.2"
-
"rollup@^1.20.0 || ^2.0.0", "rollup@^1.20.0||^2.0.0", "rollup@^2.0.0", "rollup@^2.25.0", "rollup@^2.41.4", "rollup@^2.42.0", "rollup@^2.56.3":
"integrity" "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="
"resolved" "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"
@@ -2908,7 +2827,7 @@
"resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
"version" "0.5.7"
-"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1":
+"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0":
"integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
"resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
"version" "0.6.1"
@@ -3212,14 +3131,6 @@
"resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
"version" "0.8.1"
-"uglify-js@3.4.x":
- "integrity" "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="
- "resolved" "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"
- "version" "3.4.10"
- dependencies:
- "commander" "~2.19.0"
- "source-map" "~0.6.1"
-
"unc-path-regex@^0.1.2":
"integrity" "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="
"resolved" "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
@@ -3245,11 +3156,6 @@
"resolved" "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"
"version" "5.26.5"
-"upper-case@^1.1.1":
- "integrity" "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA=="
- "resolved" "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz"
- "version" "1.1.3"
-
"uri-js@^4.2.2", "uri-js@^4.4.1":
"integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="
"resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"