the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-09-25 06:25:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge Squire into libs.js

Browse source
This commit is contained in:
djmaze 2020-09-22 11:04:45 +02:00
parent 662e6b3466
commit 81364c6494
5 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/boot.js
View file

@ -194,7 +194,7 @@ win.__initAppData = appData => {
throw e; throw e;
}) })
.then(() => { .then(() => {
if (appData.Auth) { if (appData.Auth && appData.StaticEditorJsLink) {
loadScript(appData.StaticEditorJsLink).then(() => { loadScript(appData.StaticEditorJsLink).then(() => {
win.__initEditor && win.__initEditor(); win.__initEditor && win.__initEditor();
win.__initEditor = null; win.__initEditor = null;

2
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1499,7 +1499,7 @@ NewThemeLink IncludeCss TemplatesLink LangLink IncludeBackground PluginsLink Aut
($bAdmin ? 'admin' : 'app').($bAppJsDebug ? '' : '.min').'.js'); ($bAdmin ? 'admin' : 'app').($bAppJsDebug ? '' : '.min').'.js');
if ($this->Config()->Get('labs', 'use_squire_html_editor', false)) { if ($this->Config()->Get('labs', 'use_squire_html_editor', false)) {
$aResult['StaticEditorJsLink'] = $this->StaticPath('squire/squire'.($bAppJsDebug ? '-raw' : '').'.js'); $aResult['StaticEditorJsLink'] = null;
} else { } else {
$aResult['StaticEditorJsLink'] = $this->StaticPath('ckeditor/ckeditor.js'); $aResult['StaticEditorJsLink'] = $this->StaticPath('ckeditor/ckeditor.js');
} }

2
release.php
View file

@ -24,14 +24,12 @@ if ($return_var) {
if ($gzip = trim(`which gzip`)) { if ($gzip = trim(`which gzip`)) {
// passthru("{$gzip} -k --best -r ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/js/*.js'), $return_var); // passthru("{$gzip} -k --best -r ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/js/*.js'), $return_var);
// passthru("{$gzip} -k --best -r ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/css/app*.css'), $return_var); // passthru("{$gzip} -k --best -r ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/css/app*.css'), $return_var);
// passthru("{$gzip} -k --best -r ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/squire/*.js'), $return_var);
} }
if ($brotli = trim(`which brotli`)) { if ($brotli = trim(`which brotli`)) {
// passthru("{$brotli} -k --best ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/js/*.js'), $return_var); // passthru("{$brotli} -k --best ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/js/*.js'), $return_var);
// passthru("{$brotli} -k --best ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/js/min/*.js'), $return_var); // passthru("{$brotli} -k --best ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/js/min/*.js'), $return_var);
// passthru("{$brotli} -k --best ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/css/app*.css'), $return_var); // passthru("{$brotli} -k --best ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/css/app*.css'), $return_var);
// passthru("{$brotli} -k --best ".escapeshellarg(__DIR__ . '/rainloop/v/0.0.0/static/squire/*.js'), $return_var);
} }
// Temporary rename folder to speed up PharData // Temporary rename folder to speed up PharData

1
tasks/config.js
View file

@ -84,6 +84,7 @@ config.paths.js = {
'vendors/bootstrap/js/bootstrap.native.min.js', // fixed 'vendors/bootstrap/js/bootstrap.native.min.js', // fixed
'vendors/knockout/build/output/knockout-latest.js', 'vendors/knockout/build/output/knockout-latest.js',
'dev/External/ifvisible.js', 'dev/External/ifvisible.js',
'vendors/squire/build/squire-raw.js',
'dev/External/SquireUI.js' 'dev/External/SquireUI.js'
] ]
}, },

10
tasks/vendors.js
View file

@ -31,15 +31,7 @@ const fontastic = gulp.series(fontasticFontsClear, fontasticFontsCopy);
// squire // squire
const squireClear = () => del('rainloop/v/' + config.devVersion + '/static/squire'); const squireClear = () => del('rainloop/v/' + config.devVersion + '/static/squire');
const squireCopy = () => const squire = gulp.series(squireClear);
gulp
.src([
'vendors/squire/build/squire.js',
'vendors/squire/build/squire-raw.js'
])
.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/squire'));
const squire = gulp.series(squireClear, squireCopy);
// ckeditor // ckeditor
const ckeditorClear = () => del('rainloop/v/' + config.devVersion + '/static/ckeditor'); const ckeditorClear = () => del('rainloop/v/' + config.devVersion + '/static/ckeditor');