diff --git a/dev/boot.js b/dev/boot.js index 5093e72e4..88b7f1995 100644 --- a/dev/boot.js +++ b/dev/boot.js @@ -194,7 +194,7 @@ win.__initAppData = appData => { throw e; }) .then(() => { - if (appData.Auth) { + if (appData.Auth && appData.StaticEditorJsLink) { loadScript(appData.StaticEditorJsLink).then(() => { win.__initEditor && win.__initEditor(); win.__initEditor = null; diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 945d039bd..bbc5716bc 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1499,7 +1499,7 @@ NewThemeLink IncludeCss TemplatesLink LangLink IncludeBackground PluginsLink Aut ($bAdmin ? 'admin' : 'app').($bAppJsDebug ? '' : '.min').'.js'); if ($this->Config()->Get('labs', 'use_squire_html_editor', false)) { - $aResult['StaticEditorJsLink'] = $this->StaticPath('squire/squire'.($bAppJsDebug ? '-raw' : '').'.js'); + $aResult['StaticEditorJsLink'] = null; } else { $aResult['StaticEditorJsLink'] = $this->StaticPath('ckeditor/ckeditor.js'); } diff --git a/release.php b/release.php index d142f7957..d0b92ad0c 100755 --- a/release.php +++ b/release.php @@ -24,14 +24,12 @@ if ($return_var) { 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/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`)) { // 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/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 diff --git a/tasks/config.js b/tasks/config.js index f4d74d565..a2db47cc9 100644 --- a/tasks/config.js +++ b/tasks/config.js @@ -84,6 +84,7 @@ config.paths.js = { 'vendors/bootstrap/js/bootstrap.native.min.js', // fixed 'vendors/knockout/build/output/knockout-latest.js', 'dev/External/ifvisible.js', + 'vendors/squire/build/squire-raw.js', 'dev/External/SquireUI.js' ] }, diff --git a/tasks/vendors.js b/tasks/vendors.js index 7374f2fab..20ec4729e 100644 --- a/tasks/vendors.js +++ b/tasks/vendors.js @@ -31,15 +31,7 @@ const fontastic = gulp.series(fontasticFontsClear, fontasticFontsCopy); // squire const squireClear = () => del('rainloop/v/' + config.devVersion + '/static/squire'); -const squireCopy = () => - 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); +const squire = gulp.series(squireClear); // ckeditor const ckeditorClear = () => del('rainloop/v/' + config.devVersion + '/static/ckeditor');