diff --git a/admin/js/pagedown.js b/admin/js/pagedown.js index 180c1d77..24c58e6a 100644 --- a/admin/js/pagedown.js +++ b/admin/js/pagedown.js @@ -1571,7 +1571,7 @@ else if (window.event) { window.event.returnValue = false; } - }else if(key.keyCode==9){ + }else if(key.keyCode==9 && window.fullScreenEntered){ var tab = {}; tab.textOp = bindCommand("doTab"); doClick(tab); @@ -2630,6 +2630,8 @@ else self.hooks.enterFakeFullScreen(); self.isFakeFullScreen = true; } + + window.fullScreenEntered = true; } else { if (self.isFakeFullScreen) { buttons.exitFullscreen.style.display = 'none'; @@ -2639,6 +2641,7 @@ else } self.isFakeFullScreen = false; + window.fullScreenEntered = false; } }; })(); diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php index 8fe5d1da..b58b238c 100644 --- a/var/Widget/Archive.php +++ b/var/Widget/Archive.php @@ -686,6 +686,20 @@ class Widget_Archive extends Widget_Abstract_Contents $this->pluginHandle()->indexHandle($this, $select); } + /** + * 默认的非首页归档处理 + * + * @access private + * @param Typecho_Db_Query $select 查询对象 + * @param boolean $hasPushed 是否已经压入队列 + * @return void + * @throws Typecho_Widget_Exception + */ + private function archiveEmptyHandle(Typecho_Db_Query $select, &$hasPushed) + { + throw new Typecho_Widget_Exception(_t('请求的地址不存在'), 404); + } + /** * 404页面处理 * @@ -1250,8 +1264,8 @@ class Widget_Archive extends Widget_Abstract_Contents $handles = array( 'index' => 'indexHandle', 'index_page' => 'indexHandle', - 'archive' => 'error404Handle', - 'archive_page' => 'error404Handle', + 'archive' => 'archiveEmptyHandle', + 'archive_page' => 'archiveEmptyHandle', 404 => 'error404Handle', 'single' => 'singleHandle', 'page' => 'singleHandle',