Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion css/cloudinary.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/asset-edit.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/css/components/_edit_overlay.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
margin-bottom: 20px;

.suffixed {
width: 80%;
width: 70%;
position: relative;
top: 5px;
}
Expand Down
38 changes: 19 additions & 19 deletions src/js/asset-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ const AssetEdit = {
currentURL: null,

// Transformations Input
transformationsInput: document.getElementById( 'edit_asset.transformations' ),
transformationsInput: document.getElementById( 'edit_asset.edit_affects.transformations' ),

// Text Overlay Inputs
textOverlayColorInput: document.getElementById( 'edit_asset.text_overlay_color' ),
textOverlayFontFaceInput: document.getElementById( 'edit_asset.text_overlay_font_face' ),
textOverlayFontSizeInput: document.getElementById( 'edit_asset.text_overlay_font_size' ),
textOverlayTextInput: document.getElementById( 'edit_asset.text_overlay_text' ),
textOverlayPositionInput: document.getElementById( 'edit_asset.text_overlay_position' ),
textOverlayXOffsetInput: document.getElementById( 'edit_asset.text_overlay_x_offset' ),
textOverlayYOffsetInput: document.getElementById( 'edit_asset.text_overlay_y_offset' ),
textOverlayColorInput: document.getElementById( 'edit_asset.edit_affects.text_overlay_color' ),
textOverlayFontFaceInput: document.getElementById( 'edit_asset.edit_affects.text_overlay_font_face' ),
textOverlayFontSizeInput: document.getElementById( 'edit_asset.edit_affects.text_overlay_font_size' ),
textOverlayTextInput: document.getElementById( 'edit_asset.edit_affects.text_overlay_text' ),
textOverlayPositionInput: document.getElementById( 'edit_asset.edit_affects.text_overlay_position' ),
textOverlayXOffsetInput: document.getElementById( 'edit_asset.edit_affects.text_overlay_x_offset' ),
textOverlayYOffsetInput: document.getElementById( 'edit_asset.edit_affects.text_overlay_y_offset' ),

// Image Overlay Inputs
imageOverlayImageIdInput: document.getElementById( 'edit_asset.image_overlay_image_id' ),
imageOverlayPublicIdInput: document.getElementById( 'edit_asset.image_overlay_public_id' ),
imageOverlaySizeInput: document.getElementById( 'edit_asset.image_overlay_size' ),
imageOverlayOpacityInput: document.getElementById( 'edit_asset.image_overlay_opacity' ),
imageOverlayPositionInput: document.getElementById( 'edit_asset.image_overlay_position' ),
imageOverlayXOffsetInput: document.getElementById( 'edit_asset.image_overlay_x_offset' ),
imageOverlayYOffsetInput: document.getElementById( 'edit_asset.image_overlay_y_offset' ),
imageOverlayImageIdInput: document.getElementById( 'edit_asset.edit_affects.image_overlay_image_id' ),
imageOverlayPublicIdInput: document.getElementById( 'edit_asset.edit_affects.image_overlay_public_id' ),
imageOverlaySizeInput: document.getElementById( 'edit_asset.edit_affects.image_overlay_size' ),
imageOverlayOpacityInput: document.getElementById( 'edit_asset.edit_affects.image_overlay_opacity' ),
imageOverlayPositionInput: document.getElementById( 'edit_asset.edit_affects.image_overlay_position' ),
imageOverlayXOffsetInput: document.getElementById( 'edit_asset.edit_affects.image_overlay_x_offset' ),
imageOverlayYOffsetInput: document.getElementById( 'edit_asset.edit_affects.image_overlay_y_offset' ),

// Buttons
saveButton: document.getElementById( 'cld-asset-edit-save' ),
Expand Down Expand Up @@ -85,7 +85,7 @@ const AssetEdit = {
this.imageOverlayMap = [
{ key: 'imageId', input: this.imageOverlayImageIdInput, defaultValue: '', event: 'input' },
{ key: 'publicId', input: this.imageOverlayPublicIdInput, defaultValue: '', event: 'input' },
{ key: 'size', input: this.imageOverlaySizeInput, defaultValue: 20, event: 'input' },
{ key: 'size', input: this.imageOverlaySizeInput, defaultValue: 100, event: 'input' },
{ key: 'opacity', input: this.imageOverlayOpacityInput, defaultValue: 20, event: 'input' },
{ key: 'position', input: this.imageOverlayPositionInput, defaultValue: '', event: 'change' },
{ key: 'xOffset', input: this.imageOverlayXOffsetInput, defaultValue: 0, event: 'input' },
Expand Down Expand Up @@ -425,11 +425,11 @@ const AssetEdit = {
}

if (xOffsetInput?.value) {
placementQualifiers.push(`x_${this.getFormattedPercentageValue(xOffsetInput.value)}`);
placementQualifiers.push(`x_${xOffsetInput.value}`);
}

if (yOffsetInput?.value) {
placementQualifiers.push(`y_${this.getFormattedPercentageValue(yOffsetInput.value)}`);
placementQualifiers.push(`y_${yOffsetInput.value}`);
}

return placementQualifiers.length > 0 ? ',' + placementQualifiers.join(',') : '';
Expand All @@ -446,7 +446,7 @@ const AssetEdit = {
let transformations = [];

if (this.imageOverlaySizeInput?.value) {
transformations.push(`c_scale,w_${this.getFormattedPercentageValue(this.imageOverlaySizeInput.value)}`);
transformations.push(`c_scale,w_${this.imageOverlaySizeInput.value}`);
}

if (this.imageOverlayOpacityInput?.value) {
Expand Down
35 changes: 8 additions & 27 deletions ui-definitions/settings-pages.php
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@
'edit_asset' => array(
'page_title' => __( 'Edit asset', 'cloudinary' ),
'section' => 'edit-asset',
'slug' => 'edit_affects',
'requires_connection' => true,
array(
'type' => 'row',
Expand Down Expand Up @@ -719,24 +720,14 @@
'title' => __( 'X Offset', 'cloudinary' ),
'default' => 0,
'slug' => 'text_overlay_x_offset',
'suffix' => '%',
'attributes' => array(
'max' => 100,
'min' => -100,
'step' => 1,
),
'suffix' => 'px',
),
array(
'type' => 'number',
'title' => __( 'Y Offset', 'cloudinary' ),
'default' => 0,
'slug' => 'text_overlay_y_offset',
'suffix' => '%',
'attributes' => array(
'max' => 100,
'min' => -100,
'step' => 1,
),
'suffix' => 'px',
),
),
),
Expand Down Expand Up @@ -847,12 +838,12 @@
array(
'type' => 'text',
'title' => __( 'Size', 'cloudinary' ),
'default' => 20,
'default' => 100,
'slug' => 'image_overlay_size',
'suffix' => '@value %',
'suffix' => '@value px',
'attributes' => array(
'min' => 1,
'max' => 100,
'max' => 1000,
'step' => 1,
'type' => 'range',
'class' => array(
Expand Down Expand Up @@ -912,24 +903,14 @@
'title' => __( 'X Offset', 'cloudinary' ),
'default' => 0,
'slug' => 'image_overlay_x_offset',
'suffix' => '%',
'attributes' => array(
'max' => 100,
'min' => -100,
'step' => 1,
),
'suffix' => 'px',
),
array(
'type' => 'number',
'title' => __( 'Y Offset', 'cloudinary' ),
'default' => 0,
'slug' => 'image_overlay_y_offset',
'suffix' => '%',
'attributes' => array(
'max' => 100,
'min' => -100,
'step' => 1,
),
'suffix' => 'px',
),
),
),
Expand Down