Skip to content

Commit 51e3161

Browse files
code-ph0ymattlorimer
authored andcommitted
Move tinymce editor to composer
1 parent 5bc6217 commit 51e3161

File tree

170 files changed

+12
-160840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+12
-160840
lines changed

composer.json

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
"consolidation/robo": "^1.4",
3333
"ezyang/htmlpurifier": "^4.12",
3434
"google/recaptcha": "^1.1",
35+
"gymadarasz/imagesloaded": "^4.1",
36+
"gymadarasz/ace": "^1.2",
3537
"justinrainbow/json-schema": "^5.2",
3638
"league/oauth2-server": "^5.1",
3739
"league/uri": "^4.2",
@@ -44,6 +46,7 @@
4446
"soundasleep/html2text": "~0.5",
4547
"symfony/options-resolver": "^3.4",
4648
"symfony/validator": "^3.4",
49+
"tinymce/tinymce": "^4.9.11",
4750
"tuupola/slim-jwt-auth": "^2.0",
4851
"vlucas/phpdotenv": "^3.5",
4952
"wikimedia/composer-merge-plugin": "^1.4",

include/SuiteEditor/tpls/SuiteEditorTinyMCE.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<!-- [TinyMCE Editor implementation] -->
4141

42-
<script src='include/javascript/mozaik/vendor/tinymce/tinymce/tinymce.min.js'></script>
42+
<script src='vendor/tinymce/tinymce/tinymce.min.js'></script>
4343
<script>
4444
4545
/**

include/SuiteMozaik.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class SuiteMozaik
6363

6464
public function __construct()
6565
{
66-
$this->vendorPath = $this->mozaikPath . '/vendor';
66+
$this->vendorPath = 'vendor/';
6767
if ($this->autoInsertThumbnails) {
6868
if (count($this->getThumbs())==0 || self::$devMode) {
6969
$ord = 0;
@@ -108,8 +108,8 @@ public function getDependenciesHTML()
108108
<script src="{$this->vendorPath}/gymadarasz/imagesloaded/imagesloaded.pkgd.min.js"></script>
109109
110110
<!-- for color picker plugin -->
111-
<link rel="stylesheet" media="screen" type="text/css" href="{$this->vendorPath}/../colorpicker/css/colorpicker.css" />
112-
<script type="text/javascript" src="{$this->vendorPath}/../colorpicker/js/colorpicker.js"></script>
111+
<link rel="stylesheet" media="screen" type="text/css" href="{$this->mozaikPath}/colorpicker/css/colorpicker.css" />
112+
<script type="text/javascript" src="{$this->mozaikPath}/colorpicker/js/colorpicker.js"></script>
113113
HTML;
114114
return $html;
115115
}

include/javascript/mozaik/jquery.mozaik.js

-12
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ var mozaik = {
7777
return html;
7878
},
7979

80-
//getPreloaderHTML: function() {
81-
// var html = '<div class="mozaik-preloader"><img alt="loading.." src="img/725.gif"></div>';
82-
// return html;
83-
//}
84-
8580
refreshWidthSet: function() {
8681
$('.mozaik-width-set .handler').each(function(i,e){
8782
var width = parseInt($(e).attr('data-width'));
@@ -210,17 +205,10 @@ var plgBackground = {
210205
"99CCFF", "Light sky blue",
211206
"CC99FF", "Plum"
212207
],
213-
//setup: function(editor) {
214-
// var _editor = editor;
215-
// editor.on('focus', function(event){
216-
// mozaik.lastUsedEditor = _editor;
217-
// });
218-
//}
219208

220209
file_browser_callback: function(field_name, url, type, win, e) {
221210
mozaik.uploadPathField = field_name;
222211
if(type=='image') {
223-
// $('#mozaik_upload_form input').click();
224212
$('form#upload_form input[type="file"]').each(function(i,e){
225213
if($(e).css('display') != 'none') {
226214
$(e).click();

include/javascript/mozaik/vendor/gymadarasz/imagesloaded/.gitignore

-6
This file was deleted.

include/javascript/mozaik/vendor/gymadarasz/imagesloaded/.jshintrc

-12
This file was deleted.

0 commit comments

Comments
 (0)