From 49cae68578ccaafad6b6d41dd672f78d5aa9a473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=81=E5=AE=81?= <magike.net@gmail.com>
Date: Mon, 20 Oct 2014 00:38:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=9C=A8=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E9=9D=9E=E5=85=A8=E5=B1=8F=E7=8A=B6=E6=80=81=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8tab=E6=8F=92=E5=85=A5=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BD=BF=E7=94=A8tab=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=BE=93=E5=85=A5=E8=81=9A=E7=84=A6=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E4=B8=80=E4=B8=AA=E8=B7=AF=E7=94=B1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/js/pagedown.js   |  5 ++++-
 var/Widget/Archive.php | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

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',