Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e8a7dc6

Browse files 
2 parents de57320 + 87d3c55 commit e8a7dc6

File tree

9 files changed

+19
-18
lines changed

9 files changed

+19
-18
lines changed

‎Controller/Adminhtml/Ajax/RetrieveImage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function execute()
202202
if (!$this->configuration->isEnabledCachePlaceholder()) {
203203
// Only download the real Cloudinary image if not using placeholder
204204
$this->retrieveRemoteImage($this->remoteFileUrl, $localUniqFilePath);
205-
} else if ((strpos($this->getBaseTmpMediaPath(), '/category') != false)) {
205+
} else if ((strpos($this->getBaseTmpMediaPath(), '/category') !== false)) {
206206
$this->retrieveRemoteImage($this->remoteFileUrl, $localUniqFilePath);
207207
} else {
208208
// Save the already-read placeholder image manually

‎Core/CloudinaryImageManager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function __construct(
5454
* @param OutputInterface|null $output
5555
* @throws \Exception
5656
*/
57-
public function uploadAndSynchronise(Image $image, OutputInterface $output = null, $retryAttempt = 0)
57+
public function uploadAndSynchronise(Image $image, ?OutputInterface $output = null, $retryAttempt = 0)
5858
{
5959
if (!$this->configuration->isEnabled() || !$this->configuration->hasEnvironmentVariable()) {
6060
return;

‎view/adminhtml/templates/browser/content.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $cloudinaryMLwidgetOprions = $block->getCloudinaryMediaLibraryWidgetOptions();
3333
title="<?= $escaper->escapeHtml(__('Add from Cloudinary')) ?>"
3434
data-role="add-from-cloudinary-button"
3535
type="button"
36-
data-mage-init='{"cloudinaryMediaLibraryModal": <?= $cloudinaryMLwidgetOprions ?>}'
36+
data-mage-init='{"cloudinaryMediaLibraryModal": <?= /* @noEscape */$cloudinaryMLwidgetOprions ?>}'
3737
class="action-secondary add-from-cloudinary-button cloudinary-button-with-logo lg-margin-bottom">
3838
<span><?= $escaper->escapeHtml(__('Add from Cloudinary')) ?></span>
3939
</button>

‎view/adminhtml/templates/catalog/product/helper/gallery.phtml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ $cloudinaryMLwidgetOprions = $block->getCloudinaryMediaLibraryWidgetOptions();
3737
title="<?= $escaper->escapeHtmlAttr(__('Add Image/Video')) ?>"
3838
data-role="add-from-cloudinary-button"
3939
type="button"
40-
data-mage-init='{"cloudinaryMediaLibraryModal": <?= $cloudinaryMLwidgetOprions ?>}'
40+
data-mage-init='{"cloudinaryMediaLibraryModal": <?= /* @escapeNotVerified */$cloudinaryMLwidgetOprions ?>}'
4141
class="action-secondary add-from-cloudinary-button">
4242
<span><?= $escaper->escapeHtmlAttr(__('Add Image/Video')) ?></span>
4343
</button>
4444
<button id="gallery_top_add_cldspinset_button_<?= /* @escapeNotVerified */ $block->getHtmlId() ?>"
4545
title="<?= $escaper->escapeHtmlAttr(__('Add Spinset')) ?>"
4646
data-role="add-cldspinset-button"
4747
type="button"
48-
data-mage-init='{"cloudinarySpinsetModal": <?= $cloudinaryMLwidgetOprions ?>}'
48+
data-mage-init='{"cloudinarySpinsetModal": <?= /* @escapeNotVerified */$cloudinaryMLwidgetOprions ?>}'
4949
class="action-secondary">
5050
<span><?= $escaper->escapeHtmlAttr(__('Add Spinset')) ?></span>
5151
</button>
@@ -71,7 +71,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
7171
data-types="<?= $escaper->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())) ?>">
7272

7373
<?php if ($cloudinaryMLwidgetOprions): ?>
74-
<div id="gallery_inner_add_from_cloudinary_placeholder_button_<?= /* @escapeNotVerified */ $block->getHtmlId() ?>" data-role="add-from-cloudinary-button" data-mage-init='{"cloudinaryMediaLibraryModal": <?= $cloudinaryMLwidgetOprions ?>}'>
74+
<div id="gallery_inner_add_from_cloudinary_placeholder_button_<?= /* @escapeNotVerified */ $block->getHtmlId() ?>" class="image image-placeholder add-from-cloudinary-button" data-role="add-from-cloudinary-button" data-mage-init='{"cloudinaryMediaLibraryModal": <?= /* @escapeNotVerified */$cloudinaryMLwidgetOprions ?>}'>
7575
<div class="product-image-wrapper">
7676
<p class="image-placeholder-text">
7777
<?= $escaper->escapeHtml(__('Add from Cloudinary')) ?>
@@ -374,7 +374,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
374374
</label>
375375
<div class="admin__field-control">
376376
<div id="cldspinset-preview" class="cldspinset-preview">
377-
<img id="cldspinset-preview-img" class="placeholder" src="<?= $this->getViewFileUrl('Cloudinary_Cloudinary::images/cloudinary_spinset_placeholder.svg') ?>" alt="Cloudinary spinset preview" data-placeholder="<?= /* @noEscape */ $this->getViewFileUrl('Cloudinary_Cloudinary::images/cloudinary_spinset_placeholder.svg') ?>"/>
377+
<img id="cldspinset-preview-img" class="placeholder" src="<?= /* @noEscape */$this->getViewFileUrl('Cloudinary_Cloudinary::images/cloudinary_spinset_placeholder.svg') ?>" alt="Cloudinary spinset preview" data-placeholder="<?= /* @noEscape */ $this->getViewFileUrl('Cloudinary_Cloudinary::images/cloudinary_spinset_placeholder.svg') ?>"/>
378378
<div id="cldspinset-indic"></div>
379379
</div>
380380
</div>

‎view/adminhtml/templates/cms/images.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
?>
66
<script type="text/x-magento-init">
77
{"*": {
8-
"updateCmsImages": { "ajaxUrl": "<?= $block->getUrl('cloudinary/ajax/updateadminimage') ?>" }
8+
"updateCmsImages": { "ajaxUrl": "<?= /* @noEscape */$block->getUrl('cloudinary/ajax/updateadminimage') ?>" }
99
}}
1010

1111
</script>

‎view/adminhtml/web/js/get-video-information.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ define(
170170

171171
this._initialize();
172172

173-
this.element.append('<div/>');
173+
this.element.append('<div></div>');
174174

175175
this._on(
176176
window, {
@@ -339,7 +339,7 @@ define(
339339
timestamp +
340340
additionalParams;
341341
this.element.append(
342-
$('<iframe/>')
342+
$('<iframe></iframe>')
343343
.attr('frameborder', 0)
344344
.attr('id', 'vimeo' + this._code + timestamp)
345345
.attr('width', this._width)
@@ -362,7 +362,7 @@ define(
362362
this._initialize();
363363

364364
this.element.append(
365-
$('<iframe/>')
365+
$('</iframe></iframe>')
366366
.attr('frameborder', 0)
367367
.attr('id', 'cloudinary' + this._code + (new Date().getTime()))
368368
.attr('class', 'cld-video-player')

‎view/adminhtml/web/template/product/free_transform.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
</tr>
2121
</thead>
2222

23-
<tbody each="data: elems, as: 'element'" render="" afterRender="afterRender" />
23+
<tbody each="data: elems, as: 'element'" render="" afterRender="afterRender">
24+
</tbody>
2425
</table>
2526
</div>
2627

@@ -39,4 +40,4 @@
3940
</p>
4041
<p>
4142
Only images are listed - transforms to videos are not yet possible using the Magento module.
42-
</p>
43+
</p>

‎view/frontend/templates/product/image.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<?php foreach ($block->getCustomAttributes() as $name => $value): ?>
1414
<?= $escaper->escapeHtmlAttr($name) ?>="<?= $escaper->escapeHtmlAttr($value) ?>"
1515
<?php endforeach; ?>
16-
src="<?= $block->getLazyloadPlaceholder() ?>"
16+
src="<?= $escaper->escapeHtmlAttr($block->getLazyloadPlaceholder()) ?>"
1717
data-original="<?= $escaper->escapeUrl($block->getImageUrl()) ?>"
1818
width="<?= $escaper->escapeHtmlAttr($block->getWidth()) ?>"
1919
height="<?= $escaper->escapeHtmlAttr($block->getHeight()) ?>"

‎view/frontend/web/js/load-player.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ define(
175175

176176
this._initialize();
177177

178-
this.element.append('<div/>');
178+
this.element.append('<div></div>');
179179

180180
this._on(
181181
window, {
@@ -360,7 +360,7 @@ define(
360360
additionalParams;
361361
id = 'vimeo' + this._code + timestamp;
362362
this.element.append(
363-
$('<iframe/>')
363+
$('<iframe></iframe>')
364364
.attr('frameborder', 0)
365365
.attr('id', id)
366366
.attr('width', this._width)
@@ -428,7 +428,7 @@ define(
428428

429429
if (cldVideoSettings.player_type != 'cloudinary') {
430430
elem.append(
431-
$('<iframe/>')
431+
$('<iframe></iframe>')
432432
.attr('frameborder', 0)
433433
.attr('id', 'cloudinary' + this._code + (new Date().getTime()))
434434
.attr('class', 'cld-video-player')
@@ -448,7 +448,7 @@ define(
448448
);
449449
} else {
450450
let id = 'cld_video_player';
451-
this._player = $('<video/>');
451+
this._player = $('<video></video>');
452452
console.log(elem);
453453
elem.append(
454454
this._player

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /