Merge pull request #2801 from splitbrain/styling-js-opener

Cleanup styling cookie properly to exit preview
dokuwiki · Jun 19, 2019 · 0a68cd0 · 0a68cd0
2 parents 2634b98 + d344c07
commit 0a68cd0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
@@ -78,8 +78,8 @@ jQuery(function () {
     // reload the main page on close
     window.onunload = function(e) {
         if(doreload) {
-            window.opener.DokuCookie.setValue('styling_plugin', 0);
-            window.opener.document.location.reload();
+            DokuCookie.setValue('styling_plugin', 0);
+            if(window.opener) window.opener.document.location.reload();
         }
         return null;
     };
@@ -90,8 +90,8 @@ jQuery(function () {
     });
 
     // on first load apply preview
-    applyPreview(window.opener);
+    if(window.opener) applyPreview(window.opener);
 
     // enable the preview cookie
-    window.opener.DokuCookie.setValue('styling_plugin', 1);
+    DokuCookie.setValue('styling_plugin', 1);
 });