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

Renaming variable to allow MNTP media selection

Browse Source
This commit is contained in:
Robert
2019-01-14 13:23:00 +01:00
parent 6ee1c96bf0
commit 2ce3249c5e
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -1316,7 +1316,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
startNodeIsVirtual: userData.startMediaIds.length !== 1,
submit: function (model) {
self.insertMediaInEditor(args.editor, model.selectedImages[0]);
self.insertMediaInEditor(args.editor, model.selection[0]);
editorService.close();
},
close: function () {

2
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
View File

@@ -118,7 +118,7 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
startNodeIsVirtual: userData.startMediaIds.length !== 1,
submit: function (model) {
var media = model.selectedImages[0];
var media = model.selection[0];
$scope.model.target.id = media.id;
$scope.model.target.udi = media.udi;

24
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
View File

@@ -41,7 +41,7 @@ angular.module("umbraco")
$scope.maxFileSize = umbracoSettings.maxFileSize + "KB";
$scope.model.selectedImages = [];
$scope.model.selection = [];
$scope.acceptedMediatypes = [];
mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
@@ -145,7 +145,7 @@ angular.module("umbraco")
$scope.gotoFolder = function(folder) {
if (!$scope.multiPicker) {
deselectAllImages($scope.model.selectedImages);
deselectAllImages($scope.model.selection);
}
if (!folder) {
@@ -212,19 +212,19 @@ angular.module("umbraco")
function selectImage(image) {
if (image.selected) {
for (var i = 0; $scope.model.selectedImages.length > i; i++) {
var imageInSelection = $scope.model.selectedImages[i];
for (var i = 0; $scope.model.selection.length > i; i++) {
var imageInSelection = $scope.model.selection[i];
if (image.key === imageInSelection.key) {
image.selected = false;
$scope.model.selectedImages.splice(i, 1);
$scope.model.selection.splice(i, 1);
}
}
} else {
if (!$scope.multiPicker) {
deselectAllImages($scope.model.selectedImages);
deselectAllImages($scope.model.selection);
}
image.selected = true;
$scope.model.selectedImages.push(image);
$scope.model.selection.push(image);
}
}
@@ -238,7 +238,7 @@ angular.module("umbraco")
$scope.onUploadComplete = function(files) {
$scope.gotoFolder($scope.currentFolder).then(function() {
if (files.length === 1 && $scope.model.selectedImages.length === 0) {
if (files.length === 1 && $scope.model.selection.length === 0) {
var image = $scope.images[$scope.images.length - 1];
$scope.target = image;
$scope.target.url = mediaHelper.resolveFile(image);
@@ -275,7 +275,7 @@ angular.module("umbraco")
$scope.mediaPickerDetailsOverlay.show = true;
$scope.mediaPickerDetailsOverlay.submit = function(model) {
$scope.model.selectedImages.push($scope.target);
$scope.model.selection.push($scope.target);
$scope.model.submit($scope.model);
$scope.mediaPickerDetailsOverlay.show = false;
@@ -384,11 +384,11 @@ angular.module("umbraco")
var folderImage = $scope.images[folderImageIndex];
var imageIsSelected = false;
if ($scope.model && angular.isArray($scope.model.selectedImages)) {
if ($scope.model && angular.isArray($scope.model.selection)) {
for (var selectedImageIndex = 0;
selectedImageIndex < $scope.model.selectedImages.length;
selectedImageIndex < $scope.model.selection.length;
selectedImageIndex++) {
var selectedImage = $scope.model.selectedImages[selectedImageIndex];
var selectedImage = $scope.model.selection[selectedImageIndex];
if (folderImage.key === selectedImage.key) {
imageIsSelected = true;

2
src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js
View File

@@ -7,7 +7,7 @@ function imageFilePickerController($scope) {
onlyImages: true,
show: true,
submit: function (model) {
$scope.model.value = model.selectedImages[0].image;
$scope.model.value = model.selection[0].image;
$scope.mediaPickerOverlay.show = false;
$scope.mediaPickerOverlay = null;
},

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
View File

@@ -27,7 +27,7 @@ angular.module("umbraco")
disableFolderSelect: true,
onlyImages: true,
submit: function(model) {
var selectedImage = model.selectedImages[0];
var selectedImage = model.selection[0];
$scope.control.value = {
focalPoint: selectedImage.focalPoint,

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
View File

@@ -16,7 +16,7 @@ function MarkdownEditorController($scope, $element, assetsService, editorService
var mediaPicker = {
disableFolderSelect: true,
submit: function(model) {
var selectedImagePath = model.selectedImages[0].image;
var selectedImagePath = model.selection[0].image;
callback(selectedImagePath);
editorService.close();
},

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
View File

@@ -176,7 +176,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
editorService.close();
_.each(model.selectedImages, function (media, i) {
_.each(model.selection, function (media, i) {
// if there is no thumbnail, try getting one if the media is not a placeholder item
if (!media.thumbnail && media.id && media.metaData) {
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);