Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex-D committed Aug 11, 2022
2 parents 336de8d + 477823c commit fb694bb
Show file tree
Hide file tree
Showing 29 changed files with 1,407 additions and 924 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# EditorConfig: https://EditorConfig.org
# Notepad++ Plugin: https://github.com/editorconfig/editorconfig-notepad-plus-plus
# Visual Studio Code Plugin: https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig

root = true

[*.{css,html,js,json,scss,svg}]
charset = utf-8
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
1 change: 1 addition & 0 deletions docs/demos/plugins/mathml.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ <h4>The code</h4>
$('#editor')
.trumbowyg({
btns: [
'viewHTML',
'mathml'
]
});
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ <h3 class="section-subtitle">Extends Trumbowyg</h3>

<ul>
<li>
<a href="./documentation/plugins/#plugin-cleanpaste">
<a href="./documentation/plugins/#plugin-allowtagsfrompaste">
<svg>
<use xlink:href="#trumbowyg-removeformat"></use>
</svg>
Expand Down
14 changes: 12 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ const scripts = gulp.series(testScripts, function scripts() {
.pipe(gulp.dest('dist/'))
.pipe($.size({title: 'trumbowyg.js'}))
.pipe($.rename({suffix: '.min'}))
.pipe($.terser())
.pipe($.terser({
format: {
comments: false
}
}))
.pipe($.header(bannerLight, {pkg: pkg}))
.pipe(gulp.dest('dist/'))
.pipe($.size({title: 'trumbowyg.min.js'}));
Expand All @@ -80,7 +84,11 @@ const pluginsScripts = gulp.series(testPluginsScripts, function pluginsScripts()
return gulp.src(paths.pluginsScripts)
.pipe(gulp.dest('dist/plugins/'))
.pipe($.rename({suffix: '.min'}))
.pipe($.terser())
.pipe($.terser({
format: {
comments: /trumbowyg\./
}
}))
.pipe(gulp.dest('dist/plugins/'));
});

Expand Down Expand Up @@ -109,12 +117,14 @@ const icons = function () {
const styles = function () {
return gulp.src(paths.styles)
.pipe($.sass())
.pipe($.sourcemaps.init())
.pipe($.autoprefixer(['last 1 version', '> 1%', 'ff >= 20', 'ie >= 9', 'opera >= 12', 'Android >= 2.2'], {cascade: true}))
.pipe($.header(banner, {pkg: pkg, description: 'Default stylesheet for Trumbowyg editor'}))
.pipe(gulp.dest('dist/ui/'))
.pipe($.size({title: 'trumbowyg.css'}))
.pipe($.rename({suffix: '.min'}))
.pipe($.minifyCss())
.pipe($.sourcemaps.write('.'))
.pipe($.header(bannerLight, {pkg: pkg}))
.pipe(gulp.dest('dist/ui/'))
.pipe($.size({title: 'trumbowyg.min.css'}));
Expand Down
188 changes: 187 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "trumbowyg",
"title": "Trumbowyg",
"description": "A lightweight WYSIWYG editor",
"version": "2.25.1",
"version": "2.25.2",
"main": "dist/trumbowyg.js",
"license": "MIT",
"scripts": {
Expand All @@ -25,6 +25,7 @@
"gulp-rename": "2.0.0",
"gulp-sass": "4.1.0",
"gulp-size": "3.0.0",
"gulp-sourcemaps": "3.0.0",
"gulp-svgmin": "3.0.0",
"gulp-svgstore": "7.0.1",
"gulp-terser": "2.0.1",
Expand Down Expand Up @@ -55,5 +56,9 @@
"rich text",
"contenteditable",
"trumbowyg"
]
],
"volta": {
"node": "14.18.1",
"npm": "6.14.15"
}
}
6 changes: 6 additions & 0 deletions plugins/base64/trumbowyg.base64.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
errFileReaderNotSupported: 'FileReader is not supported by your browser.',
errInvalidImage: 'Invalid image file.'
},
by: {
base64: 'Выява (фармат base64)',
file: 'Файл',
errFileReaderNotSupported: 'FileReader не падтрымліваецца вашым браўзэрам.',
errInvalidImage: 'Несапраўдны файл выявы.'
},
cs: {
base64: 'Vložit obrázek',
file: 'Soubor'
Expand Down
Loading

0 comments on commit fb694bb

Please sign in to comment.