Skip to content
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

Jump to bottom

Show images after used url_prefix #1453

Merged
merged 2 commits into from
Feb 5, 2020
Merged

Show images after used url_prefix #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f2e67c
Show images after used url_prefix
Dec 26, 2019
68f1b2c
CS
andrerom Jan 29, 2020
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
4 changes: 4 additions & 0 deletions extension/ezjscore/classes/ezjscajaxcontent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,10 @@ function ( &$element, $key )
(string)$element, 'UTF-8'
);
}
if( $key === 'url' )
{
eZURI::transformURI( $element, true );
}
}
);

Expand Down
2 changes: 1 addition & 1 deletion extension/ezoe/design/standard/javascript/ezoe/popup_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ var eZOEPopupUtils = {
{
tag = document.createElement("span");
tag.className = 'image_preview';
var previewUrl = ed.settings.ez_root_url + encodeURI( n.data_map[ n.image_attributes[imageIndex] ].content[eZOEPopupUtils.settings.browseImageAlias].url )
var previewUrl = encodeURI( n.data_map[ n.image_attributes[imageIndex] ].content[eZOEPopupUtils.settings.browseImageAlias].url )
tag.innerHTML += ' <a href="#">' + ed.getLang('preview.preview_desc') + '<img src="' + previewUrl + '" /></a>';
td.appendChild( tag );
hasImage = true;
Expand Down
6 changes: 3 additions & 3 deletions extension/ezoe/design/standard/templates/ezoe/tag_embed_images.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ tinyMCEPopup.onInit.add( eZOEPopupUtils.BIND( eZOEPopupUtils.init, window, {
else
{
var imageAtr = eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ], imageSizeObj = imageAtr['content'][ args['alt'] ];
args['src'] = ed.settings.ez_root_url + imageSizeObj['url'];
args['src'] = imageSizeObj['url'];
args['title'] = eZOEPopupUtils.safeHtml( imageAtr['alternative_text'] || eZOEPopupUtils.embedObject['name'] );
args['width'] = imageSizeObj['width'];
args['height'] = imageSizeObj['height'];
Expand Down Expand Up @@ -153,7 +153,7 @@ function loadImageSize( e, el )
}
else if ( attribObj[size] )
{
previewImageNode.attr( 'src', eds.ez_root_url + attribObj[size]['url'] );
previewImageNode.attr( 'src', attribObj[size]['url'] );
tinyMCEPopup.resizeToInnerSize();
}
else
Expand All @@ -165,7 +165,7 @@ function loadImageSize( e, el )
{
var size = jQuery('#embed_size_source').val(), imageAttributes = eZOEPopupUtils.embedObject['image_attributes'];
eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ]['content'][ size ] = data['content']['data_map'][ imageAttributes[0] ]['content'][ size ];
previewImageNode.attr( 'src', eds.ez_root_url + eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ]['content'][ size ]['url'] );
previewImageNode.attr( 'src', eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ]['content'][ size ]['url'] );
}
});
}
Expand Down
3 changes: 2 additions & 1 deletion extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,8 @@ function inputTagXML( &$tag, $currentSectionLevel, $tdSectionLevel = null )
if ( $content->hasAttribute( $size ) )
{
$imageAlias = $content->imageAlias( $size );
$srcString = $URL . '/' . $imageAlias['url'];
eZURI::transformURI( $imageAlias['url'], true );
$srcString = $imageAlias['url'];
$imageWidth = $imageAlias['width'];
$imageHeight = $imageAlias['height'];
break;
Expand Down