Merged with ezsystems/ezpublish-legacy 2019.03.5

Aplia · Oct 3, 2020 · a8a3c7e · a8a3c7e
1 parent 9276ce8
commit a8a3c7e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -1,20 +1,33 @@
-Aplia eZOE (fork of eZ Online Editor)
-=======================================================
+# Aplia eZOE (fork of eZ Online Editor)
 
-What is Aplia eZOE ?
--------------------
+## What is Aplia eZOE ?
 
 Aplia eZOE is a fork of eZOE extension which is bundled inside the eZ Publish legacy repository.
 
 #### How to merge with eZOE
 
-```
-git clone https://github.com/ezsystems/ezpublish-legacy  
-git clone [email protected]:Aplia/ezoe.git aplia-ezoe  
+1. Checkout `ezpublish-legacy`
 
-cd aplia-ezoe
-Remove everything except .git, README.md and composer.json
-cp -R ../ezpublish-legacy/extension/ezoe/ .
-Review and add changes
-Push and release new version
-```
+   `git clone https://github.com/ezsystems/ezpublish-legacy`
+
+2. Checkout Aplia eZOE
+
+   `git clone [email protected]:Aplia/ezoe.git aplia-ezoe`
+
+3. Enter Aplia eZOE
+
+   `cd aplia-ezoe`
+
+4. Remove everything except `.git`, `README.md` and `composer.json`
+
+   `ls | grep -v '.git' | grep -v 'README.md' | grep -v 'composer.json' | xargs rm -R`
+
+5. Copy updated code from `ezpublish-legacy`
+
+   `cp -R ../ezpublish-legacy/extension/ezoe/ .`
+
+6. Review and add changes
+
+   `git add .`
+
+7. Push code and add new release
diff --git a/design/standard/javascript/ezoe/popup_utils.js b/design/standard/javascript/ezoe/popup_utils.js
@@ -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;

diff --git a/design/standard/templates/ezoe/tag_embed_images.tpl b/design/standard/templates/ezoe/tag_embed_images.tpl
@@ -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'];
@@ -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
@@ -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'] );
             }
         });
     }

diff --git a/ezxmltext/handlers/input/ezoexmlinput.php b/ezxmltext/handlers/input/ezoexmlinput.php
@@ -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;