tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Remove use_gzip from HTMLEditorField since it's been removed by TinyMCE codebase (#7261)

Browse Source 
* Remove `use_gzip` from HTMLEditorField

* DOCS Mention remove use_gzip in changelog
This commit is contained in:
Saophalkun Ponlu 2019-06-21 09:27:48 +12:00 committed by Ingo Schommer
parent 0a6096a1bb
commit 6a8c6703d1
4 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/en/04_Changelogs/4.5.0.md
View File

@ -2,9 +2,11 @@
## Overview {#overview} ## Overview {#overview}
TBC. * Removed `use_gzip` option on `HtmlEditorField` which used to compress the rich text editor dependency.
No longer required since compression is performed as part of the CMS build automatically.
See (#832)(https://github.com/silverstripe/silverstripe-admin/issues/832)
## Deprecation ## Deprecation
* `PasswordValidator` methods `minLength`, `characterStrength`, and `checkHistoricalPasswords` are now deprecated from * `PasswordValidator` methods `minLength`, `characterStrength`, and `checkHistoricalPasswords` are now deprecated from
4.5.0 onwards (previously 5.0). 4.5.0 onwards (previously 5.0).

8
src/Forms/HTMLEditor/HTMLEditorField.php
View File

@ -28,14 +28,6 @@ class HTMLEditorField extends TextareaField
protected $schemaComponent = 'HtmlEditorField'; protected $schemaComponent = 'HtmlEditorField';
/**
* Use TinyMCE's GZIP compressor
*
* @config
* @var bool
*/
private static $use_gzip = true;
/** /**
* @config * @config
* @var string Default alignment for Images and Media. Options: leftAlone|center|left|right * @var string Default alignment for Images and Media. Options: leftAlone|center|left|right

25
src/Forms/HTMLEditor/TinyMCEGZIPGenerator.php
View File

@ -31,29 +31,6 @@ class TinyMCEGZIPGenerator implements TinyMCEScriptGenerator
*/ */
public function getScriptURL(TinyMCEConfig $config) public function getScriptURL(TinyMCEConfig $config)
{ {
// If gzip is disabled just return core script url return Controller::join_links($config->getTinyMCEResourceURL(), 'tinymce.min.js');
$useGzip = HTMLEditorField::config()->get('use_gzip');
if (!$useGzip) {
return Controller::join_links($config->getTinyMCEResourceURL(), 'tinymce.min.js');
}
// tinyMCE JS requirement - use the original module path,
// don't assume the PHP file is copied alongside the resources
$gzipPath = $config->getTinyMCEResourcePath() . '/tiny_mce_gzip.php';
if (!file_exists($gzipPath)) {
throw new Exception("HTMLEditorField.use_gzip enabled, but file $gzipPath does not exist!");
}
require_once $gzipPath;
$tag = TinyMCE_Compressor::renderTag(array(
'url' => $config->getTinyMCEResourceURL() . '/tiny_mce_gzip.php',
'plugins' => implode(',', $config->getInternalPlugins()),
'themes' => $config->getTheme(),
'languages' => $config->getOption('language')
), true);
preg_match('/src="([^"]*)"/', $tag, $matches);
return html_entity_decode($matches[1]);
} }
} }

1
tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
View File

@ -68,7 +68,6 @@ class HTMLEditorFieldTest extends FunctionalTest
'base_dir', 'base_dir',
'silverstripe/framework: tests/php/Forms/HTMLEditor/TinyMCECombinedGeneratorTest/tinymce' 'silverstripe/framework: tests/php/Forms/HTMLEditor/TinyMCECombinedGeneratorTest/tinymce'
); );
HtmlEditorField::config()->set('use_gzip', false);
// Test special characters // Test special characters
$inputText = "These are some unicodes: ä, ö, & ü"; $inputText = "These are some unicodes: ä, ö, & ü";