Skip to content

fixed failing to load images with url params #77

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.

Sign up for GitHub

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

Open
cozyCodr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed failing to load images with url params #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 53 additions & 43 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/**
* Build styles
*/
import './index.css';
import "./index.css";

import { IconAddBorder, IconStretch, IconAddBackground } from '@codexteam/icons';
import {
IconAddBorder,
IconStretch,
IconAddBackground,
} from "@codexteam/icons";

/**
* SimpleImage Tool for the Editor.js
Expand Down Expand Up @@ -55,9 +59,9 @@ export default class SimpleImage {
/**
* Tool's classes
*/
wrapper: 'cdx-simple-image',
imageHolder: 'cdx-simple-image__picture',
caption: 'cdx-simple-image__caption',
wrapper: "cdx-simple-image",
imageHolder: "cdx-simple-image__picture",
caption: "cdx-simple-image__caption",
};

/**
Expand All @@ -74,10 +78,11 @@ export default class SimpleImage {
* Tool's initial data
*/
this.data = {
url: data.url || '',
caption: data.caption || '',
url: data.url || "",
caption: data.caption || "",
withBorder: data.withBorder !== undefined ? data.withBorder : false,
withBackground: data.withBackground !== undefined ? data.withBackground : false,
withBackground:
data.withBackground !== undefined ? data.withBackground : false,
stretched: data.stretched !== undefined ? data.stretched : false,
};

Expand All @@ -86,18 +91,18 @@ export default class SimpleImage {
*/
this.tunes = [
{
name: 'withBorder',
label: 'Add Border',
name: "withBorder",
label: "Add Border",
icon: IconAddBorder,
},
{
name: 'stretched',
label: 'Stretch Image',
name: "stretched",
label: "Stretch Image",
icon: IconStretch,
},
{
name: 'withBackground',
label: 'Add Background',
name: "withBackground",
label: "Add Background",
icon: IconAddBackground,
},
];
Expand All @@ -112,16 +117,16 @@ export default class SimpleImage {
* @public
*/
render() {
const wrapper = this._make('div', [this.CSS.baseClass, this.CSS.wrapper]),
loader = this._make('div', this.CSS.loading),
imageHolder = this._make('div', this.CSS.imageHolder),
image = this._make('img'),
caption = this._make('div', [this.CSS.input, this.CSS.caption], {
contentEditable: !this.readOnly,
innerHTML: this.data.caption || '',
});
const wrapper = this._make("div", [this.CSS.baseClass, this.CSS.wrapper]),
loader = this._make("div", this.CSS.loading),
imageHolder = this._make("div", this.CSS.imageHolder),
image = this._make("img"),
caption = this._make("div", [this.CSS.input, this.CSS.caption], {
contentEditable: !this.readOnly,
innerHTML: this.data.caption || "",
});

caption.dataset.placeholder = 'Enter a caption';
caption.dataset.placeholder = "Enter a caption";

wrapper.appendChild(loader);

Expand All @@ -140,7 +145,7 @@ export default class SimpleImage {

image.onerror = (e) => {
// @todo use api.Notifies.show() to show error notification
console.log('Failed to load an image', e);
console.log("Failed to load an image", e);
};

this.nodes.imageHolder = imageHolder;
Expand All @@ -157,8 +162,8 @@ export default class SimpleImage {
* @returns {SimpleImageData}
*/
save(blockContent) {
const image = blockContent.querySelector('img'),
caption = blockContent.querySelector('.' + this.CSS.input);
const image = blockContent.querySelector("img"),
caption = blockContent.querySelector("." + this.CSS.input);

if (!image) {
return this.data;
Expand Down Expand Up @@ -206,7 +211,7 @@ export default class SimpleImage {

reader.readAsDataURL(file);

return new Promise(resolve => {
return new Promise((resolve) => {
reader.onload = (event) => {
resolve({
url: event.target.result,
Expand All @@ -223,7 +228,7 @@ export default class SimpleImage {
*/
onPaste(event) {
switch (event.type) {
case 'tag': {
case "tag": {
const img = event.detail.data;

this.data = {
Expand All @@ -232,7 +237,7 @@ export default class SimpleImage {
break;
}

case 'pattern': {
case "pattern": {
const { data: text } = event.detail;

this.data = {
Expand All @@ -241,13 +246,12 @@ export default class SimpleImage {
break;
}

case 'file': {
case "file": {
const { file } = event.detail;

this.onDropHandler(file)
.then(data => {
this.data = data;
});
this.onDropHandler(file).then((data) => {
this.data = data;
});

break;
}
Expand Down Expand Up @@ -289,15 +293,16 @@ export default class SimpleImage {
static get pasteConfig() {
return {
patterns: {
image: /https?:\/\/\S+\.(gif|jpe?g|tiff|png|webp)$/i,
image:
/https?:\/\/\S+\.(gif|jpe?g|tiff|png|webp)(\?\S+=[^&]+(&\S+=[^&]+)*)?$/i,
},
tags: [
{
img: { src: true },
},
],
files: {
mimeTypes: [ 'image/*' ],
mimeTypes: ["image/*"],
},
};
}
Expand All @@ -308,14 +313,14 @@ export default class SimpleImage {
* @returns {Array}
*/
renderSettings() {
return this.tunes.map(tune => ({
return this.tunes.map((tune) => ({
...tune,
label: this.api.i18n.t(tune.label),
toggle: true,
onActivate: () => this._toggleTune(tune.name),
isActive: !!this.data[tune.name],
}))
};
}));
}

/**
* Helper for making Elements with attributes
Expand Down Expand Up @@ -358,10 +363,15 @@ export default class SimpleImage {
* @private
*/
_acceptTuneView() {
this.tunes.forEach(tune => {
this.nodes.imageHolder.classList.toggle(this.CSS.imageHolder + '--' + tune.name.replace(/([A-Z])/g, (g) => `-${g[0].toLowerCase()}`), !!this.data[tune.name]);

if (tune.name === 'stretched') {
this.tunes.forEach((tune) => {
this.nodes.imageHolder.classList.toggle(
this.CSS.imageHolder +
"--" +
tune.name.replace(/([A-Z])/g, (g) => `-${g[0].toLowerCase()}`),
!!this.data[tune.name]
);

if (tune.name === "stretched") {
this.api.blocks.stretchBlock(this.blockIndex, !!this.data.stretched);
}
});
Expand Down