Changeset 3241:5ea4e5d537c8

Timestamp:

04/28/16 16:37:42 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.9

Message:

Fix mixed-content preview

File:

• admin/js/_post.js (modified) (1 diff)

admin/js/_post.js

@@ -54 +54 @@
      $preview_url = $('#post-preview').attr('href');
      if ($preview_url) {
-          if (window.location.protocol == 'http:' || $preview_url.substring(0,7) != 'http://') {
+
+          // Make $preview_url absolute
+          $a = document.createElement('a');
+          $a.href = $('#post-preview').attr('href');
+          $preview_url = $a.href;
+
+          // Check if admin and blog have same protocol (ie not mixed-content)
+          if (window.location.protocol == $preview_url.substring(0,window.location.protocol.length)) {
                // Open preview in a modal iframe
-               // ie (blog uri on admin uri): https on https, http on http, https on http
                $('#post-preview').modalWeb($(window).width()-40,$(window).height()-40);
-          }
-          else
-          {
+          } else {
                // Open preview on antother window
-               // ie (blog uri on admin uri): http on https
                $('#post-preview').click(function(e) {
                     e.preventDefault();