Browse Source
Merge pull request #12235 from vvlladd28/bug/mobile-center/edit-layout
Fixed updated mobile layout and show mobile edit panel
pull/12255/head
Igor Kulikov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
4 additions and
3 deletions
-
ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-page-item-row.component.ts
-
ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.scss
-
ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
|
|
@ -270,8 +270,8 @@ export class MobilePageItemRowComponent implements ControlValueAccessor, OnInit, |
|
|
|
|
|
|
|
|
private updateModel() { |
|
|
private updateModel() { |
|
|
this.modelValue.visible = this.mobilePageRowForm.get('visible').value; |
|
|
this.modelValue.visible = this.mobilePageRowForm.get('visible').value; |
|
|
const label = this.mobilePageRowForm.get('label').value.trim(); |
|
|
const label = this.mobilePageRowForm.get('label').value; |
|
|
if (label) { |
|
|
if (label?.trim()) { |
|
|
this.modelValue.label = label; |
|
|
this.modelValue.label = label; |
|
|
} else { |
|
|
} else { |
|
|
delete this.modelValue.label; |
|
|
delete this.modelValue.label; |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
} |
|
|
} |
|
|
.tb-editor { |
|
|
.tb-editor { |
|
|
height: 400px; |
|
|
height: 400px; |
|
|
|
|
|
overflow-y: auto; |
|
|
} |
|
|
} |
|
|
.tb-editor-buttons { |
|
|
.tb-editor-buttons { |
|
|
height: 40px; |
|
|
height: 40px; |
|
|
|
|
|
@ -59,7 +59,7 @@ export class EditorPanelComponent implements OnInit { |
|
|
resize: false, |
|
|
resize: false, |
|
|
setup: (editor) => { |
|
|
setup: (editor) => { |
|
|
editor.on('PostRender', function() { |
|
|
editor.on('PostRender', function() { |
|
|
const container = editor.getContainer(); |
|
|
const container = editor.getContainer().closest('.tb-popover-content'); |
|
|
const uiContainer = document.querySelector('.tox.tox-tinymce-aux'); |
|
|
const uiContainer = document.querySelector('.tox.tox-tinymce-aux'); |
|
|
container.parentNode.appendChild(uiContainer); |
|
|
container.parentNode.appendChild(uiContainer); |
|
|
}); |
|
|
}); |
|
|
|