From 55cd5aad835f604583e30cfd2375358d08e08606 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 20 Jun 2014 14:08:49 +0100
Subject: [PATCH] Revert frame-writing stuff from #315, as it fails when the
 preview loads before the placeholder - see
 https://github.com/torchbox/wagtail/pull/315#issuecomment-46669595

---
 .../static/wagtailadmin/js/page-editor.js     | 19 +++++--------------
 .../templates/wagtailadmin/pages/preview.html |  1 -
 wagtail/wagtailadmin/urls.py                  |  1 -
 wagtail/wagtailadmin/views/pages.py           |  6 ------
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index eacb8f86d..03adb7aca 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -329,9 +329,9 @@ $(function() {
     });
 
     /* Set up behaviour of preview button */
-    $('.action-preview').click(function(e) {        
+    $('.action-preview').click(function(e) {
         e.preventDefault();
-        
+
         var previewWindow = window.open($(this).data('placeholder'), $(this).data('windowname'));
 
         $.ajax({
@@ -340,18 +340,9 @@ $(function() {
             data: $('#page-edit-form').serialize(),
             success: function(data, textStatus, request) {
                 if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
-                    var pdoc = previewWindow.document;
-                    var frame = pdoc.getElementById('preview-frame');
-
-                    frame = frame.contentWindow || frame.contentDocument.document || frame.contentDocument;
-                    frame.document.open();
-                    frame.document.write(data);                 
-                    frame.document.close();
-
-                    var hideTimeout = setTimeout(function(){
-                        pdoc.getElementById('loading-spinner-wrapper').className += 'remove';
-                        clearTimeout(hideTimeout);
-                    }, 50) // just enough to give effect without adding discernible slowness
+                    previewWindow.document.open();
+                    previewWindow.document.write(data);
+                    previewWindow.document.close();
                 } else {
                     previewWindow.close();
                     document.open();
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index d5c4b7a51..46a4d2867 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -11,6 +11,5 @@
         <div id="loading-spinner-wrapper">
             <div id="loading-spinner"></div>
         </div>
-        <iframe id="preview-frame" src="{% url 'wagtailadmin_pages_preview_loading' %}"></iframe>
     </body>
 </html>
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 21f127c1d..ee68f4655 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -50,7 +50,6 @@ urlpatterns += [
     url(r'^pages/(\d+)/edit/preview/$', pages.preview_on_edit, name='wagtailadmin_pages_preview_on_edit'),
 
     url(r'^pages/preview/$', pages.preview, name='wagtailadmin_pages_preview'),
-    url(r'^pages/preview_loading/$', pages.preview_loading, name='wagtailadmin_pages_preview_loading'),
 
     url(r'^pages/(\d+)/view_draft/$', pages.view_draft, name='wagtailadmin_pages_view_draft'),
     url(r'^pages/(\d+)/add_subpage/$', pages.add_subpage, name='wagtailadmin_pages_add_subpage'),
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index bfca64463..f215eb213 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -420,12 +420,6 @@ def preview(request):
     """
     return render(request, 'wagtailadmin/pages/preview.html')
 
-def preview_loading(request):
-    """
-    This page is blank, but must be real HTML so its DOM can be written to once the preview of the page has rendered
-    """
-    return HttpResponse("<html><head><title></title></head><body></body></html>")
-
 @permission_required('wagtailadmin.access_admin')
 def unpublish(request, page_id):
     page = get_object_or_404(Page, id=page_id)