Skip to content
Closed
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
53 changes: 38 additions & 15 deletions src/pat/tinymce/js/links.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ const ImageLink = InternalLink.extend({
const value = this.value();
return this.tinypattern.generateImageUrl(
value,
this.linkModal.getScaleFromSrcset(this.linkModal.$scale.val()),
this.linkModal.getScale(this.linkModal.$scale.val()),
);
},
});
Expand Down Expand Up @@ -423,6 +423,11 @@ export default Base.extend({
},

init: function () {
this.use_picture_variants =
Object.keys(this.options.pictureVariants || {}).length > 0;
this.use_scales =
!this.use_picture_variants && (this.options.imageScales || []).length > 0;

this.tinypattern = this.options.tinypattern;
if (this.tinypattern.options.anchorSelector) {
this.options.anchorSelector = this.tinypattern.options.anchorSelector;
Expand Down Expand Up @@ -510,6 +515,9 @@ export default Base.extend({
captionText: this.options.text.caption,
scaleText: this.options.text.scale,
pictureVariants: this.options.pictureVariants,
imageScales: this.options.imageScales,
use_picture_variants: this.use_picture_variants,
use_scales: this.use_scales,
imageCaptioningEnabled: this.options.imageCaptioningEnabled,
cancelBtn: this.options.text.cancelBtn,
insertBtn: this.options.text.insertBtn,
Expand Down Expand Up @@ -634,11 +642,16 @@ export default Base.extend({
this.tiny.nodeChanged();
},

getScaleFromSrcset: function (pictureVariant) {
let pictureVariantsConfig = this.options.pictureVariants[pictureVariant];
return pictureVariantsConfig.sourceset[
pictureVariantsConfig.sourceset.length - 1
].scale;
getScale: function (size) {
if (this.use_picture_variants) {
const pictureVariantsConfig = this.options.pictureVariants[size];
return pictureVariantsConfig.sourceset[
pictureVariantsConfig.sourceset.length - 1
].scale;
} else if (this.use_scales) {
return size;
}
return "";
},

updateImage: function (src) {
Expand All @@ -655,7 +668,11 @@ export default Base.extend({
cssclasses.push(this.$align.val());
}
if (this.linkType !== "externalImage") {
cssclasses.push("picture-variant-" + this.$scale.val());
if (this.use_picture_variants) {
cssclasses.push(`picture-variant-${this.$scale.val()}`);
} else if (this.use_scales) {
cssclasses.push(`image-scale-${this.$scale.val()}`);
}
}
if (captionFromDescription || caption) {
cssclasses.push("captioned");
Expand All @@ -669,12 +686,16 @@ export default Base.extend({
"alt": this.$alt.val(),
"class": cssclasses.join(" "),
"data-linkType": this.linkType,
"data-scale": this.getScaleFromSrcset(this.$scale.val()),
"data-scale": this.getScale(this.$scale.val()),
...this.linkTypes[this.linkType].attributes(),
};

if (this.linkType !== "externalImage") {
data["data-picturevariant"] = this.$scale.val();
if (this.use_picture_variants) {
data["data-picturevariant"] = this.$scale.val();
} else if (this.use_scales) {
data["data-scale"] = this.$scale.val();
}
}

if (caption && !captionFromDescription) {
Expand Down Expand Up @@ -874,12 +895,14 @@ export default Base.extend({
this.linkType = linkType;
this.linkTypes[this.linkType].load(this.imgElm);

// set scale selection in link modal:
const pictureVariant = this.dom.getAttrib(
this.imgElm,
"data-picturevariant",
);
this.$scale.val(pictureVariant);
// Set the active scale selection in link modal
let size = "";
if (this.use_picture_variants) {
size = this.dom.getAttrib(this.imgElm, "data-picturevariant");
} else if (this.use_scales) {
size = this.dom.getAttrib(this.imgElm, "data-scale");
}
this.$scale.val(size);

// const selectedImageUid = this.dom.getAttrib(
// this.imgElm,
Expand Down
10 changes: 9 additions & 1 deletion src/pat/tinymce/templates/image.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,19 @@
<div class="scale mb-2">
<label><%- scaleText %></label>
<select name="scale" class="form-select">
<% if (use_picture_variants) { %>
<% _.each(Object.keys(pictureVariants), function(key) { %>
<option value="<%- key %>" <% if (key === options.defaultSrcset) { %>selected<% } %> >
<%- pictureVariants[key].title %>
</option>
</option>
<% }); %>
<% } else if (use_scales) { %>
<% for (const scale of imageScales) { %>
<option value="<%- scale.value %>" <% if (scale.value === options.defaultScale) { %>selected<% } %> >
<%- scale.title %>
</option>
<% } %>
<% } %>
</select>
</div>
</div>
Expand Down
6 changes: 6 additions & 0 deletions src/pat/tinymce/tinymce--implementation.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,19 @@ export default class TinyMCE {
// tiny needs an id in order to initialize. Creat it if not set.
const id = utils.setId(this.$el);

// Plone 6 picture variants.
if (
this.options.pictureVariants &&
typeof this.options.pictureVariants === "string"
) {
this.options.pictureVariants = JSON.parse(this.options.pictureVariants);
}

// BBB for Plone 5 image scales, in case no picture variants are set.
if (this.options.imageScales && typeof this.options.imageScales === "string") {
this.options.imageScales = JSON.parse(this.options.imageScales);
}

// TinyMCE editor options
const tinyOptions = structuredClone(this.options.tiny);
this.lang = tinyOptions.language = await this.initLanguage();
Expand Down