yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes - TinyMCE does not sync data to angular store when dragged away in grid-editor (#5048)

Browse Source
This commit is contained in:
Robert
2019-03-25 11:07:50 +01:00
committed by Niels Lyngsø
parent 929fc415bb
commit 026ad4f2a8
3 changed files with 933 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
View File

@@ -1,3 +1,3 @@
<div class="umb-rte">
<div id="{{uniqueId}}"></div>
<div class="umb-rte"
id="{{uniqueId}}">
</div>

1831
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

File diff suppressed because it is too large Load Diff

31
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.PropertyEditors.GridController" class="umb-grid umb-property-editor clearfix" id="umb-grid">
<umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white; border-color: white;">
<umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white;">
<umb-editor-sub-header-content-right>
<umb-button
@@ -187,10 +187,10 @@
<div class="umb-control-inner" ng-hide="sortMode">
<div class="umb-control-bar umb-control-handle">
<div class="umb-control-bar umb-control-handle">
<div class="umb-control-title" ng-if="control.active">
{{control.editor.name}}
{{control.editor.name}}
</div>
<div class="umb-tools" ng-if="control.active">
@@ -199,25 +199,24 @@
<i class="umb-control-tool-icon icon-settings" ng-click="editGridItemSettings(control, 'control')"></i>
</div>
<div class="umb-control-tool">
<i class="umb-control-tool-icon icon-trash" ng-click="togglePrompt(control)"></i>
<umb-confirm-action
ng-if="control.deletePrompt"
direction="left"
on-confirm="removeControl(area, $index)"
on-cancel="hidePrompt(control)">
</umb-confirm-action>
</div>
<div class="umb-control-tool">
<i class="umb-control-tool-icon icon-trash" ng-click="togglePrompt(control)"></i>
<umb-confirm-action ng-if="control.deletePrompt"
direction="left"
on-confirm="removeControl(area, $index)"
on-cancel="hidePrompt(control)">
</umb-confirm-action>
</div>
</div>
</div>
</div>
<!-- Redering the editor for specific control -->
<div ng-if="control && control.$editorPath"
<!-- Redering the editor for specific control -->
<div ng-if="control && control.$editorPath"
ng-include="control.$editorPath"
class="umb-cell-{{control.editor.view}}">
</div>
</div>
</div>
</div>