Skip to content

Commit 0f3de51

Browse files
committed
Update TinyMCE editor to v4.7.6 release
Fixes issue with double scroll bar and subsequent position of inline editing toolbar.
1 parent f967949 commit 0f3de51

File tree

156 files changed

+6821
-70253
lines changed

Some content is hidden

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

156 files changed

+6821
-70253
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Space view.
5252

5353
## Latest version
5454

55-
v1.56.0
55+
v1.56.1
5656

5757
## OS support
5858

edition/community.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func main() {
4242
rt.Product = env.ProdInfo{}
4343
rt.Product.Major = "1"
4444
rt.Product.Minor = "56"
45-
rt.Product.Patch = "0"
45+
rt.Product.Patch = "1"
4646
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
4747
rt.Product.Edition = "Community"
4848
rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)

embed/bindata_assetfs.go

+1,425-2,374
Large diffs are not rendered by default.

gui/app/components/document/document-page.js

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default Component.extend(TooltipMixin, {
2222

2323
didReceiveAttrs() {
2424
this._super(...arguments);
25+
2526
if (this.get('isDestroyed') || this.get('isDestroying')) return;
2627

2728
if (this.get('session.authenticated')) {

gui/app/components/document/view-attachment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default Component.extend({
1818
documentService: service('document'),
1919
appMeta: service(),
2020
hasAttachments: notEmpty('files'),
21-
canEdit: computed('permissions', 'document.protection', function() {
21+
canEdit: computed('permissions.documentEdit', 'document.protection', function() {
2222
return this.get('document.protection') !== this.get('constants').ProtectionType.Lock && this.get('permissions.documentEdit');
2323
}),
2424
showDialog: false,

gui/app/components/section/base-editor-inline.js

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export default Component.extend(TooltipMixin, ModalMixin, {
2929
previewText: 'Preview',
3030

3131
didRender() {
32+
this._super(...arguments);
33+
3234
let msContainer = document.getElementById('section-editor-' + this.get('containerId'));
3335
let mousetrap = this.get('mousetrap');
3436

gui/ember-cli-build.js

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ module.exports = function (defaults) {
5050
app.import('vendor/keycloak.js');
5151
app.import('vendor/markdown-it.min.js');
5252
app.import('vendor/md5.js');
53+
app.import('vendor/mermaid.min.js');
5354
app.import('vendor/moment.js');
5455
app.import('vendor/mousetrap.js');
5556
app.import('vendor/prism.js');

0 commit comments

Comments
 (0)