Skip to content

Commit

Permalink
Fixed issue #15710: text edition move when click inside
Browse files Browse the repository at this point in the history
  • Loading branch information
lime-marc committed Jan 27, 2020
1 parent a3f53c5 commit d0af09f
Show file tree
Hide file tree
Showing 16 changed files with 9,452 additions and 9,263 deletions.
6,212 changes: 3,108 additions & 3,104 deletions assets/packages/adminbasics/build/adminbasics.css

Large diffs are not rendered by default.

1,079 changes: 619 additions & 460 deletions assets/packages/adminbasics/build/adminbasics.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/packages/adminbasics/build/adminbasics.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/packages/adminbasics/build/adminbasics.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/packages/adminbasics/build/adminbasics.min.js.map

Large diffs are not rendered by default.

6,212 changes: 3,108 additions & 3,104 deletions assets/packages/adminbasics/build/adminbasics.rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/packages/adminbasics/build/adminbasics.rtl.min.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions assets/packages/adminbasics/scss/000-lime-admin-common.scss
Expand Up @@ -1105,6 +1105,9 @@ div.panel.disabled a {
.ck-blurred {
max-height:35vh;
}
.ck-blurred:hover {
max-height: initial;
}
.ckedit-nocollapse {
.ck-blurred {
max-height: initial;
Expand Down
Expand Up @@ -23,8 +23,11 @@ export default class ImageSelectUI extends Plugin {
(reject) => { console.error(reject); }
);

dropdownView.set('panelPosition','sw');

dropdownView.set( {
class: 'ck-scrollbar',
panelPosition: 'sw',
} );

dropdownView.buttonView.set( {
label: t( 'Select Image from server' ),
icon: selectImageIcon,
Expand Down
Expand Up @@ -23,14 +23,19 @@ export default class LsReplacementsUI extends Plugin {
(reject) => { console.error(reject); }
);

dropdownView.set('panelPosition','sw');
dropdownView.set( {
class: 'ck-scrollbar',
panelPosition: 'sw',
} );

dropdownView.buttonView.set( {
label: t( 'LsExpressions' ),
icon: lsIcon,
tooltip: true,
} );

dropdownView.panelView.set('class','ck-scrollbar');

// Execute the command when the dropdown item is clicked (executed).
this.listenTo( dropdownView, 'execute', evt => {
editor.execute( 'expression', { name: evt.source.commandParam, type: evt.source.typeDef } );
Expand Down
Expand Up @@ -42,7 +42,11 @@
.ck.ck-dropdown__panel {
max-height: 350px;
max-height: 50vh; /* or anything else, more likely ~300px or so */
overflow-y: auto;
overflow: hidden;
}

.ck-scrollbar .ck-dropdown__panel {
overflow-y: auto;
}

:root {
Expand Down
2 changes: 1 addition & 1 deletion assets/packages/questioneditor/build.min/css/main.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

5,173 changes: 2,590 additions & 2,583 deletions assets/packages/questioneditor/build/js/questionedit.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 comment on commit d0af09f

@Shnoulle
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
(but when we have a resize plugin for ckeditior5 , think it's the best solution ;) )

Please sign in to comment.