Merge pull request #5 from typecho/master

Fix notice not clear (typecho#1416)
penndu · Apr 27, 2022 · ad49202 · ad49202
2 parents 4a278b4 + f31e6da
commit ad49202
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/admin/common-js.php b/admin/common-js.php
@@ -13,7 +13,9 @@
                         noticeType  :   $.cookie(prefix + '__typecho_notice_type'),
                         highlight   :   $.cookie(prefix + '__typecho_notice_highlight')
                     },
-                    path = '<?php echo \Typecho\Cookie::getPath(); ?>';
+                    path = '<?php echo \Typecho\Cookie::getPath(); ?>',
+                    domain = '<?php echo \Typecho\Cookie::getDomain(); ?>',
+                    secure = <?php echo json_encode(\Typecho\Cookie::getSecure()); ?>;
 
                 if (!!cookies.notice && 'success|notice|error'.indexOf(cookies.noticeType) >= 0) {
                     var head = $('.typecho-head-nav'),
@@ -63,14 +65,13 @@ function checkScroll () {
                         });
                     });
 
-
-                    $.cookie(prefix + '__typecho_notice', null, {path : path});
-                    $.cookie(prefix + '__typecho_notice_type', null, {path : path});
+                    $.cookie(prefix + '__typecho_notice', null, {path : path, domain: domain, secure: secure});
+                    $.cookie(prefix + '__typecho_notice_type', null, {path : path, domain: domain, secure: secure});
                 }
 
                 if (cookies.highlight) {
                     $('#' + cookies.highlight).effect('highlight', 1000);
-                    $.cookie(prefix + '__typecho_notice_highlight', null, {path : path});
+                    $.cookie(prefix + '__typecho_notice_highlight', null, {path : path, domain: domain, secure: secure});
                 }
             })();
 

diff --git a/var/Typecho/Cookie.php b/var/Typecho/Cookie.php
@@ -85,6 +85,24 @@ public static function getPath(): string
         return self::$path;
     }
 
+    /**
+     * @access public
+     * @return string
+     */
+    public static function getDomain(): string
+    {
+        return self::$domain;
+    }
+
+    /**
+     * @access public
+     * @return bool
+     */
+    public static function getSecure(): bool
+    {
+        return self::$secure ?: false;
+    }
+
     /**
      * 设置额外的选项
      *