This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 25d8cb5b6f0dab8ede23ba1bb1dc841dc2b6761c Author: Dan Klco <[email protected]> AuthorDate: Tue Aug 28 11:13:06 2018 -0400 Fixing an issue where the previous editor was visible when the editor first loads --- .../libs/sling-cms/components/editor/scripts/finalize.jsp | 1 - .../static/clientlibs/sling-cms-editor/editor.css | 1 + .../jcr_root/static/clientlibs/sling-cms-editor/editor.js | 2 +- .../static/clientlibs/sling-cms-editor/loader.gif | Bin 0 -> 673 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp index 52cad1d..b26a9cc 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp @@ -26,7 +26,6 @@ <button class="Sling-CMS__modal-close Sling-CMS__edit-button">x</button> </div> <div class="Sling-CMS__modal-frame-container"> - <iframe class="Sling-CMS__modal-frame" src=""></iframe> </div> </div> </div> diff --git a/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css index 96cd99c..26ece0c 100644 --- a/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css +++ b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css @@ -85,6 +85,7 @@ overflow: hidden; padding-bottom: 56.25%; min-height: 500px; + background:url(./loader.gif) center center no-repeat; } .Sling-CMS__modal-frame-header { diff --git a/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.js b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.js index 599eb18..83a5813 100644 --- a/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.js +++ b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.js @@ -105,7 +105,7 @@ if(!window.CMSEditor){ mouseY = 0; $(".Sling-CMS__modal-frame-title").text(title); - $(".Sling-CMS__modal-box iframe").attr('src',url); + $('.Sling-CMS__modal-frame-container').html('<iframe class="Sling-CMS__modal-frame" src="'+url+'"></iframe>'); $(".Sling-CMS__modal-background").show(); $(".Sling-CMS__modal-box").show(); diff --git a/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/loader.gif b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/loader.gif new file mode 100644 index 0000000..d0bce15 Binary files /dev/null and b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/loader.gif differ
