Skip to content

Commit 25e82fb

Browse files
author
Pniel (Pini) Cohen
authored
Merge pull request #63 from cloudinary/v1.11.2
V1.11.2
2 parents 59ca092 + 57d01ae commit 25e82fb

File tree

3 files changed

+23
-63
lines changed

3 files changed

+23
-63
lines changed

‎Plugin/Catalog/Block/Product/ImageFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function __construct(
109109
* @param array $attributes
110110
* @return string
111111
*/
112-
private function getStringCustomAttributes(array $attributes): string
112+
private function getStringCustomAttributes(array $attributes)
113113
{
114114
$result = [];
115115
foreach ($attributes as $name => $value) {

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

Lines changed: 21 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,13 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
4646
data-mage-init='{"openVideoModal":{}}'
4747
data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
4848
data-images="<?= $block->escapeHtmlAttr($block->getImagesJson()) ?>"
49-
data-types="<?= $block->escapeHtml(
50-
$this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
51-
) ?>"
52-
>
49+
data-types="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())) ?>">
5350

5451
<?php if ($cloudinaryMLwidgetOprions): ?>
5552
<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": <?= $cloudinaryMLwidgetOprions ?>}'>
5653
<div class="product-image-wrapper">
5754
<p class="image-placeholder-text">
58-
<?= $block->escapeHtml(
59-
__('Add from Cloudinary')
60-
); ?>
55+
<?= $block->escapeHtml(__('Add from Cloudinary')) ?>
6156
</p>
6257
</div>
6358
</div>
@@ -67,13 +62,10 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
6762
if (!$block->getElement()->getReadonly()):
6863
?>
6964
<div class="image image-placeholder">
70-
<?php /* @escapeNotVerified */ echo $block->getUploaderHtml();
71-
?>
65+
<?= /* @escapeNotVerified */ $block->getUploaderHtml() ?>
7266
<div class="product-image-wrapper">
7367
<p class="image-placeholder-text">
74-
<?= $block->escapeHtml(
75-
__('Browse to find or drag image here')
76-
); ?>
68+
<?= $block->escapeHtml(__('Browse to find or drag image here')) ?>
7769
</p>
7870
</div>
7971
</div>
@@ -167,31 +159,21 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
167159
class="action-remove"
168160
data-role="delete-button"
169161
title="<% if (data.media_type == 'external-video') {%>
170-
<?= $block->escapeHtml(
171-
__('Delete video')
172-
); ?>
173-
<%} else {%>
174-
<?= $block->escapeHtml(
175-
__('Delete image')
176-
); ?>
177-
<%}%>">
162+
<?= $block->escapeHtml(__('Delete video')) ?>
163+
<%} else {%>
164+
<?= $block->escapeHtml(__('Delete image')) ?>
165+
<%}%>">
178166
<span>
179167
<% if (data.media_type == 'external-video') { %>
180-
<?= $block->escapeHtml(
181-
__('Delete video')
182-
); ?>
168+
<?= $block->escapeHtml(__('Delete video')) ?>
183169
<% } else {%>
184-
<?= $block->escapeHtml(
185-
__('Delete image')
186-
); ?>
170+
<?= $block->escapeHtml(__('Delete image')) ?>
187171
<%} %>
188172
</span>
189173
</button>
190174
<div class="draggable-handle"></div>
191175
</div>
192-
<div class="image-fade"><span><?= $block->escapeHtml(
193-
__('Hidden')
194-
); ?></span></div>
176+
<div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
195177
</div>
196178

197179
<div class="item-description">
@@ -209,11 +191,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
209191
<?php
210192
foreach ($block->getImageTypes() as $typeData):
211193
?>
212-
<li data-role-code="<?= $block->escapeHtml(
213-
$typeData['code']
214-
) ?>" class="item-role item-role-<?= $block->escapeHtml(
215-
$typeData['code']
216-
) ?>">
194+
<li data-role-code="<?= $block->escapeHtml($typeData['code']) ?>" class="item-role item-role-<?= $block->escapeHtml($typeData['code']) ?>">
217195
<?= $block->escapeHtml($typeData['label']) ?>
218196
</li>
219197
<?php
@@ -245,17 +223,13 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
245223
<textarea data-role="image-description"
246224
rows="3"
247225
class="admin__control-textarea"
248-
name="<?php /* @escapeNotVerified */
249-
echo $elementName
250-
?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
226+
name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
251227
</div>
252228
</div>
253229

254230
<div class="admin__field field-image-role">
255231
<label class="admin__field-label">
256-
<span><?= $block->escapeHtml(
257-
__('Role')
258-
); ?></span>
232+
<span><?= $block->escapeHtml(__('Role')) ?></span>
259233
</label>
260234
<div class="admin__field-control">
261235
<ul class="multiselect-alt">
@@ -268,13 +242,9 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
268242
data-role="type-selector"
269243
data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
270244
type="checkbox"
271-
value="<?= $block->escapeHtml(
272-
$attribute->getAttributeCode()
273-
) ?>"
245+
value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
274246
/>
275-
<?php /* @escapeNotVerified */ echo $block->escapeHtml(
276-
$attribute->getFrontendLabel()
277-
) ?>
247+
<?= /* @escapeNotVerified */ $block->escapeHtml($attribute->getFrontendLabel()) ?>
278248
</label>
279249
</li>
280250
<?php
@@ -311,9 +281,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
311281
<% if (data.disabled == 1) { %>checked="checked"<% } %> />
312282

313283
<label for="hide-from-product-page" class="admin__field-label">
314-
<?= $block->escapeHtml(
315-
__('Hide from Product Page')
316-
); ?>
284+
<?= $block->escapeHtml(__('Hide from Product Page')) ?>
317285
</label>
318286
</div>
319287
</div>
@@ -326,24 +294,16 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
326294
<div id="video-player-preview-location" class="video-player-sidebar">
327295
<div class="video-player-container"></div>
328296
<div class="video-information title">
329-
<label><?= $block->escapeHtml(
330-
__('Title:')
331-
); ?> </label><span></span>
297+
<label><?= $block->escapeHtml(__('Title:')) ?> </label><span></span>
332298
</div>
333299
<div class="video-information uploaded">
334-
<label><?= $block->escapeHtml(
335-
__('Uploaded:')
336-
); ?> </label><span></span>
300+
<label><?= $block->escapeHtml(__('Uploaded:')) ?> </label><span></span>
337301
</div>
338302
<div class="video-information uploader">
339-
<label><?= $block->escapeHtml(
340-
__('Uploader:')
341-
); ?> </label><span></span>
303+
<label><?= $block->escapeHtml(__('Uploader:')) ?> </label><span></span>
342304
</div>
343305
<div class="video-information duration">
344-
<label><?= $block->escapeHtml(
345-
__('Duration:')
346-
); ?> </label><span></span>
306+
<label><?= $block->escapeHtml(__('Duration:')) ?> </label><span></span>
347307
</div>
348308
</div>
349309
</div>

‎view/adminhtml/templates/config/free.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818

1919
<div id="cloudinary_custom_transform_preview"
2020
style="margin-top: 10px;"
21-
data-mage-init='{"cloudinaryFreeTransform":{"previewButtonId": "#cloudinary_free_transform_preview_button", "transformInputFieldId": "#cloudinary_transformations_cloudinary_free_transform_global", "ajaxUrl": "<?php echo $this->getUrl('cloudinary/ajax_free/sample'); ?>", "ajaxKey": "<?php echo $this->getFormKey(); ?>"}}'>
21+
data-mage-init='{"cloudinaryFreeTransform":{"previewButtonId": "#cloudinary_free_transform_preview_button", "transformInputFieldId": "#cloudinary_transformations_cloudinary_free_transform_global", "ajaxUrl": "<?= $this->getUrl('cloudinary/ajax_free/sample') ?>", "ajaxKey": "<?= $this->getFormKey() ?>"}}'>
2222
</div>

0 commit comments

Comments
 (0)