extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates tinymce to 5.5.1 and implements toolbar_mode option for htmlarea

Browse Source
This commit is contained in:
Hadi Nategh 2020-10-14 10:40:35 +02:00
parent 71dabcd33b
commit 2ed6f54e9b
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/js/etemplate/et2_widget_htmlarea.js
View File

@ -88,6 +88,7 @@ var et2_htmlarea = /** @class */ (function (_super) {
body_id: this.dom_id + '_htmlarea', body_id: this.dom_id + '_htmlarea',
menubar: false, menubar: false,
statusbar: this.options.statusbar, statusbar: this.options.statusbar,
toolbar_mode: this.options.toolbar_mode,
branding: false, branding: false,
resize: false, resize: false,
height: this.options.height, height: this.options.height,
@ -426,6 +427,12 @@ var et2_htmlarea = /** @class */ (function (_super) {
'description': 'Comma separated string of toolbar actions. It will only be considered if no Mode is restricted.', 'description': 'Comma separated string of toolbar actions. It will only be considered if no Mode is restricted.',
'default': '', 'default': '',
'type': 'string' 'type': 'string'
},
toolbar_mode: {
'name': 'toolbar mode',
'type': 'string',
'default': 'floating',
'description': 'It allows to extend the toolbar to accommodate the overflowing toolbar buttons. {floating, sliding, scrolling, wrap}'
} }
}; };
/** /**

7
api/js/etemplate/et2_widget_htmlarea.ts
View File

@ -89,6 +89,12 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
'description': 'Comma separated string of toolbar actions. It will only be considered if no Mode is restricted.', 'description': 'Comma separated string of toolbar actions. It will only be considered if no Mode is restricted.',
'default': '', 'default': '',
'type': 'string' 'type': 'string'
},
toolbar_mode: {
'name': 'toolbar mode',
'type': 'string',
'default': 'floating',
'description': 'It allows to extend the toolbar to accommodate the overflowing toolbar buttons. {floating, sliding, scrolling, wrap}'
} }
}; };
@ -213,6 +219,7 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
body_id: this.dom_id + '_htmlarea', body_id: this.dom_id + '_htmlarea',
menubar: false, menubar: false,
statusbar: this.options.statusbar, statusbar: this.options.statusbar,
toolbar_mode: this.options.toolbar_mode,
branding: false, branding: false,
resize: false, resize: false,
height: this.options.height, height: this.options.height,

2
composer.json
View File

@ -107,7 +107,7 @@
"pear/xml_feed_parser": "^1.0.5", "pear/xml_feed_parser": "^1.0.5",
"pragmarx/google2fa-qrcode": "^1.0", "pragmarx/google2fa-qrcode": "^1.0",
"simplesamlphp/simplesamlphp": "^1.18", "simplesamlphp/simplesamlphp": "^1.18",
"tinymce/tinymce": "^5.0" "tinymce/tinymce": "^5"
}, },
"require-dev": { "require-dev": {
"guzzlehttp/guzzle": "^6.5", "guzzlehttp/guzzle": "^6.5",

21
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "6a700a309b5c1bc30c563ccb2526e7e2", "content-hash": "91f834dc9df2ff546ce040d72ddf9318",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -1084,7 +1084,7 @@
], ],
"description": "Compiled version of magicsuggest customized for EGroupware project.", "description": "Compiled version of magicsuggest customized for EGroupware project.",
"homepage": "https://github.com/EGroupware/magicsuggest", "homepage": "https://github.com/EGroupware/magicsuggest",
"time": "2018-06-21T10:14:03+00:00" "time": "2018-06-21T13:36:37+00:00"
}, },
{ {
"name": "egroupware/news_admin", "name": "egroupware/news_admin",
@ -7818,16 +7818,16 @@
}, },
{ {
"name": "tinymce/tinymce", "name": "tinymce/tinymce",
"version": "5.0.7", "version": "5.5.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/tinymce/tinymce-dist.git", "url": "https://github.com/tinymce/tinymce-dist.git",
"reference": "0ae953e05a2d2bfdf4a35a9ad8eaf6df0f875393" "reference": "a436d254bc8d62e50be1fdb3d3e98981ab0e4c40"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/0ae953e05a2d2bfdf4a35a9ad8eaf6df0f875393", "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/a436d254bc8d62e50be1fdb3d3e98981ab0e4c40",
"reference": "0ae953e05a2d2bfdf4a35a9ad8eaf6df0f875393", "reference": "a436d254bc8d62e50be1fdb3d3e98981ab0e4c40",
"shasum": "" "shasum": ""
}, },
"type": "component", "type": "component",
@ -7836,13 +7836,15 @@
"scripts": [ "scripts": [
"tinymce.js", "tinymce.js",
"plugins/*/plugin.js", "plugins/*/plugin.js",
"themes/*/theme.js" "themes/*/theme.js",
"themes/*/icons.js"
], ],
"files": [ "files": [
"tinymce.min.js", "tinymce.min.js",
"plugins/*/plugin.min.js", "plugins/*/plugin.min.js",
"themes/*/theme.min.js", "themes/*/theme.min.js",
"skins/**" "skins/**",
"icons/*/icons.min.js"
] ]
} }
}, },
@ -7860,7 +7862,7 @@
"tinymce", "tinymce",
"wysiwyg" "wysiwyg"
], ],
"time": "2019-06-05T06:30:54+00:00" "time": "2020-10-01T05:31:22+00:00"
}, },
{ {
"name": "twig/extensions", "name": "twig/extensions",
@ -7915,6 +7917,7 @@
"i18n", "i18n",
"text" "text"
], ],
"abandoned": true,
"time": "2018-12-05T18:34:18+00:00" "time": "2018-12-05T18:34:18+00:00"
}, },
{ {