Merge remote-tracking branch 'origin/v13/dev' into v14/dev
# Conflicts: # Directory.Build.props # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
This commit is contained in:
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 56 KiB |
@@ -344,10 +344,14 @@ function clipboardService($window, notificationsService, eventsService, localSto
|
||||
// Clean up each entry
|
||||
var copiedDatas = datas.map(data => prepareEntryForStorage(type, data, firstLevelClearupMethod));
|
||||
|
||||
// remove previous copies of this entry:
|
||||
// remove previous copies of this entry (Make sure to not remove copies from unsaved content):
|
||||
storage.entries = storage.entries.filter(
|
||||
(entry) => {
|
||||
return entry.unique !== uniqueKey;
|
||||
if (entry.unique === 0) {
|
||||
return displayLabel !== entry.label;
|
||||
} else {
|
||||
return entry.unique !== uniqueKey;
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
ng-repeat="subView in subViews track by subView.alias"
|
||||
ng-class="'sub-view-' + subView.name"
|
||||
val-sub-view="subView"
|
||||
ng-if="subView.active"
|
||||
ng-show="subView.active"
|
||||
>
|
||||
<div class="umb-editor-sub-view__content" ng-include="subView.view"></div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user