Skip to content

Commit c6d3bd8

Browse files
authored
Updated plugin (OpenMage#4455)
1 parent d76745b commit c6d3bd8

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/lib/Credis
2525

2626
# TinyMCE library
27-
/js/tinymce
27+
/js/lib/tinymce
2828

2929
# Add development environment setup files and README
3030
# https://github.com/OpenMage/magento-lts/pull/1012

app/design/adminhtml/default/default/template/page/head.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<?php endif ?>
4242

4343
<?php if ($this->getCanLoadTinyMce()): // TinyMCE is broken when loaded through index.php?>
44-
<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>tinymce/tinymce.min.js"></script>
44+
<script type="text/javascript" src="<?php echo $this->getJsUrl('lib/tinymce/tinymce.min.js') ?>"></script>
4545
<?php endif ?>
4646

4747
<script type="text/javascript">

app/design/adminhtml/default/default/template/widget/form/element.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
case 'wysiwyg': ?>
6868
<span class="form_row">
6969
<label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label>
70-
<script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>tinymce/tinymce.min.js"></script>
70+
<script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>lib/tinymce/tinymce.min.js"></script>
7171
<script type="text/javascript">
7272
//<![CDATA[
7373
tinyMCE.init({

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"ezyang/htmlpurifier": "^4.17",
3131
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
3232
"mklkj/tinymce-i18n": "^24.11",
33-
"openmage/composer-plugin": "^1.1.1",
33+
"openmage/composer-plugin": "^2.0",
3434
"pelago/emogrifier": "^7.0",
3535
"phpseclib/mcrypt_compat": "^2.0.3",
3636
"phpseclib/phpseclib": "^3.0.14",

composer.lock

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)