Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Media Picker v3 #9461

Merged
merged 112 commits into from
Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from 104 commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
4f3c271
set input file accept
nielslyngsoe Nov 4, 2020
732ee76
Use PreValue file extensions for limiting the files to be chosen in f…
nielslyngsoe Nov 4, 2020
a76f64f
Current state for Warren to review
nielslyngsoe Nov 5, 2020
995b114
This should fix up what you need Niels
Nov 5, 2020
7aefd96
update csproj
nielslyngsoe Nov 5, 2020
76200d0
Merge remote-tracking branch 'origin/v/feature/AB9263-Refine-media-ty…
nielslyngsoe Nov 5, 2020
cf320e5
use empty string if fileExtensions is undefined
nielslyngsoe Nov 9, 2020
45d44e3
public interface
nielslyngsoe Nov 9, 2020
4efdb90
initial work
nielslyngsoe Nov 10, 2020
2036057
local crops
nielslyngsoe Nov 14, 2020
fcda22b
translations
nielslyngsoe Nov 14, 2020
74e5dea
translation correction
nielslyngsoe Nov 14, 2020
450df17
fix misspeling
nielslyngsoe Nov 16, 2020
0dec6f4
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Nov 23, 2020
755c709
some progress
nielslyngsoe Nov 23, 2020
2d67e81
filter media picker
nielslyngsoe Nov 23, 2020
1b4502c
align media card grid items correctly
nielslyngsoe Nov 23, 2020
17e6681
responsive media cropper
nielslyngsoe Nov 26, 2020
ee07a87
always be able to scale 3 times smallest scale
nielslyngsoe Nov 26, 2020
96ee5f7
making image cropper property editor responsive
nielslyngsoe Nov 26, 2020
d583955
scroll to scale
nielslyngsoe Nov 26, 2020
e02732b
adjust slider look
nielslyngsoe Nov 26, 2020
9c679a9
rearrange parts of mediaentryeditor
nielslyngsoe Nov 27, 2020
b901fa6
test helper
nielslyngsoe Nov 27, 2020
ee788e6
styling
nielslyngsoe Nov 27, 2020
9c32234
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Nov 27, 2020
864bd9b
move controls inside umb-image-crop
nielslyngsoe Nov 30, 2020
e8d9583
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Nov 30, 2020
5c442db
seperate umg-cropper-gravity styling
nielslyngsoe Nov 30, 2020
cd947c2
corrected layout
nielslyngsoe Nov 30, 2020
9c01cbb
more ui refinement
nielslyngsoe Dec 1, 2020
688beeb
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Dec 17, 2020
fb79078
keep the idea of mandatory out for now.
nielslyngsoe Dec 17, 2020
93d5a86
remove double ;
nielslyngsoe Dec 17, 2020
9d1b5ff
Merge branch 'v8/dev' into v8/feature/AB7941-MediaPicker3
Feb 2, 2021
15fe8ba
removed testing code
nielslyngsoe Feb 5, 2021
8c9aec8
JSON Property Value Convertor now has an array of property editors to…
Feb 8, 2021
cf30481
Property Value Convertor for Media Picker 3 aka Media Picker with Loc…
Feb 8, 2021
edec354
Experimenting on best approach to retrieve local crop in razor view w…
Feb 8, 2021
d1c357b
Update ValueConvertor to use ImageCropperValue as part of the model f…
Feb 9, 2021
8a6057d
Update extension methods to take an ImageCropperValue model (localCro…
Feb 9, 2021
a1c059f
Forgot to update CSProj for new ValueConvertor
Feb 9, 2021
e74a925
New GetCropUrl @Url.GetCropUrl(crop.Alias, media.LocalCrops) as opppo…
Feb 9, 2021
d6b4c68
Remove dupe item in CSProj
Feb 17, 2021
763a65f
Use a contains as an opposed to Array.IndexOf
Feb 17, 2021
22eef0b
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Mar 24, 2021
bfc20d1
various corrections, SingleMode based on max 1, remove double checker…
nielslyngsoe Mar 25, 2021
e1c9f9a
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Mar 25, 2021
03a9dbc
mediapicker v3
nielslyngsoe Mar 26, 2021
0fb2591
correct version
nielslyngsoe Mar 26, 2021
90d62c2
fixing file ext label text color
nielslyngsoe Mar 29, 2021
6857e0e
clipboard features for MediaPicker v3
nielslyngsoe Mar 29, 2021
2e92730
highlight not allowed types
nielslyngsoe Mar 29, 2021
6084b08
highlight trashed as an error
nielslyngsoe Mar 29, 2021
faab616
Media Types Video, Sound, Document and Vector Image
nielslyngsoe Mar 29, 2021
1bb6983
Rename to Audio and VectorGraphics
nielslyngsoe Mar 30, 2021
8380e0e
Add (SVG) in the name for Vector Graphics
nielslyngsoe Mar 30, 2021
894bb54
Merge remote-tracking branch 'origin/v8/feature/AB9263-Refine-media-t…
nielslyngsoe Mar 31, 2021
2777a66
adding CSV to Documents
nielslyngsoe Mar 31, 2021
29742c0
remove this commented code.
nielslyngsoe Mar 31, 2021
cb8a422
remove this commented code
nielslyngsoe Mar 31, 2021
b0f02c5
Merge remote-tracking branch 'origin/v8/feature/AB9263-Refine-media-t…
nielslyngsoe Mar 31, 2021
f6591a5
number range should not go below 0, at-least as default until we make…
nielslyngsoe Mar 31, 2021
fe9fbe9
use min not ng-min
nielslyngsoe Mar 31, 2021
ac98304
description for local crops
nielslyngsoe Mar 31, 2021
e9a47df
Error/Limits highlighting reactive
madsrasmussen Mar 31, 2021
65e9373
Merge branch 'v8/feature/AB7941-MediaPicker3' of https://github.com/u…
madsrasmussen Mar 31, 2021
c09f256
visual adjustments
nielslyngsoe Mar 31, 2021
18fb9a6
Merge branch 'v8/feature/AB7941-MediaPicker3' of https://github.com/u…
nielslyngsoe Mar 31, 2021
4e03ec9
Enabling opening filtered folders + corrected select hover states
nielslyngsoe Mar 31, 2021
d938315
Varous fixes to resolve issues with unit tests.
AndyButland Mar 31, 2021
f80b997
Refactor MediaType Documents to only contain Article file type
nielslyngsoe Apr 6, 2021
6ee20db
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/More-Med…
nielslyngsoe Apr 6, 2021
8b6c2f5
Merge remote-tracking branch 'origin/v8/feature/More-Media-Types' int…
nielslyngsoe Apr 6, 2021
1791ce1
mark as build-in
nielslyngsoe Apr 6, 2021
3e944e0
Merge remote-tracking branch 'origin/v8/feature/More-Media-Types' int…
nielslyngsoe Apr 6, 2021
3934f05
predefined MediaPicker3 DataTypes, renaming v2 to "old"
nielslyngsoe Apr 6, 2021
6f85e55
set scale bar current value after min and max has been set
madsrasmussen Apr 6, 2021
31f2087
added missing }
nielslyngsoe Apr 6, 2021
13b958c
update when focal point is dragged
madsrasmussen Apr 6, 2021
2fd71eb
adjusted styling for Image Cropper property editor
nielslyngsoe Apr 6, 2021
21fa6d9
Merge branch 'v8/feature/AB7941-MediaPicker3' of https://github.com/u…
nielslyngsoe Apr 6, 2021
8a64c38
correcting comment
nielslyngsoe Apr 6, 2021
4daca64
remove todo - message for trashed media items works
madsrasmussen Apr 7, 2021
86fd4d1
Changed parameter ordering
bergmania Apr 7, 2021
159c57a
Introduced new extension method on MediaWithCrops to get croppings ur…
bergmania Apr 7, 2021
9bba56b
Merge remote-tracking branch 'origin/v8/feature/AB7941-MediaPicker3' …
bergmania Apr 7, 2021
65e790f
Reintroducing Single Item Mode
nielslyngsoe Apr 7, 2021
41a2093
use Multiple instead of SingleMode
nielslyngsoe Apr 7, 2021
82b71cb
renaming and adding multiple to preconfigured datatypes
nielslyngsoe Apr 7, 2021
5739f05
Change existing media picker to use the Clipboard type MEDIA, enablin…
nielslyngsoe Apr 7, 2021
3d07c6f
clean up unused clipboard parts
nielslyngsoe Apr 7, 2021
520e3ed
adjusted to new amount
nielslyngsoe Apr 7, 2021
08850f6
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Apr 7, 2021
7dddb4b
correcting test
nielslyngsoe Apr 7, 2021
ce2f576
Merge branch 'v8/dev' into pr/9461
nul800sebastiaan Apr 7, 2021
e029ffa
Fix unit test
nul800sebastiaan Apr 7, 2021
4e87c8e
Move MediaWithCrops to separate file and move to Core.Models
bergmania Apr 8, 2021
b8b8c29
parseContentForPaste
nielslyngsoe Apr 9, 2021
6d47eeb
clean up
nielslyngsoe Apr 12, 2021
06a3ec1
ensure crops is an array.
nielslyngsoe Apr 12, 2021
6143a51
actively enable focal points, so we dont set focal points that aren't…
nielslyngsoe Apr 13, 2021
5da17db
only accept files that matches file extensions from Umbraco Settings
nielslyngsoe Apr 13, 2021
e190a6f
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Apr 13, 2021
c2526e3
Cleanup
elit0451 Apr 14, 2021
753a2fd
Add references from MediaPicker3 to media
bergmania Apr 15, 2021
fc7a530
corrections from various feedback
nielslyngsoe Apr 15, 2021
021e478
Merge branch 'v8/feature/AB7941-MediaPicker3' of https://github.com/u…
nielslyngsoe Apr 15, 2021
0946c83
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7941-M…
nielslyngsoe Apr 20, 2021
5aa6218
remove comment
nielslyngsoe Apr 20, 2021
69372dc
correct wording
nielslyngsoe Apr 20, 2021
98bede7
use windowResizeListener
nielslyngsoe Apr 20, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/Umbraco.Core/Constants-Conventions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,26 @@ public static class MediaTypes
/// </summary>
public const string Image = "Image";

/// <summary>
/// MediaType alias for an video-.
nielslyngsoe marked this conversation as resolved.
Show resolved Hide resolved
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public const string Video = "Video";

/// <summary>
/// MediaType alias for an audio.
/// </summary>
public const string Audio = "Audio";

/// <summary>
/// MediaType alias for an article.
/// </summary>
public const string Article = "Article";

/// <summary>
/// MediaType alias for an vector graphics.
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public const string VectorGraphics = "VectorGraphics";

elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// <summary>
/// MediaType alias indicating allowing auto-selection.
/// </summary>
Expand Down
93 changes: 90 additions & 3 deletions src/Umbraco.Core/Constants-DataTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ public static class DataTypes
public const int DropDownSingle = -39;
public const int DropDownMultiple = -42;
public const int Upload = -90;
public const int UploadVideo = -100;
public const int UploadAudio = -101;
public const int UploadArticle = -102;
public const int UploadVectorGraphics = -103;

public const int DefaultContentListView = -95;
public const int DefaultMediaListView = -96;
Expand All @@ -42,7 +46,7 @@ public static class ReservedPreValueKeys
/// Defines the identifiers for Umbraco data types as constants for easy centralized access/management.
/// </summary>
public static class Guids
{
{

/// <summary>
/// Guid for Content Picker as string
Expand Down Expand Up @@ -88,6 +92,49 @@ public static class Guids
public static readonly Guid MultipleMediaPickerGuid = new Guid(MultipleMediaPicker);


/// <summary>
/// Guid for Media Picker v3 as string
/// </summary>
public const string MediaPicker3 = "4309A3EA-0D78-4329-A06C-C80B036AF19A";

/// <summary>
/// Guid for Media Picker
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public static readonly Guid MediaPicker3Guid = new Guid(MediaPicker3);

/// <summary>
/// Guid for Media Picker v3 multiple as string
/// </summary>
public const string MediaPicker3Multiple = "1B661F40-2242-4B44-B9CB-3990EE2B13C0";

/// <summary>
/// Guid for Media Picker
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public static readonly Guid MediaPicker3MultipleGuid = new Guid(MediaPicker3Multiple);


/// <summary>
/// Guid for Media Picker v3 single-image as string
/// </summary>
public const string MediaPicker3SingleImage = "AD9F0CF2-BDA2-45D5-9EA1-A63CFC873FD3";

/// <summary>
/// Guid for Media Picker
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public static readonly Guid MediaPicker3SingleImageGuid = new Guid(MediaPicker3SingleImage);


/// <summary>
/// Guid for Media Picker v3 images multi-image as string
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public const string MediaPicker3MultipleImages = "0E63D883-B62B-4799-88C3-157F82E83ECC";

/// <summary>
/// Guid for Media Picker
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public static readonly Guid MediaPicker3MultipleImagesGuid = new Guid(MediaPicker3MultipleImages);


/// <summary>
/// Guid for Related Links as string
/// </summary>
Expand Down Expand Up @@ -307,6 +354,46 @@ public static class Guids
/// </summary>
public static readonly Guid UploadGuid = new Guid(Upload);

/// <summary>
/// Guid for UploadVideo as string
/// </summary>
public const string UploadVideo = "70575fe7-9812-4396-bbe1-c81a76db71b5";

/// <summary>
/// Guid for UploadVideo
/// </summary>
public static readonly Guid UploadVideoGuid = new Guid(UploadVideo);

/// <summary>
/// Guid for UploadAudio as string
/// </summary>
public const string UploadAudio = "8f430dd6-4e96-447e-9dc0-cb552c8cd1f3";

/// <summary>
/// Guid for UploadAudio
/// </summary>
public static readonly Guid UploadAudioGuid = new Guid(UploadAudio);

/// <summary>
/// Guid for UploadArticle as string
/// </summary>
public const string UploadArticle = "bc1e266c-dac4-4164-bf08-8a1ec6a7143d";

/// <summary>
/// Guid for UploadArticle
/// </summary>
public static readonly Guid UploadArticleGuid = new Guid(UploadArticle);

/// <summary>
/// Guid for UploadVectorGraphics as string
/// </summary>
public const string UploadVectorGraphics = "215cb418-2153-4429-9aef-8c0f0041191b";

/// <summary>
/// Guid for UploadVectorGraphics
/// </summary>
public static readonly Guid UploadVectorGraphicsGuid = new Guid(UploadVectorGraphics);


/// <summary>
/// Guid for Label as string
Expand Down Expand Up @@ -367,8 +454,8 @@ public static class Guids
/// Guid for Label decimal
/// </summary>
public static readonly Guid LabelDecimalGuid = new Guid(LabelDecimal);


}
}
}
Expand Down
22 changes: 21 additions & 1 deletion src/Umbraco.Core/Constants-Icons.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,26 @@ public static class Icons
/// </summary>
public const string MediaFile = "icon-document";

/// <summary>
/// System media video icon
/// </summary>
public const string MediaVideo = "icon-video";

/// <summary>
/// System media audio icon
/// </summary>
public const string MediaAudio = "icon-sound-waves";

/// <summary>
/// System media article icon
/// </summary>
public const string MediaArticle = "icon-article";

/// <summary>
/// System media vector icon
/// </summary>
public const string MediaVectorGraphics = "icon-picture";

/// <summary>
/// System media folder icon
/// </summary>
Expand Down Expand Up @@ -93,7 +113,7 @@ public static class Icons
/// System packages icon
/// </summary>
public const string Packages = "icon-box";

/// <summary>
/// System property editor icon
/// </summary>
Expand Down
7 changes: 6 additions & 1 deletion src/Umbraco.Core/Constants-PropertyEditors.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,17 @@ public static class Aliases
/// ListView.
/// </summary>
public const string ListView = "Umbraco.ListView";

/// <summary>
/// Media Picker.
/// </summary>
public const string MediaPicker = "Umbraco.MediaPicker";

/// <summary>
/// Media Picker v.3.
/// </summary>
public const string MediaPicker3 = "Umbraco.MediaPicker3";

elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// <summary>
/// Multiple Media Picker.
/// </summary>
Expand Down
20 changes: 20 additions & 0 deletions src/Umbraco.Core/Constants-PropertyTypeGroups.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,26 @@ public static class PropertyTypeGroups
/// </summary>
public const string File = "50899F9C-023A-4466-B623-ABA9049885FE";

/// <summary>
/// Guid for a Video PropertyTypeGroup object.
/// </summary>
public const string Video = "2F0A61B6-CF92-4FF4-B437-751AB35EB254";

/// <summary>
/// Guid for a Audio PropertyTypeGroup object.
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public const string Audio = "335FB495-0A87-4E82-B902-30EB367B767C";

/// <summary>
/// Guid for a Article PropertyTypeGroup object.
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public const string Article = "9AF3BD65-F687-4453-9518-5F180D1898EC";

/// <summary>
/// Guid for a VectorGraphics PropertyTypeGroup object.
/// </summary>
public const string VectorGraphics = "F199B4D7-9E84-439F-8531-F87D9AF37711";

/// <summary>
/// Guid for a Image PropertyTypeGroup object.
elit0451 marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
Expand Down
Loading