Fix missing mysqli_connect_errno (#1346)

* Fix compatibility with PHP 8.1

PHP Deprecated:  htmlspecialchars(): Passing null to parameter #1 ($string) of type string is deprecated in typecho/var/Widget/Archive.php on line 1292

* Fix login

* Fix write

* Fix manage

* Fix PHP Deprecated

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_size = 2
+
+[*.scss]
+indent_size = 2
+
+[*.php]
+insert_final_newline = true

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,14 @@
+### 1. 该问题的重现步骤是什么？
+
+### 2. 你期待的结果是什么？实际看到的又是什么？
+
+### 3. 问题出现的环境
+
+- 操作系统版本：
+- Apache/NGINX 版本：
+- 数据库版本：
+- PHP 版本：
+- Typecho 版本：
+- 浏览器版本：
+
+[//]: # (如有图片请附上截图)

.github/workflows/Typecho-dev-Ci.yml

@@ -0,0 +1,64 @@
+name: Typecho Dev Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  php:
+    name: PHP ${{ matrix.php }} Tests
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'skip ci')"
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Setup PHP only
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+    - name: Test
+      run: |
+        find . -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )
+  build:
+    name: Typecho Build
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'skip ci') && github.event_name != 'pull_request'"
+    needs:
+        - php
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Build
+      run: |
+        mkdir build
+        cp -r LICENSE.txt index.php install.php admin install usr var build/
+        mkdir build/usr/uploads/
+        chmod 755 build/usr/uploads/
+        rm -rf build/admin/src
+        cd build && zip -q -r typecho.zip * && mv typecho.zip ../ && cd -
+    - name: Upload a Build Artifact
+      uses: WebFreak001/deploy-nightly@v1.1.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/typecho/typecho/releases/49532662/assets{?name,label}
+        release_id: 49532662
+        asset_path: ./typecho.zip
+        asset_name: typecho.zip
+        asset_content_type: application/zip
+        max_releases: 1
+    - name: Trigger build
+      run: |
+        curl -XPOST -H "Authorization: token ${{ secrets.WORKFLOW_TOKEN }}" \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Content-Type: application/json" \
+          https://api.github.com/repos/typecho/languages/actions/workflows/update.yml/dispatches --data '{"ref": "master"}'
+

.github/workflows/Typecho-release-Ci.yml

@@ -0,0 +1,39 @@
+name: Typecho Build Release Ci
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Build
+      run: |
+        mkdir build
+        cp -r LICENSE.txt index.php install.php admin install usr var build/
+        mkdir build/usr/uploads/
+        chmod 755 build/usr/uploads/
+        rm -rf build/admin/src
+        cd build && zip -q -r typecho.zip * && mv typecho.zip ../ && cd -
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: true
+          prerelease: false
+    - name: Upload Release Asset
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./typecho.zip
+          asset_name: typecho.zip
+          asset_content_type: application/zip

.gitignore

@@ -2,7 +2,6 @@
 .*.swo
 ._*
 .DS_Store
-/Debug/
 /ImgCache/
 /Backup_rar/
 /Debug/
@@ -18,9 +17,20 @@
 *.exp
 *.pdb
 *.rar
+*.mo
+*.po
+*.pot
 .smbdelete*
 *.sublime*
 .sass-cache
 config.rb
+prepros.config
 /config.inc.php
 /usr/uploads/
+/usr/*.db
+/usr/plugins/
+!/usr/plugins/HelloWorld
+/usr/themes/
+!/usr/themes/default
+node_modules/
+/tools/tmp/

.phpstorm.meta.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace PHPSTORM_META {
+    override(\Typecho\Widget::widget(0), map([
+        '' => '@'
+    ]));
+
+    exitPoint(\Typecho\Widget\Response::redirect());
+    exitPoint(\Typecho\Widget\Response::throwContent());
+    exitPoint(\Typecho\Widget\Response::throwFile());
+    exitPoint(\Typecho\Widget\Response::throwJson());
+    exitPoint(\Typecho\Widget\Response::throwXml());
+    exitPoint(\Typecho\Widget\Response::goBack());
+
+    override(\Widget\Options::__get(0), map([
+        'feedUrl'               =>  string,
+        'feedRssUrl'            =>  string,
+        'feedAtomUrl'           =>  string,
+        'commentsFeedUrl'       =>  string,
+        'commentsFeedRssUrl'    =>  string,
+        'commentsFeedAtomUrl'   =>  string,
+        'xmlRpcUrl'             =>  string,
+        'index'                 =>  string,
+        'siteUrl'               =>  string,
+        'routingTable'          =>  \ArrayObject::class,
+        'rootUrl'               =>  string,
+        'themeUrl'              =>  string,
+        'pluginUrl'             =>  string,
+        'adminUrl'              =>  string,
+        'loginUrl'              =>  string,
+        'loginAction'           =>  string,
+        'registerUrl'           =>  string,
+        'registerAction'        =>  string,
+        'profileUrl'            =>  string,
+        'logoutUrl'             =>  string,
+        'serverTimezone'        =>  int,
+        'contentType'           =>  string,
+        'software'              =>  string,
+        'version'               =>  string,
+        'markdown'              =>  int,
+        'allowedAttachmentTypes'=>  \ArrayObject::class
+    ]));
+
+    override(\Typecho\Widget::__get(0), map([
+        'sequence' => int,
+        'length'   => int
+    ]));
+}

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+admin@typecho.org.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.md

@@ -0,0 +1,19 @@
+Typecho Blogging Platform
+=========================
+
+Typecho is a PHP Blogging Platform. Simple and Powerful.
+
+#### Telegram Channel
+https://t.me/typechodev
+
+#### Homepage
+http://typecho.org/
+
+#### Documents
+http://docs.typecho.org/
+
+#### Community
+http://forum.typecho.org/
+
+#### Download
+http://typecho.org/download

admin/backup.php

@@ -0,0 +1,106 @@
+<?php
+include 'common.php';
+include 'header.php';
+include 'menu.php';
+
+$actionUrl = $security->getTokenUrl(
+    \Typecho\Router::url('do', array('action' => 'backup', 'widget' => 'Backup'),
+        \Typecho\Common::url('index.php', $options->rootUrl)));
+
+$backupFiles = \Widget\Backup::alloc()->listFiles();
+?>
+
+<div class="main">
+    <div class="body container">
+        <?php include 'page-title.php'; ?>
+        <div class="row typecho-page-main" role="main">
+            <div class="col-mb-12 col-tb-8">
+                <div id="typecho-welcome">
+                    <form action="<?php echo $actionUrl; ?>" method="post">
+                    <h3><?php _e('备份您的数据'); ?></h3>
+                    <ul>
+                        <li><?php _e('此备份操作仅包含<strong>内容数据</strong>, 并不会涉及任何<strong>设置信息</strong>'); ?></li>
+                        <li><?php _e('如果您的数据量过大, 为了避免操作超时, 建议您直接使用数据库提供的备份工具备份数据'); ?></li>
+                        <li><strong class="warning"><?php _e('为了缩小备份文件体积, 建议您在备份前删除不必要的数据'); ?></strong></li>
+                    </ul>
+                    <p><button class="btn primary" type="submit"><?php _e('开始备份 &raquo;'); ?></button></p>
+                        <input tabindex="1" type="hidden" name="do" value="export">
+                    </form>
+                </div>
+            </div>
+
+            <div id="backup-secondary" class="col-mb-12 col-tb-4" role="form">
+                <h3><?php _e('恢复数据'); ?></h3>
+                <ul class="typecho-option-tabs clearfix">
+                    <li class="active w-50"><a href="#from-upload"><?php _e('上传'); ?></a></li>
+                    <li class="w-50"><a href="#from-server"><?php _e('从服务器'); ?></a></li>
+                </ul>
+
+                <form action="<?php echo $actionUrl; ?>" id="from-upload" class="tab-content" method="post" enctype="multipart/form-data">
+                    <ul class="typecho-option">
+                        <li>
+                            <input tabindex="2" id="backup-upload-file" name="file" type="file" class="file">
+                        </li>
+                    </ul>
+                    <ul class="typecho-option typecho-option-submit">
+                        <li>
+                            <button tabindex="4" type="submit" class="btn primary"><?php _e('上传并恢复 &raquo;'); ?></button>
+                            <input type="hidden" name="do" value="import">
+                        </li>
+                    </ul>
+                </form>
+
+                <form action="<?php echo $actionUrl; ?>" id="from-server" class="tab-content hidden" method="post">
+                    <?php if (empty($backupFiles)): ?>
+                    <ul class="typecho-option">
+                        <li>
+                            <p class="description"><?php _e('将备份文件手动上传至服务器的 %s 目录下后, 这里会出现文件选项', __TYPECHO_BACKUP_DIR__); ?></p>
+                        </li>
+                    </ul>
+                    <?php else: ?>
+                    <ul class="typecho-option">
+                        <li>
+                            <label class="typecho-label" for="backup-select-file"><?php _e('选择一个备份文件恢复数据'); ?></label>
+                            <select tabindex="5" name="file" id="backup-select-file">
+                                <?php foreach ($backupFiles as $file): ?>
+                                    <option value="<?php echo $file; ?>"><?php echo $file; ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </li>
+                    </ul>
+                    <?php endif; ?>
+                    <ul class="typecho-option typecho-option-submit">
+                        <li>
+                            <button tabindex="7" type="submit" class="btn primary"><?php _e('选择并恢复 &raquo;'); ?></button>
+                            <input type="hidden" name="do" value="import">
+                        </li>
+                    </ul>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+<?php
+include 'copyright.php';
+include 'common-js.php';
+?>
+<script>
+    $('#backup-secondary .typecho-option-tabs li').click(function() {
+        $('#backup-secondary .typecho-option-tabs li').removeClass('active');
+        $(this).addClass('active');
+        $(this).parents('#backup-secondary').find('.tab-content').addClass('hidden');
+
+        var selected_tab = $(this).find('a').attr('href');
+        $(selected_tab).removeClass('hidden');
+
+        return false;
+    });
+
+    $('#backup-secondary form').submit(function (e) {
+        if (!confirm('<?php _e('恢复操作将清除所有现有数据, 是否继续?'); ?>')) {
+            return false;
+        }
+    });
+</script>
+<?php include 'footer.php'; ?>

admin/category.php

@@ -0,0 +1,23 @@
+<?php
+include 'common.php';
+include 'header.php';
+include 'menu.php';
+?>
+
+<div class="main">
+    <div class="body container">
+        <?php include 'page-title.php'; ?>
+        <div class="row typecho-page-main" role="form">
+            <div class="col-mb-12 col-tb-6 col-tb-offset-3">
+                <?php \Widget\Metas\Category\Edit::alloc()->form()->render(); ?>
+            </div>
+        </div>
+    </div>
+</div>
+
+<?php
+include 'copyright.php';
+include 'common-js.php';
+include 'form-js.php';
+include 'footer.php';
+?>

admin/common-js.php

@@ -1,20 +1,19 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<script src="<?php $options->adminUrl('js/jquery.js?v=' . $suffixVersion); ?>"></script> 
-<script src="<?php $options->adminUrl('js/jquery-ui.js?v=' . $suffixVersion); ?>"></script> 
-<script src="<?php $options->adminUrl('js/typecho.js?v=' . $suffixVersion); ?>"></script>
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
+<script src="<?php $options->adminStaticUrl('js', 'jquery.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'jquery-ui.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'typecho.js'); ?>"></script>
 <script>
     (function () {
         $(document).ready(function() {
             // 处理消息机制
             (function () {
-                var prefix = '<?php echo Typecho_Cookie::getPrefix(); ?>',
+                var prefix = '<?php echo \Typecho\Cookie::getPrefix(); ?>',
                     cookies = {
                         notice      :   $.cookie(prefix + '__typecho_notice'),
                         noticeType  :   $.cookie(prefix + '__typecho_notice_type'),
                         highlight   :   $.cookie(prefix + '__typecho_notice_highlight')
                     },
-                    path = '<?php $parts = parse_url($options->siteUrl);
-                        echo empty($parts['path']) ? '/' : $parts['path']; ?>';
+                    path = '<?php echo \Typecho\Cookie::getPath(); ?>';
 
                 if (!!cookies.notice && 'success|notice|error'.indexOf(cookies.noticeType) >= 0) {
                     var head = $('.typecho-head-nav'),
@@ -59,7 +58,7 @@
                         }
 
                         t.effect('highlight', {color : color})
-                            .delay(5000).slideUp(function () {
+                            .delay(5000).fadeOut(function () {
                             $(this).remove();
                         });
                     });
@@ -75,19 +74,54 @@
                 }
             })();
 
+
+            // 导航菜单 tab 聚焦时展开下拉菜单
+            const menuBar = $('.menu-bar').click(function () {
+                const nav = $(this).next('#typecho-nav-list');
+                if (!$(this).toggleClass('focus').hasClass('focus')) {
+                    nav.removeClass('expanded noexpanded');
+                }
+            });
+
+            $('.main, .typecho-foot').on('click touchstart', function () {
+                if (menuBar.hasClass('focus')) {
+                    menuBar.trigger('click');
+                }
+            });
+
+            $('#typecho-nav-list ul.root').each(function () {
+                const ul = $(this), nav = ul.parent();
+
+                ul.on('click touchend', '.parent a', function (e) {
+                    nav.removeClass('noexpanded').addClass('expanded');
+                    if ($(window).width() < 576 && e.type == 'click') {
+                        return false;
+                    }
+                }).find('.child')
+                .append($('<li class="return"><a><?php _e('返回'); ?></a></li>').click(function () {
+                    nav.removeClass('expanded').addClass('noexpanded');
+                    return false;
+                }));
+            });
+
             if ($('.typecho-login').length == 0) {
                 $('a').each(function () {
                     var t = $(this), href = t.attr('href');
 
-                    if ((href.length > 1 && href[0] == '#')
+                    if ((href && href[0] == '#')
                         || /^<?php echo preg_quote($options->adminUrl, '/'); ?>.*$/.exec(href) 
-                            || /^<?php echo substr(preg_quote(Typecho_Common::url('s', $options->index), '/'), 0, -1); ?>action\/[_a-zA-Z0-9\/]+.*$/.exec(href)) {
+                            || /^<?php echo substr(preg_quote(\Typecho\Common::url('s', $options->index), '/'), 0, -1); ?>action\/[_a-zA-Z0-9\/]+.*$/.exec(href)) {
                         return;
                     }
 
-                    t.attr('target', '_blank');
+                    t.attr('target', '_blank')
+                        .attr('rel', 'noopener noreferrer');
                 });
             }
+
+            $('.main form').submit(function () {
+                $('button[type=submit]', this).attr('disabled', 'disabled');
+            });
         });
     })();
 </script>

admin/common.php

@@ -3,21 +3,24 @@ if (!defined('__DIR__')) {
     define('__DIR__', dirname(__FILE__));
 }
 
+define('__TYPECHO_ADMIN__', true);
+
 /** 载入配置文件 */
-if (!@include_once __DIR__ . '/../config.inc.php') {
+if (!defined('__TYPECHO_ROOT_DIR__') && !@include_once __DIR__ . '/../config.inc.php') {
     file_exists(__DIR__ . '/../install.php') ? header('Location: ../install.php') : print('Missing Config File');
     exit;
 }
 
 /** 初始化组件 */
-Typecho_Widget::widget('Widget_Init');
+\Widget\Init::alloc();
 
 /** 注册一个初始化插件 */
-Typecho_Plugin::factory('admin/common.php')->begin();
+\Typecho\Plugin::factory('admin/common.php')->begin();
 
-Typecho_Widget::widget('Widget_Options')->to($options);
-Typecho_Widget::widget('Widget_User')->to($user);
-Typecho_Widget::widget('Widget_Menu')->to($menu);
+\Widget\Options::alloc()->to($options);
+\Widget\User::alloc()->to($user);
+\Widget\Security::alloc()->to($security);
+\Widget\Menu::alloc()->to($menu);
 
 /** 初始化上下文 */
 $request = $options->request;
@@ -25,32 +28,27 @@ $response = $options->response;
 
 /** 检测是否是第一次登录 */
 $currentMenu = $menu->getCurrentMenu();
-list($prefixVersion, $suffixVersion) = explode('/', $options->version);
-$params = parse_url($currentMenu[2]);
-$adminFile = basename($params['path']);
 
-if (!$user->logged && !Typecho_Cookie::get('__typecho_first_run') && !empty($currentMenu)) {
-    
-    if ('welcome.php' != $adminFile) {
-        $response->redirect(Typecho_Common::url('welcome.php', $options->adminUrl));
-    } else {
-        Typecho_Cookie::set('__typecho_first_run', 1);
-    }
-    
-} else {
+if (!empty($currentMenu)) {
+    $params = parse_url($currentMenu[2]);
+    $adminFile = basename($params['path']);
 
-    /** 检测版本是否升级 */
-    if ($user->pass('administrator', true) && !empty($currentMenu)) {
-        $mustUpgrade = (!defined('Typecho_Common::VERSION') || version_compare(str_replace('/', '.', Typecho_Common::VERSION),
-        str_replace('/', '.', $options->version), '>'));
+    if (!$user->logged && !\Typecho\Cookie::get('__typecho_first_run')) {
+        if ('welcome.php' != $adminFile) {
+            $response->redirect(\Typecho\Common::url('welcome.php', $options->adminUrl));
+        } else {
+            \Typecho\Cookie::set('__typecho_first_run', 1);
+        }
+    } elseif ($user->pass('administrator', true)) {
+        /** 检测版本是否升级 */
+        $mustUpgrade = version_compare(\Typecho\Common::VERSION, $options->version, '>');
 
-        if ($mustUpgrade && 'upgrade.php' != $adminFile) {
-            $response->redirect(Typecho_Common::url('upgrade.php', $options->adminUrl));
-        } else if (!$mustUpgrade && 'upgrade.php' == $adminFile) {
+        if ($mustUpgrade && 'upgrade.php' != $adminFile && 'backup.php' != $adminFile) {
+            $response->redirect(\Typecho\Common::url('upgrade.php', $options->adminUrl));
+        } elseif (!$mustUpgrade && 'upgrade.php' == $adminFile) {
             $response->redirect($options->adminUrl);
-        } else if (!$mustUpgrade && 'welcome.php' == $adminFile && $user->logged) {
+        } elseif (!$mustUpgrade && 'welcome.php' == $adminFile && $user->logged) {
             $response->redirect($options->adminUrl);
         }
     }
-
 }

admin/copyright.php

@@ -1,12 +1,13 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
 <div class="typecho-foot" role="contentinfo">
     <div class="copyright">
-        <?php _e('由 <a href="http://typecho.org">%s</a> 强力驱动, 版本 %s (%s)', $options->software, $prefixVersion, $suffixVersion); ?>
+        <a href="http://typecho.org" class="i-logo-s">Typecho</a>
+        <p><?php _e('由 <a href="http://typecho.org">%s</a> 强力驱动, 版本 %s', $options->software, $options->version); ?></p>
     </div>
     <nav class="resource">
         <a href="http://docs.typecho.org"><?php _e('帮助文档'); ?></a> &bull;
         <a href="http://forum.typecho.org"><?php _e('支持论坛'); ?></a> &bull;
         <a href="https://github.com/typecho/typecho/issues"><?php _e('报告错误'); ?></a> &bull;
-        <a href="http://extends.typecho.org"><?php _e('资源下载'); ?></a>
+        <a href="http://typecho.org/download"><?php _e('资源下载'); ?></a>
     </nav>
 </div>

admin/css/grid.css

@@ -1,563 +1,211 @@
-/*
- * Bento Grid System
- * Source: https://github.com/fenbox/bento
- * Version: 1.2.7
- * Update: 2013.11.15
- */
-.colgroup [class*="col-"] {
-  float: left;
-  min-height: 1px;
-  padding-right: 10px;
-  padding-left: 10px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box; }
-
-.colgroup [class*="push-"],
-.colgroup [class*="pull-"] {
-  position: relative; }
-
-/*
- * Mobile and up
- */
-.col-mb-1 {
-  width: 8.33333%; }
-
-.col-mb-2 {
-  width: 16.66667%; }
-
-.col-mb-3 {
-  width: 25%; }
-
-.col-mb-4 {
-  width: 33.33333%; }
-
-.col-mb-5 {
-  width: 41.66667%; }
-
-.col-mb-6 {
-  width: 50%; }
-
-.col-mb-7 {
-  width: 58.33333%; }
-
-.col-mb-8 {
-  width: 66.66667%; }
-
-.col-mb-9 {
-  width: 75%; }
-
-.col-mb-10 {
-  width: 83.33333%; }
-
-.col-mb-11 {
-  width: 91.66667%; }
-
-.col-mb-12 {
-  width: 100%; }
-
-/*
- * Tablet and up
- */
-@media (min-width: 768px) {
-  .container {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: 728px; }
-
-  .col-tb-1 {
-    width: 8.33333%; }
-
-  .col-tb-2 {
-    width: 16.66667%; }
-
-  .col-tb-3 {
-    width: 25%; }
-
-  .col-tb-4 {
-    width: 33.33333%; }
-
-  .col-tb-5 {
-    width: 41.66667%; }
-
-  .col-tb-6 {
-    width: 50%; }
-
-  .col-tb-7 {
-    width: 58.33333%; }
-
-  .col-tb-8 {
-    width: 66.66667%; }
-
-  .col-tb-9 {
-    width: 75%; }
-
-  .col-tb-10 {
-    width: 83.33333%; }
-
-  .col-tb-11 {
-    width: 91.66667%; }
-
-  .col-tb-12 {
-    width: 100%; }
-
-  .col-tb-offset-0 {
-    margin-left: 0%; }
-
-  .col-tb-offset-1 {
-    margin-left: 8.33333%; }
-
-  .col-tb-offset-2 {
-    margin-left: 16.66667%; }
-
-  .col-tb-offset-3 {
-    margin-left: 25%; }
-
-  .col-tb-offset-4 {
-    margin-left: 33.33333%; }
-
-  .col-tb-offset-5 {
-    margin-left: 41.66667%; }
-
-  .col-tb-offset-6 {
-    margin-left: 50%; }
-
-  .col-tb-offset-7 {
-    margin-left: 58.33333%; }
-
-  .col-tb-offset-8 {
-    margin-left: 66.66667%; }
-
-  .col-tb-offset-9 {
-    margin-left: 75%; }
-
-  .col-tb-offset-10 {
-    margin-left: 83.33333%; }
-
-  .col-tb-offset-11 {
-    margin-left: 91.66667%; }
-
-  .col-tb-offset-12 {
-    margin-left: 100%; }
-
-  .col-tb-pull-0 {
-    right: 0%; }
-
-  .col-tb-pull-1 {
-    right: 8.33333%; }
-
-  .col-tb-pull-2 {
-    right: 16.66667%; }
-
-  .col-tb-pull-3 {
-    right: 25%; }
-
-  .col-tb-pull-4 {
-    right: 33.33333%; }
-
-  .col-tb-pull-5 {
-    right: 41.66667%; }
-
-  .col-tb-pull-6 {
-    right: 50%; }
-
-  .col-tb-pull-7 {
-    right: 58.33333%; }
-
-  .col-tb-pull-8 {
-    right: 66.66667%; }
-
-  .col-tb-pull-9 {
-    right: 75%; }
-
-  .col-tb-pull-10 {
-    right: 83.33333%; }
-
-  .col-tb-pull-11 {
-    right: 91.66667%; }
-
-  .col-tb-pull-12 {
-    right: 100%; }
-
-  .col-tb-push-0 {
-    left: 0%; }
-
-  .col-tb-push-1 {
-    left: 8.33333%; }
-
-  .col-tb-push-2 {
-    left: 16.66667%; }
-
-  .col-tb-push-3 {
-    left: 25%; }
-
-  .col-tb-push-4 {
-    left: 33.33333%; }
-
-  .col-tb-push-5 {
-    left: 41.66667%; }
-
-  .col-tb-push-6 {
-    left: 50%; }
-
-  .col-tb-push-7 {
-    left: 58.33333%; }
-
-  .col-tb-push-8 {
-    left: 66.66667%; }
-
-  .col-tb-push-9 {
-    left: 75%; }
-
-  .col-tb-push-10 {
-    left: 83.33333%; }
-
-  .col-tb-push-11 {
-    left: 91.66667%; }
-
-  .col-tb-push-12 {
-    left: 100%; }
-
-  .colgroup {
-    margin-right: -10px;
-    margin-left: -10px; } }
-/*
- * Desktop and up
- */
-@media (min-width: 992px) {
-  .container {
-    max-width: 952px; }
-
-  .col-1 {
-    width: 8.33333%; }
-
-  .col-2 {
-    width: 16.66667%; }
-
-  .col-3 {
-    width: 25%; }
-
-  .col-4 {
-    width: 33.33333%; }
-
-  .col-5 {
-    width: 41.66667%; }
-
-  .col-6 {
-    width: 50%; }
-
-  .col-7 {
-    width: 58.33333%; }
-
-  .col-8 {
-    width: 66.66667%; }
-
-  .col-9 {
-    width: 75%; }
-
-  .col-10 {
-    width: 83.33333%; }
-
-  .col-11 {
-    width: 91.66667%; }
-
-  .col-12 {
-    width: 100%; }
-
-  .col-offset-0 {
-    margin-left: 0%; }
-
-  .col-offset-1 {
-    margin-left: 8.33333%; }
-
-  .col-offset-2 {
-    margin-left: 16.66667%; }
-
-  .col-offset-3 {
-    margin-left: 25%; }
-
-  .col-offset-4 {
-    margin-left: 33.33333%; }
-
-  .col-offset-5 {
-    margin-left: 41.66667%; }
-
-  .col-offset-6 {
-    margin-left: 50%; }
-
-  .col-offset-7 {
-    margin-left: 58.33333%; }
-
-  .col-offset-8 {
-    margin-left: 66.66667%; }
-
-  .col-offset-9 {
-    margin-left: 75%; }
-
-  .col-offset-10 {
-    margin-left: 83.33333%; }
-
-  .col-offset-11 {
-    margin-left: 91.66667%; }
-
-  .col-offset-12 {
-    margin-left: 100%; }
-
-  .col-pull-0 {
-    right: 0%; }
-
-  .col-pull-1 {
-    right: 8.33333%; }
-
-  .col-pull-2 {
-    right: 16.66667%; }
-
-  .col-pull-3 {
-    right: 25%; }
-
-  .col-pull-4 {
-    right: 33.33333%; }
-
-  .col-pull-5 {
-    right: 41.66667%; }
-
-  .col-pull-6 {
-    right: 50%; }
-
-  .col-pull-7 {
-    right: 58.33333%; }
-
-  .col-pull-8 {
-    right: 66.66667%; }
-
-  .col-pull-9 {
-    right: 75%; }
-
-  .col-pull-10 {
-    right: 83.33333%; }
-
-  .col-pull-11 {
-    right: 91.66667%; }
-
-  .col-pull-12 {
-    right: 100%; }
-
-  .col-push-0 {
-    left: 0%; }
-
-  .col-push-1 {
-    left: 8.33333%; }
-
-  .col-push-2 {
-    left: 16.66667%; }
-
-  .col-push-3 {
-    left: 25%; }
-
-  .col-push-4 {
-    left: 33.33333%; }
-
-  .col-push-5 {
-    left: 41.66667%; }
-
-  .col-push-6 {
-    left: 50%; }
-
-  .col-push-7 {
-    left: 58.33333%; }
-
-  .col-push-8 {
-    left: 66.66667%; }
-
-  .col-push-9 {
-    left: 75%; }
-
-  .col-push-10 {
-    left: 83.33333%; }
-
-  .col-push-11 {
-    left: 91.66667%; }
-
-  .col-push-12 {
-    left: 100%; } }
-/*
- * Widescreen and up
- */
-@media (min-width: 1200px) {
-  .container {
-    max-width: 1160px; }
-
-  .col-wd-1 {
-    width: 8.33333%; }
-
-  .col-wd-2 {
-    width: 16.66667%; }
-
-  .col-wd-3 {
-    width: 25%; }
-
-  .col-wd-4 {
-    width: 33.33333%; }
-
-  .col-wd-5 {
-    width: 41.66667%; }
-
-  .col-wd-6 {
-    width: 50%; }
-
-  .col-wd-7 {
-    width: 58.33333%; }
-
-  .col-wd-8 {
-    width: 66.66667%; }
-
-  .col-wd-9 {
-    width: 75%; }
-
-  .col-wd-10 {
-    width: 83.33333%; }
-
-  .col-wd-11 {
-    width: 91.66667%; }
-
-  .col-wd-12 {
-    width: 100%; }
-
-  .col-wd-offset-0 {
-    margin-left: 0%; }
-
-  .col-wd-offset-1 {
-    margin-left: 8.33333%; }
-
-  .col-wd-offset-2 {
-    margin-left: 16.66667%; }
-
-  .col-wd-offset-3 {
-    margin-left: 25%; }
-
-  .col-wd-offset-4 {
-    margin-left: 33.33333%; }
-
-  .col-wd-offset-5 {
-    margin-left: 41.66667%; }
-
-  .col-wd-offset-6 {
-    margin-left: 50%; }
-
-  .col-wd-offset-7 {
-    margin-left: 58.33333%; }
-
-  .col-wd-offset-8 {
-    margin-left: 66.66667%; }
-
-  .col-wd-offset-9 {
-    margin-left: 75%; }
-
-  .col-wd-offset-10 {
-    margin-left: 83.33333%; }
-
-  .col-wd-offset-11 {
-    margin-left: 91.66667%; }
-
-  .col-wd-offset-12 {
-    margin-left: 100%; }
-
-  .col-wd-pull-0 {
-    right: 0%; }
-
-  .col-wd-pull-1 {
-    right: 8.33333%; }
-
-  .col-wd-pull-2 {
-    right: 16.66667%; }
-
-  .col-wd-pull-3 {
-    right: 25%; }
-
-  .col-wd-pull-4 {
-    right: 33.33333%; }
-
-  .col-wd-pull-5 {
-    right: 41.66667%; }
-
-  .col-wd-pull-6 {
-    right: 50%; }
-
-  .col-wd-pull-7 {
-    right: 58.33333%; }
-
-  .col-wd-pull-8 {
-    right: 66.66667%; }
-
-  .col-wd-pull-9 {
-    right: 75%; }
-
-  .col-wd-pull-10 {
-    right: 83.33333%; }
-
-  .col-wd-pull-11 {
-    right: 91.66667%; }
-
-  .col-wd-pull-12 {
-    right: 100%; }
-
-  .col-wd-push-0 {
-    left: 0%; }
-
-  .col-wd-push-1 {
-    left: 8.33333%; }
-
-  .col-wd-push-2 {
-    left: 16.66667%; }
-
-  .col-wd-push-3 {
-    left: 25%; }
-
-  .col-wd-push-4 {
-    left: 33.33333%; }
-
-  .col-wd-push-5 {
-    left: 41.66667%; }
-
-  .col-wd-push-6 {
-    left: 50%; }
-
-  .col-wd-push-7 {
-    left: 58.33333%; }
-
-  .col-wd-push-8 {
-    left: 66.66667%; }
-
-  .col-wd-push-9 {
-    left: 75%; }
-
-  .col-wd-push-10 {
-    left: 83.33333%; }
-
-  .col-wd-push-11 {
-    left: 91.66667%; }
-
-  .col-wd-push-12 {
-    left: 100%; } }
-/*
- * Responsive kit
- */
-@media (max-width: 767px) {
-  .kit-hidden-mb {
-    display: none; } }
-@media (max-width: 991px) {
-  .kit-hidden-tb {
-    display: none; } }
-@media (max-width: 1199px) {
-  .kit-hidden {
-    display: none; } }
-/*
- * Clearfix
- */
-.clearfix, .colgroup {
-  zoom: 1; }
-  .clearfix:before, .colgroup:before, .clearfix:after, .colgroup:after {
-    content: " ";
-    display: table; }
-  .clearfix:after, .colgroup:after {
-    clear: both; }
+/* Bento Grid System Source: https://github.com/fenbox/bento Version: 1.2.8 Update: 2013.11.25 */
+.container, .row [class*="col-"] { box-sizing: border-box; }
+
+.container { margin-left: auto; margin-right: auto; padding-left: 10px; padding-right: 10px; }
+
+.row { margin-right: -10px; margin-left: -10px; }
+
+.row [class*="col-"] { float: left; min-height: 1px; padding-right: 10px; padding-left: 10px; }
+
+.row [class*="-push-"], .row [class*="-pull-"] { position: relative; }
+
+/* Mobile and up */
+.col-mb-1 { width: 8.33333%; }
+
+.col-mb-2 { width: 16.66667%; }
+
+.col-mb-3 { width: 25%; }
+
+.col-mb-4 { width: 33.33333%; }
+
+.col-mb-5 { width: 41.66667%; }
+
+.col-mb-6 { width: 50%; }
+
+.col-mb-7 { width: 58.33333%; }
+
+.col-mb-8 { width: 66.66667%; }
+
+.col-mb-9 { width: 75%; }
+
+.col-mb-10 { width: 83.33333%; }
+
+.col-mb-11 { width: 91.66667%; }
+
+.col-mb-12 { width: 100%; }
+
+/* Tablet and up */
+@media (min-width: 768px) { .container { max-width: 728px; }
+  .col-tb-1 { width: 8.33333%; }
+  .col-tb-2 { width: 16.66667%; }
+  .col-tb-3 { width: 25%; }
+  .col-tb-4 { width: 33.33333%; }
+  .col-tb-5 { width: 41.66667%; }
+  .col-tb-6 { width: 50%; }
+  .col-tb-7 { width: 58.33333%; }
+  .col-tb-8 { width: 66.66667%; }
+  .col-tb-9 { width: 75%; }
+  .col-tb-10 { width: 83.33333%; }
+  .col-tb-11 { width: 91.66667%; }
+  .col-tb-12 { width: 100%; }
+  .col-tb-offset-0 { margin-left: 0%; }
+  .col-tb-offset-1 { margin-left: 8.33333%; }
+  .col-tb-offset-2 { margin-left: 16.66667%; }
+  .col-tb-offset-3 { margin-left: 25%; }
+  .col-tb-offset-4 { margin-left: 33.33333%; }
+  .col-tb-offset-5 { margin-left: 41.66667%; }
+  .col-tb-offset-6 { margin-left: 50%; }
+  .col-tb-offset-7 { margin-left: 58.33333%; }
+  .col-tb-offset-8 { margin-left: 66.66667%; }
+  .col-tb-offset-9 { margin-left: 75%; }
+  .col-tb-offset-10 { margin-left: 83.33333%; }
+  .col-tb-offset-11 { margin-left: 91.66667%; }
+  .col-tb-offset-12 { margin-left: 100%; }
+  .col-tb-pull-0 { right: 0%; }
+  .col-tb-pull-1 { right: 8.33333%; }
+  .col-tb-pull-2 { right: 16.66667%; }
+  .col-tb-pull-3 { right: 25%; }
+  .col-tb-pull-4 { right: 33.33333%; }
+  .col-tb-pull-5 { right: 41.66667%; }
+  .col-tb-pull-6 { right: 50%; }
+  .col-tb-pull-7 { right: 58.33333%; }
+  .col-tb-pull-8 { right: 66.66667%; }
+  .col-tb-pull-9 { right: 75%; }
+  .col-tb-pull-10 { right: 83.33333%; }
+  .col-tb-pull-11 { right: 91.66667%; }
+  .col-tb-pull-12 { right: 100%; }
+  .col-tb-push-0 { left: 0%; }
+  .col-tb-push-1 { left: 8.33333%; }
+  .col-tb-push-2 { left: 16.66667%; }
+  .col-tb-push-3 { left: 25%; }
+  .col-tb-push-4 { left: 33.33333%; }
+  .col-tb-push-5 { left: 41.66667%; }
+  .col-tb-push-6 { left: 50%; }
+  .col-tb-push-7 { left: 58.33333%; }
+  .col-tb-push-8 { left: 66.66667%; }
+  .col-tb-push-9 { left: 75%; }
+  .col-tb-push-10 { left: 83.33333%; }
+  .col-tb-push-11 { left: 91.66667%; }
+  .col-tb-push-12 { left: 100%; } }
+
+/* Desktop and up */
+@media (min-width: 992px) { .container { max-width: 952px; }
+  .col-1 { width: 8.33333%; }
+  .col-2 { width: 16.66667%; }
+  .col-3 { width: 25%; }
+  .col-4 { width: 33.33333%; }
+  .col-5 { width: 41.66667%; }
+  .col-6 { width: 50%; }
+  .col-7 { width: 58.33333%; }
+  .col-8 { width: 66.66667%; }
+  .col-9 { width: 75%; }
+  .col-10 { width: 83.33333%; }
+  .col-11 { width: 91.66667%; }
+  .col-12 { width: 100%; }
+  .col-offset-0 { margin-left: 0%; }
+  .col-offset-1 { margin-left: 8.33333%; }
+  .col-offset-2 { margin-left: 16.66667%; }
+  .col-offset-3 { margin-left: 25%; }
+  .col-offset-4 { margin-left: 33.33333%; }
+  .col-offset-5 { margin-left: 41.66667%; }
+  .col-offset-6 { margin-left: 50%; }
+  .col-offset-7 { margin-left: 58.33333%; }
+  .col-offset-8 { margin-left: 66.66667%; }
+  .col-offset-9 { margin-left: 75%; }
+  .col-offset-10 { margin-left: 83.33333%; }
+  .col-offset-11 { margin-left: 91.66667%; }
+  .col-offset-12 { margin-left: 100%; }
+  .col-pull-0 { right: 0%; }
+  .col-pull-1 { right: 8.33333%; }
+  .col-pull-2 { right: 16.66667%; }
+  .col-pull-3 { right: 25%; }
+  .col-pull-4 { right: 33.33333%; }
+  .col-pull-5 { right: 41.66667%; }
+  .col-pull-6 { right: 50%; }
+  .col-pull-7 { right: 58.33333%; }
+  .col-pull-8 { right: 66.66667%; }
+  .col-pull-9 { right: 75%; }
+  .col-pull-10 { right: 83.33333%; }
+  .col-pull-11 { right: 91.66667%; }
+  .col-pull-12 { right: 100%; }
+  .col-push-0 { left: 0%; }
+  .col-push-1 { left: 8.33333%; }
+  .col-push-2 { left: 16.66667%; }
+  .col-push-3 { left: 25%; }
+  .col-push-4 { left: 33.33333%; }
+  .col-push-5 { left: 41.66667%; }
+  .col-push-6 { left: 50%; }
+  .col-push-7 { left: 58.33333%; }
+  .col-push-8 { left: 66.66667%; }
+  .col-push-9 { left: 75%; }
+  .col-push-10 { left: 83.33333%; }
+  .col-push-11 { left: 91.66667%; }
+  .col-push-12 { left: 100%; } }
+
+/* Widescreen and up */
+@media (min-width: 1200px) { .container { max-width: 1160px; }
+  .col-wd-1 { width: 8.33333%; }
+  .col-wd-2 { width: 16.66667%; }
+  .col-wd-3 { width: 25%; }
+  .col-wd-4 { width: 33.33333%; }
+  .col-wd-5 { width: 41.66667%; }
+  .col-wd-6 { width: 50%; }
+  .col-wd-7 { width: 58.33333%; }
+  .col-wd-8 { width: 66.66667%; }
+  .col-wd-9 { width: 75%; }
+  .col-wd-10 { width: 83.33333%; }
+  .col-wd-11 { width: 91.66667%; }
+  .col-wd-12 { width: 100%; }
+  .col-wd-offset-0 { margin-left: 0%; }
+  .col-wd-offset-1 { margin-left: 8.33333%; }
+  .col-wd-offset-2 { margin-left: 16.66667%; }
+  .col-wd-offset-3 { margin-left: 25%; }
+  .col-wd-offset-4 { margin-left: 33.33333%; }
+  .col-wd-offset-5 { margin-left: 41.66667%; }
+  .col-wd-offset-6 { margin-left: 50%; }
+  .col-wd-offset-7 { margin-left: 58.33333%; }
+  .col-wd-offset-8 { margin-left: 66.66667%; }
+  .col-wd-offset-9 { margin-left: 75%; }
+  .col-wd-offset-10 { margin-left: 83.33333%; }
+  .col-wd-offset-11 { margin-left: 91.66667%; }
+  .col-wd-offset-12 { margin-left: 100%; }
+  .col-wd-pull-0 { right: 0%; }
+  .col-wd-pull-1 { right: 8.33333%; }
+  .col-wd-pull-2 { right: 16.66667%; }
+  .col-wd-pull-3 { right: 25%; }
+  .col-wd-pull-4 { right: 33.33333%; }
+  .col-wd-pull-5 { right: 41.66667%; }
+  .col-wd-pull-6 { right: 50%; }
+  .col-wd-pull-7 { right: 58.33333%; }
+  .col-wd-pull-8 { right: 66.66667%; }
+  .col-wd-pull-9 { right: 75%; }
+  .col-wd-pull-10 { right: 83.33333%; }
+  .col-wd-pull-11 { right: 91.66667%; }
+  .col-wd-pull-12 { right: 100%; }
+  .col-wd-push-0 { left: 0%; }
+  .col-wd-push-1 { left: 8.33333%; }
+  .col-wd-push-2 { left: 16.66667%; }
+  .col-wd-push-3 { left: 25%; }
+  .col-wd-push-4 { left: 33.33333%; }
+  .col-wd-push-5 { left: 41.66667%; }
+  .col-wd-push-6 { left: 50%; }
+  .col-wd-push-7 { left: 58.33333%; }
+  .col-wd-push-8 { left: 66.66667%; }
+  .col-wd-push-9 { left: 75%; }
+  .col-wd-push-10 { left: 83.33333%; }
+  .col-wd-push-11 { left: 91.66667%; }
+  .col-wd-push-12 { left: 100%; } }
+
+/* Responsive kit */
+@media (max-width: 575px) { .kit-hidden-mb { display: none; } }
+
+@media (max-width: 767px) { .kit-hidden-tb { display: none; } }
+
+@media (max-width: 991px) { .kit-hidden { display: none; } }
+
+/* Clearfix */
+.clearfix, .row { zoom: 1; }
+
+.clearfix:before, .row:before, .clearfix:after, .row:after { content: " "; display: table; }
+
+.clearfix:after, .row:after { clear: both; }

admin/css/install.css

@@ -0,0 +1,24 @@
+h1 { text-align: center; }
+
+details summary { cursor: pointer; }
+
+@keyframes fadein { from { opacity: 0; }
+  to { opacity: 1; } }
+
+.fresh .keep-word { display: none; }
+
+.keep .fresh-word { display: none; }
+
+form > .message { display: none; padding: 20px; border-radius: 5px; }
+
+.message textarea { width: 100%; height: 200px; resize: none; margin: 10px 0; }
+
+.message.fade { display: block; animation: fadein .5s linear; }
+
+.message *:last-child { margin-bottom: 0; }
+
+.message p { margin-top: 10px; }
+
+.message p button { margin-left: 5px; }
+
+.message p button:first-child { margin-left: 0; }

admin/css/normalize.css

@@ -1,406 +1,341 @@
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
+/*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */
 
-/* ==========================================================================
-   HTML5 display definitions
+/* Document
    ========================================================================== */
 
 /**
- * Correct `block` display not defined in IE 8/9.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-    display: block;
-}
-
-/**
- * Correct `inline-block` display not defined in IE 8/9.
- */
-
-audio,
-canvas,
-video {
-    display: inline-block;
-}
-
-/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-    display: none;
-    height: 0;
-}
-
-/**
- * Address `[hidden]` styling not present in IE 8/9.
- * Hide the `template` element in IE, Safari, and Firefox < 22.
- */
-
-[hidden],
-template {
-    display: none;
-}
-
-/* ==========================================================================
-   Base
-   ========================================================================== */
-
-/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
 html {
-    font-family: sans-serif; /* 1 */
-    -ms-text-size-adjust: 100%; /* 2 */
-    -webkit-text-size-adjust: 100%; /* 2 */
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
 }
 
+/* Sections
+   ========================================================================== */
+
 /**
- * Remove default margin.
+ * Remove the margin in all browsers.
  */
 
 body {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Links
-   ========================================================================== */
-
-/**
- * Remove the gray background color from active links in IE 10.
- */
-
-a {
-    background: transparent;
+  margin: 0;
 }
 
 /**
- * Address `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
-    outline: thin dotted;
-}
-
-/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
-    outline: 0;
-}
-
-/* ==========================================================================
-   Typography
-   ========================================================================== */
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari 5, and Chrome.
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
  */
 
 h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
 }
 
 /**
- * Address styling not present in IE 8/9, Safari 5, and Chrome.
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
  */
 
 abbr[title] {
-    border-bottom: 1px dotted;
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
 }
 
 /**
- * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ * Add the correct font weight in Chrome, Edge, and Safari.
  */
 
 b,
 strong {
-    font-weight: bold;
+  font-weight: bolder;
 }
 
 /**
- * Address styling not present in Safari 5 and Chrome.
- */
-
-dfn {
-    font-style: italic;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-mark {
-    background: #ff0;
-    color: #000;
-}
-
-/**
- * Correct font family set oddly in Safari 5 and Chrome.
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
  */
 
 code,
 kbd,
-pre,
 samp {
-    font-family: monospace, serif;
-    font-size: 1em;
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
 }
 
 /**
- * Improve readability of pre-formatted text in all browsers.
- */
-
-pre {
-    white-space: pre-wrap;
-}
-
-/**
- * Set consistent quote types.
- */
-
-q {
-    quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-/**
- * Address inconsistent and variable font size in all browsers.
+ * Add the correct font size in all browsers.
  */
 
 small {
-    font-size: 80%;
+  font-size: 80%;
 }
 
 /**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
  */
 
 sub,
 sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-
-sup {
-    top: -0.5em;
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
 }
 
 sub {
-    bottom: -0.25em;
+  bottom: -0.25em;
 }
 
-/* ==========================================================================
-   Embedded content
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
    ========================================================================== */
 
 /**
- * Remove border when inside `a` element in IE 8/9.
+ * Remove the border on images inside links in IE 10.
  */
 
 img {
-    border: 0;
+  border-style: none;
 }
 
-/**
- * Correct overflow displayed oddly in IE 9.
- */
-
-svg:not(:root) {
-    overflow: hidden;
-}
-
-/* ==========================================================================
-   Figures
+/* Forms
    ========================================================================== */
 
 /**
- * Address margin not present in IE 8/9 and Safari 5.
- */
-
-figure {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Forms
-   ========================================================================== */
-
-/**
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Correct font family not being inherited in all browsers.
- * 2. Correct font size not being inherited in all browsers.
- * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
  */
 
 button,
 input,
+optgroup,
 select,
 textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
 }
 
 /**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
  */
 
 button,
-input {
-    line-height: normal;
+input { /* 1 */
+  overflow: visible;
 }
 
 /**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
- * Correct `select` style inheritance in Firefox 4+ and Opera.
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
  */
 
 button,
-select {
-    text-transform: none;
+select { /* 1 */
+  text-transform: none;
 }
 
 /**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
+ * Correct the inability to style clickable types in iOS and Safari.
  */
 
 button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
 }
 
 /**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-    cursor: default;
-}
-
-/**
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
- * 2. Remove excess padding in IE 8/9/10.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
-}
-
-/**
- * Remove inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/**
- * Remove inner padding and border in Firefox 4+.
+ * Remove the inner border and padding in Firefox.
  */
 
 button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
 }
 
 /**
- * 1. Remove default vertical scrollbar in IE 8/9.
- * 2. Improve readability and alignment in all browsers.
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
  */
 
 textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
+  overflow: auto;
 }
 
-/* ==========================================================================
-   Tables
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Misc
    ========================================================================== */
 
 /**
- * Remove most spacing between table cells.
+ * Add the correct display in IE 10+.
  */
 
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
+template {
+  display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+  display: none;
 }

admin/custom-fields-js.php

@@ -1,3 +1,4 @@
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
 <script>
 $(document).ready(function () {
     // 自定义字段
@@ -9,6 +10,7 @@ $(document).ready(function () {
             btn.removeClass('i-caret-down').addClass('i-caret-right');
         }
         $(this).parent().toggleClass('fold');
+        return false;
     });
 
     function attachDeleteEvent (el) {
@@ -17,6 +19,8 @@ $(document).ready(function () {
                 $(this).parents('tr').fadeOut(function () {
                     $(this).remove();
                 });
+
+                $(this).parents('form').trigger('field');
             }
         });
     }
@@ -33,9 +37,13 @@ $(document).ready(function () {
                 + '<option value="float"><?php _e('小数'); ?></option>'
                 + '</select></td>'
                 + '<td><textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" class="text-s w-100" rows="2"></textarea></td>'
-                + '<td><button type="button" class="btn-xs"><?php _e('删除'); ?></button></td></tr>',
+                + '<td><button type="button" class="btn btn-xs"><?php _e('删除'); ?></button></td></tr>',
             el = $(html).hide().appendTo('#custom-field table tbody').fadeIn();
 
+            $(':input', el).bind('input change', function () {
+                $(this).parents('form').trigger('field');
+            });
+
         attachDeleteEvent(el);
     });
 });

admin/custom-fields.php

@@ -1,66 +1,82 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php if (!defined('__TYPECHO_ADMIN__')) exit; ?>
 <?php
 $fields = isset($post) ? $post->getFieldItems() : $page->getFieldItems();
 $defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaultFieldItems();
 ?>
-                    <section id="custom-field" class="typecho-post-option<?php if (empty($defaultFields) && empty($fields)): ?> fold<?php endif; ?>">
-                        <label id="custom-field-expand" class="typecho-label"><i class="i-caret-right"></i> <?php _e('自定义字段'); ?></label>
-                        <table class="typecho-list-table mono">
-                            <colgroup>
-                                <col width="25%"/>
-                                <col width="10%"/>
-                                <col width="55%"/>
-                                <col width="10%"/>
-                            </colgroup>
-                            <?php foreach ($defaultFields as $field): ?>
-                            <?php list ($label, $input) = $field; ?>
-                            <tr>
-                                <td><?php $label->render(); ?></td>
-                                <td colspan="3"><?php $input->render(); ?></td>
-                            </tr>
-                            <?php endforeach; ?>
-                            <?php foreach ($fields as $field): ?>
-                            <tr>
-                                <td><input type="text" name="fieldNames[]" value="<?php echo htmlspecialchars($field['name']); ?>" class="text-s w-100"></td>
-                                <td>
-                                    <select name="fieldTypes[]" id="">
-                                        <option value="str"<?php if ('str' == $field['type']): ?> selected<?php endif; ?>><?php _e('字符'); ?></option>
-                                        <option value="int"<?php if ('int' == $field['type']): ?> selected<?php endif; ?>><?php _e('整数'); ?></option>
-                                        <option value="float"<?php if ('float' == $field['type']): ?> selected<?php endif; ?>><?php _e('小数'); ?></option>
-                                    </select>
-                                </td>
-                                <td><textarea name="fieldValues[]" class="text-s w-100" rows="2"><?php echo htmlspecialchars($field[$field['type'] . '_value']); ?></textarea></td>
-                                <td>
-                                    <button type="button" class="btn-xs"><?php _e('删除'); ?></button>
-                                </td>
-                            </tr>
-                            <?php endforeach; ?>
-                            <?php if (empty($defaultFields) && empty($fields)): ?>
-                            <tr>
-                                <td>
-                                    <label for="title" class="visuallyhidden"><?php _e('字段名称'); ?></label>
-                                    <input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" class="text-s w-100">
-                                </td>
-                                <td>
-                                    <label for="title" class="visuallyhidden"><?php _e('字段类型'); ?></label>
-                                    <select name="fieldTypes[]" id="">
-                                        <option value="str"><?php _e('字符'); ?></option>
-                                        <option value="int"><?php _e('整数'); ?></option>
-                                        <option value="float"><?php _e('小数'); ?></option>
-                                    </select>
-                                </td>
-                                <td>
-                                    <label for="title" class="visuallyhidden"><?php _e('字段值'); ?></label>
-                                    <textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" class="text-s w-100" rows="2"></textarea>
-                                </td>
-                                <td>
-                                    <button type="button" class="btn-xs"><?php _e('删除'); ?></button>
-                                </td>
-                            </tr>
-                            <?php endif; ?>
-                        </table>
-                        <div class="description clearfix">
-                            <button type="button" class="btn-xs operate-add"><?php _e('+添加字段'); ?></button>
-                            <?php _e('自定义字段可以扩展你的模板功能, 使用方法参见 <a href="">帮助文档</a>'); ?>
-                        </div>
-                    </section>
+<section id="custom-field"
+         class="typecho-post-option<?php if (empty($defaultFields) && empty($fields)): ?> fold<?php endif; ?>">
+    <label id="custom-field-expand" class="typecho-label"><a href="##"><i
+                class="i-caret-right"></i> <?php _e('自定义字段'); ?></a></label>
+    <table class="typecho-list-table mono">
+        <colgroup>
+            <col width="25%"/>
+            <col width="10%"/>
+            <col width="55%"/>
+            <col width="10%"/>
+        </colgroup>
+        <?php foreach ($defaultFields as $field): ?>
+            <?php [$label, $input] = $field; ?>
+            <tr>
+                <td><?php $label->render(); ?></td>
+                <td colspan="3"><?php $input->render(); ?></td>
+            </tr>
+        <?php endforeach; ?>
+        <?php foreach ($fields as $field): ?>
+            <tr>
+                <td>
+                    <label for="fieldname" class="sr-only"><?php _e('字段名称'); ?></label>
+                    <input type="text" name="fieldNames[]" value="<?php echo htmlspecialchars($field['name']); ?>"
+                           id="fieldname" class="text-s w-100">
+                </td>
+                <td>
+                    <label for="fieldtype" class="sr-only"><?php _e('字段类型'); ?></label>
+                    <select name="fieldTypes[]" id="fieldtype">
+                        <option
+                            value="str"<?php if ('str' == $field['type']): ?> selected<?php endif; ?>><?php _e('字符'); ?></option>
+                        <option
+                            value="int"<?php if ('int' == $field['type']): ?> selected<?php endif; ?>><?php _e('整数'); ?></option>
+                        <option
+                            value="float"<?php if ('float' == $field['type']): ?> selected<?php endif; ?>><?php _e('小数'); ?></option>
+                    </select>
+                </td>
+                <td>
+                    <label for="fieldvalue" class="sr-only"><?php _e('字段值'); ?></label>
+                    <textarea name="fieldValues[]" id="fieldvalue" class="text-s w-100"
+                              rows="2"><?php echo htmlspecialchars($field[$field['type'] . '_value']); ?></textarea>
+                </td>
+                <td>
+                    <button type="button" class="btn btn-xs"><?php _e('删除'); ?></button>
+                </td>
+            </tr>
+        <?php endforeach; ?>
+        <?php if (empty($defaultFields) && empty($fields)): ?>
+            <tr>
+                <td>
+                    <label for="fieldname" class="sr-only"><?php _e('字段名称'); ?></label>
+                    <input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" id="fieldname"
+                           class="text-s w-100">
+                </td>
+                <td>
+                    <label for="fieldtype" class="sr-only"><?php _e('字段类型'); ?></label>
+                    <select name="fieldTypes[]" id="fieldtype">
+                        <option value="str"><?php _e('字符'); ?></option>
+                        <option value="int"><?php _e('整数'); ?></option>
+                        <option value="float"><?php _e('小数'); ?></option>
+                    </select>
+                </td>
+                <td>
+                    <label for="fieldvalue" class="sr-only"><?php _e('字段值'); ?></label>
+                    <textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" id="fieldvalue"
+                              class="text-s w-100" rows="2"></textarea>
+                </td>
+                <td>
+                    <button type="button" class="btn btn-xs"><?php _e('删除'); ?></button>
+                </td>
+            </tr>
+        <?php endif; ?>
+    </table>
+    <div class="description clearfix">
+        <button type="button" class="btn btn-xs operate-add"><?php _e('+添加字段'); ?></button>
+        <?php _e('自定义字段可以扩展你的模板功能, 使用方法参见 <a href="http://docs.typecho.org/help/custom-fields">帮助文档</a>'); ?>
+    </div>
+</section>

admin/editor-js.php

@@ -1,15 +1,17 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $content = !empty($post) ? $post : $page; if ($options->markdown && (!$content->have() || $content->isMarkdown)): ?>
-<script src="<?php $options->adminUrl('js/pagedown.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminUrl('js/pagedown-extra.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminUrl('js/diff.js?v=' . $suffixVersion); ?>"></script>
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
+<?php $content = !empty($post) ? $post : $page; if ($options->markdown): ?>
+<script src="<?php $options->adminStaticUrl('js', 'hyperdown.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'pagedown.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'paste.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'purify.js'); ?>"></script>
 <script>
 $(document).ready(function () {
     var textarea = $('#text'),
-        toolbar = $('<div class="editor" id="wmd-button-bar" />').insertBefore(textarea.parent())
+        isFullScreen = false,
+        toolbar = $('<div class="editor" id="wmd-button-bar" />').insertBefore(textarea.parent()),
         preview = $('<div id="wmd-preview" class="wmd-hidetab" />').insertAfter('.editor');
 
-    var options = {};
+    var options = {}, isMarkdown = <?php echo intval($content->isMarkdown || !$content->have()); ?>;
 
     options.strings = {
         bold: '<?php _e('加粗'); ?> <strong> Ctrl+B',
@@ -48,7 +50,7 @@ $(document).ready(function () {
         exitFullscreen: '<?php _e('退出全屏'); ?> - Ctrl+E',
         fullscreenUnsupport: '<?php _e('此浏览器不支持全屏操作'); ?>',
 
-        imagedialog: '<p><b><?php _e('插入图片'); ?></b></p><p><?php _e('请在下方的输入框内输入要插入的远程图片地址'); ?></p><p><?php _e('您也可以使用编辑器下方的文件上传功能插入本地图片'); ?></p>',
+        imagedialog: '<p><b><?php _e('插入图片'); ?></b></p><p><?php _e('请在下方的输入框内输入要插入的远程图片地址'); ?></p><p><?php _e('您也可以使用附件功能插入上传的本地图片'); ?></p>',
         linkdialog: '<p><b><?php _e('插入链接'); ?></b></p><p><?php _e('请在下方的输入框内输入要插入的链接地址'); ?></p>',
 
         ok: '<?php _e('确定'); ?>',
@@ -57,31 +59,18 @@ $(document).ready(function () {
         help: '<?php _e('Markdown语法帮助'); ?>'
     };
 
-    var converter = new Markdown.Converter(),
-        editor = new Markdown.Editor(converter, '', options),
-        diffMatch = new diff_match_patch(), last = '', preview = $('#wmd-preview'),
-        mark = '@mark' + Math.ceil(Math.random() * 100000000) + '@',
-        span = '<span class="diff" />';
-    
-    // 设置markdown
-    Markdown.Extra.init(converter, {
-        extensions  :   'all'
-    });
+    var converter = new HyperDown(),
+        editor = new Markdown.Editor(converter, '', options);
 
     // 自动跟随
-    converter.hooks.chain('postConversion', function (html) {
-        // clear special html tags
-        html = html.replace(/<\/?(\!doctype|html|head|body|link|title|input|select|button|textarea|style|noscript)[^>]*>/ig, function (all) {
-            return all.replace(/&/g, '&amp;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;')
-                .replace(/'/g, '&#039;')
-                .replace(/"/g, '&quot;');
-        });
-
-        // clear hard breaks
-        html = html.replace(/\s*((?:<br>\n)+)\s*(<\/?(?:p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|li|dd|dt)[^\w])/gm, '$2');
+    converter.enableHtml(true);
+    converter.enableLine(true);
+    reloadScroll = scrollableEditor(textarea, preview);
 
+    // 修正白名单
+    converter.hook('makeHtml', function (html) {
+        html = html.replace('<p><!--more--></p>', '<!--more-->');
+        
         if (html.indexOf('<!--more-->') > 0) {
             var parts = html.split(/\s*<\!\-\-more\-\->\s*/),
                 summary = parts.shift(),
@@ -91,82 +80,50 @@ $(document).ready(function () {
                 + '<div class="details">' + details + '</div>';
         }
 
-
-        var diffs = diffMatch.diff_main(last, html);
-        last = html;
-
-        if (diffs.length > 0) {
-            var stack = [], markStr = mark;
-            
-            for (var i = 0; i < diffs.length; i ++) {
-                var diff = diffs[i], op = diff[0], str = diff[1]
-                    sp = str.lastIndexOf('<'), ep = str.lastIndexOf('>');
-
-                if (op != 0) {
-                    if (sp >=0 && sp > ep) {
-                        if (op > 0) {
-                            stack.push(str.substring(0, sp) + markStr + str.substring(sp));
-                        } else {
-                            var lastStr = stack[stack.length - 1], lastSp = lastStr.lastIndexOf('<');
-                            stack[stack.length - 1] = lastStr.substring(0, lastSp) + markStr + lastStr.substring(lastSp);
-                        }
-                    } else {
-                        if (op > 0) {
-                            stack.push(str + markStr);
-                        } else {
-                            stack.push(markStr);
-                        }
-                    }
-                    
-                    markStr = '';
-                } else {
-                    stack.push(str);
-                }
+        // 替换block
+        html = html.replace(/<(iframe|embed)\s+([^>]*)>/ig, function (all, tag, src) {
+            if (src[src.length - 1] == '/') {
+                src = src.substring(0, src.length - 1);
             }
 
-            html = stack.join('');
+            return '<div class="embed"><strong>'
+                + tag + '</strong> : ' + $.trim(src) + '</div>';
+        });
 
-            if (!markStr) {
-                var pos = html.indexOf(mark), prev = html.substring(0, pos),
-                    next = html.substr(pos + mark.length),
-                    sp = prev.lastIndexOf('<'), ep = prev.lastIndexOf('>');
-
-                if (sp >= 0 && sp > ep) {
-                    html = prev.substring(0, sp) + span + prev.substring(sp) + next;
-                } else {
-                    html = prev + span + next;
-                }
-            }
-        }
-
-        return html;
+        return DOMPurify.sanitize(html, {USE_PROFILES: {html: true}});
     });
 
     editor.hooks.chain('onPreviewRefresh', function () {
-        var diff = $('.diff', preview), scrolled = false;
+        var images = $('img', preview), count = images.length;
 
-        $('img', preview).load(function () {
-            if (scrolled) {
-                preview.scrollTo(diff, {
-                    offset  :   - 50
-                });
-            }
-        });
+        if (count == 0) {
+            reloadScroll(true);
+        } else {
+            images.bind('load error', function () {
+                count --;
 
-        if (diff.length > 0) {
-            var p = diff.position(), lh = diff.parent().css('line-height');
-            lh = !!lh ? parseInt(lh) : 0;
-
-            if (p.top < 0 || p.top > preview.height() - lh) {
-                preview.scrollTo(diff, {
-                    offset  :   - 50
-                });
-                scrolled = true;
-            }
+                if (count == 0) {
+                    reloadScroll(true);
+                }
+            });
         }
     });
 
-    var input = $('#text'), th = textarea.height(), ph = preview.height();
+    <?php \Typecho\Plugin::factory('admin/editor-js.php')->markdownEditor($content); ?>
+
+    var th = textarea.height(), ph = preview.height(),
+        uploadBtn = $('<button type="button" id="btn-fullscreen-upload" class="btn btn-link">'
+            + '<i class="i-upload"><?php _e('附件'); ?></i></button>')
+            .prependTo('.submit .right')
+            .click(function() {
+                $('a', $('.typecho-option-tabs li').not('.active')).trigger('click');
+                return false;
+            });
+
+    $('.typecho-option-tabs li').click(function () {
+        uploadBtn.find('i').toggleClass('i-upload-active',
+            $('#tab-files-btn', this).length > 0);
+    });
 
     editor.hooks.chain('enterFakeFullScreen', function () {
         th = textarea.height();
@@ -176,6 +133,7 @@ $(document).ready(function () {
         
         textarea.css('height', h);
         preview.css('height', h);
+        isFullScreen = true;
     });
 
     editor.hooks.chain('enterFullScreen', function () {
@@ -184,59 +142,100 @@ $(document).ready(function () {
         var h = window.screen.height - toolbar.outerHeight();
         textarea.css('height', h);
         preview.css('height', h);
+        isFullScreen = true;
     });
 
     editor.hooks.chain('exitFullScreen', function () {
         $(document.body).removeClass('fullscreen');
         textarea.height(th);
         preview.height(ph);
+        isFullScreen = false;
     });
 
-    editor.run();
+    editor.hooks.chain('commandExecuted', function () {
+        textarea.trigger('input');
+    });
 
-    var imageButton = $('#wmd-image-button'),
-        linkButton = $('#wmd-link-button');
+    function initMarkdown() {
+        editor.run();
 
-    Typecho.insertFileToEditor = function (file, url, isImage) {
-        var button = isImage ? imageButton : linkButton;
+        var imageButton = $('#wmd-image-button'),
+            linkButton = $('#wmd-link-button');
 
-        options.strings[isImage ? 'imagename' : 'linkname'] = file;
-        button.trigger('click');
+        Typecho.insertFileToEditor = function (file, url, isImage) {
+            var button = isImage ? imageButton : linkButton;
 
-        var checkDialog = setInterval(function () {
-            if ($('.wmd-prompt-dialog').length > 0) {
-                $('.wmd-prompt-dialog input').val(url).select();
-                clearInterval(checkDialog);
-                checkDialog = null;
-            }
-        }, 10);
-    };
+            options.strings[isImage ? 'imagename' : 'linkname'] = file;
+            button.trigger('click');
 
+            var checkDialog = setInterval(function () {
+                if ($('.wmd-prompt-dialog').length > 0) {
+                    $('.wmd-prompt-dialog input').val(url).select();
+                    clearInterval(checkDialog);
+                    checkDialog = null;
+                }
+            }, 10);
+        };
 
-    // 编辑预览切换
-    var edittab = $('.editor').prepend('<div class="wmd-edittab"><a href="#wmd-editarea" class="active">撰写</a><a href="#wmd-preview">预览</a></div>'),
-        editarea = $(textarea.parent()).attr("id", "wmd-editarea");
+        Typecho.uploadComplete = function (file) {
+            Typecho.insertFileToEditor(file.title, file.url, file.isImage);
+        };
 
-    $(".wmd-edittab a").click(function() {
-        $(".wmd-edittab a").removeClass('active');
-        $(this).addClass("active");
-        $("#wmd-editarea, #wmd-preview").addClass("wmd-hidetab");
+        // 编辑预览切换
+        var edittab = $('.editor').prepend('<div class="wmd-edittab"><a href="#wmd-editarea" class="active"><?php _e('撰写'); ?></a><a href="#wmd-preview"><?php _e('预览'); ?></a></div>'),
+            editarea = $(textarea.parent()).attr("id", "wmd-editarea");
+
+        $(".wmd-edittab a").click(function() {
+            $(".wmd-edittab a").removeClass('active');
+            $(this).addClass("active");
+            $("#wmd-editarea, #wmd-preview").addClass("wmd-hidetab");
         
-        var selected_tab = $(this).attr("href"),
-            selected_el = $(selected_tab).removeClass("wmd-hidetab");
+            var selected_tab = $(this).attr("href"),
+                selected_el = $(selected_tab).removeClass("wmd-hidetab");
 
-        // 预览时隐藏编辑器按钮
-        if (selected_tab == "#wmd-preview") {
-            $("#wmd-button-row").addClass("wmd-visualhide");
-        } else {
-            $("#wmd-button-row").removeClass("wmd-visualhide");
-        }
+            // 预览时隐藏编辑器按钮
+            if (selected_tab == "#wmd-preview") {
+                $("#wmd-button-row").addClass("wmd-visualhide");
+            } else {
+                $("#wmd-button-row").removeClass("wmd-visualhide");
+            }
 
-        // 预览和编辑窗口高度一致
-        $("#wmd-preview").outerHeight($("#wmd-editarea").innerHeight());
+            // 预览和编辑窗口高度一致
+            $("#wmd-preview").outerHeight($("#wmd-editarea").innerHeight());
 
-        return false;
-    });
+            return false;
+        });
+
+        // 剪贴板复制图片
+        textarea.pastableTextarea().on('pasteImage', function (e, data) {
+            var name = data.name ? data.name.replace(/[\(\)\[\]\*#!]/g, '') : (new Date()).toISOString().replace(/\..+$/, '');
+            if (!name.match(/\.[a-z0-9]{2,}$/i)) {
+                var ext = data.blob.type.split('/').pop();
+                name += '.' + ext;
+            }
+
+            Typecho.uploadFile(new File([data.blob], name), name);
+        });
+    }
+
+    if (isMarkdown) {
+        initMarkdown();
+    } else {
+        var notice = $('<div class="message notice"><?php _e('这篇文章不是由Markdown语法创建的, 继续使用Markdown编辑它吗?'); ?> '
+            + '<button class="btn btn-xs primary yes"><?php _e('是'); ?></button> ' 
+            + '<button class="btn btn-xs no"><?php _e('否'); ?></button></div>')
+            .hide().insertBefore(textarea).slideDown();
+
+        $('.yes', notice).click(function () {
+            notice.remove();
+            $('<input type="hidden" name="markdown" value="1" />').appendTo('.submit');
+            initMarkdown();
+        });
+
+        $('.no', notice).click(function () {
+            notice.remove();
+        });
+    }
 });
 </script>
 <?php endif; ?>

admin/extending.php

@@ -1,11 +1,14 @@
 <?php
+
 include 'common.php';
 
 $panel = $request->get('panel');
 $panelTable = unserialize($options->panelTable);
 
 if (!isset($panelTable['file']) || !in_array(urlencode($panel), $panelTable['file'])) {
-    throw new Typecho_Plugin_Exception(_t('页面不存在'), 404);
+    throw new \Typecho\Plugin\Exception(_t('页面不存在'), 404);
 }
 
-require_once $panel;
+[$pluginName, $file] = explode('/', trim($panel, '/'), 2);
+
+require_once $options->pluginDir($pluginName) . '/' . $file;

admin/file-upload-js.php

@@ -1,36 +1,26 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
 <?php
-if (isset($post) && $post instanceof Typecho_Widget && $post->have()) {
+if (isset($post) && $post instanceof \Typecho\Widget && $post->have()) {
     $fileParentContent = $post;
-} else if (isset($page) && $page instanceof Typecho_Widget && $page->have()) {
+} elseif (isset($page) && $page instanceof \Typecho\Widget && $page->have()) {
     $fileParentContent = $page;
 }
+
+$phpMaxFilesize = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
+
+if (preg_match("/^([0-9]+)([a-z]{1,2})$/i", $phpMaxFilesize, $matches)) {
+    $phpMaxFilesize = strtolower($matches[1] . $matches[2] . (1 == strlen($matches[2]) ? 'b' : ''));
+}
 ?>
 
-<script src="<?php $options->adminUrl('js/filedrop.js?v=' . $suffixVersion); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'moxie.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'plupload.js'); ?>"></script>
 <script>
 $(document).ready(function() {
-    var errorWord = '<?php $val = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
-            // The 'G' modifier is available since PHP 5.1.0
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-        }
-
-        $val = number_format(ceil($val / (1024 *1024)));
-        _e('文件上传失败, 请确认文件尺寸没有超过 %s 并且服务器文件目录可以写入', "{$val}Mb"); ?>',
-        loading = $('<img src="<?php $options->adminUrl('img/ajax-loader.gif'); ?>" style="display:none" />')
-            .appendTo(document.body);
-
     function updateAttacmentNumber () {
         var btn = $('#tab-files-btn'),
             balloon = $('.balloon', btn),
-            count = $('#file-list li').length;
+            count = $('#file-list li .insert').length;
 
         if (count > 0) {
             if (!balloon.length) {
@@ -44,13 +34,72 @@ $(document).ready(function() {
         }
     }
 
+    $('.upload-area').bind({
+        dragenter   :   function () {
+            $(this).parent().addClass('drag');
+        },
+
+        dragover    :   function (e) {
+            $(this).parent().addClass('drag');
+        },
+
+        drop        :   function () {
+            $(this).parent().removeClass('drag');
+        },
+        
+        dragend     :   function () {
+            $(this).parent().removeClass('drag');
+        },
+
+        dragleave   :   function () {
+            $(this).parent().removeClass('drag');
+        }
+    });
+
     updateAttacmentNumber();
 
-    function fileUploadStart (file, id) {
-        $('<li id="' + id + '" class="loading">'
-            + file + '</li>').prependTo('#file-list');
+    function fileUploadStart (file) {
+        $('<li id="' + file.id + '" class="loading">'
+            + file.name + '</li>').appendTo('#file-list');
     }
 
+    function fileUploadError (error) {
+        var file = error.file, code = error.code, word; 
+        
+        switch (code) {
+            case plupload.FILE_SIZE_ERROR:
+                word = '<?php _e('文件大小超过限制'); ?>';
+                break;
+            case plupload.FILE_EXTENSION_ERROR:
+                word = '<?php _e('文件扩展名不被支持'); ?>';
+                break;
+            case plupload.FILE_DUPLICATE_ERROR:
+                word = '<?php _e('文件已经上传过'); ?>';
+                break;
+            case plupload.HTTP_ERROR:
+            default:
+                word = '<?php _e('上传出现错误'); ?>';
+                break;
+        }
+
+        var fileError = '<?php _e('%s 上传失败'); ?>'.replace('%s', file.name),
+            li, exist = $('#' + file.id);
+
+        if (exist.length > 0) {
+            li = exist.removeClass('loading').html(fileError);
+        } else {
+            li = $('<li>' + fileError + '<br />' + word + '</li>').appendTo('#file-list');
+        }
+
+        li.effect('highlight', {color : '#FBC2C4'}, 2000, function () {
+            $(this).remove();
+        });
+
+        // fix issue #341
+        this.removeFile(file);
+    }
+
+    var completeFile = null;
     function fileUploadComplete (id, url, data) {
         var li = $('#' + id).removeClass('loading').data('cid', data.cid)
             .data('url', data.url)
@@ -65,123 +114,85 @@ $(document).ready(function() {
         attachInsertEvent(li);
         attachDeleteEvent(li);
         updateAttacmentNumber();
+
+        if (!completeFile) {
+            completeFile = data;
+        }
     }
 
-    $('#tab-files').bind('init', function () {
-        $('.upload-file').fileUpload({
-            url         :   '<?php $options->index('/action/upload' 
+    var uploader = null, tabFilesEl = $('#tab-files').bind('init', function () {
+        uploader = new plupload.Uploader({
+            browse_button   :   $('.upload-file').get(0),
+            url             :   '<?php $security->index('/action/upload'
                 . (isset($fileParentContent) ? '?cid=' . $fileParentContent->cid : '')); ?>',
-            types       :   <?php
-    $attachmenttypes = $options->allowedattachmenttypes;
-    $attachmenttypescount = count($attachmenttypes);
-    $types = array();
-
-    for ($i = 0; $i < $attachmenttypescount; $i ++) {
-        $types[] = '.' . $attachmenttypes[$i];
-    }
-
-    echo json_encode($types);
-?>,
-            typesError  :   '<?php _e('文件 %s 的类型不被支持'); ?>',
-            onUpload    :   fileUploadStart,
-            onError     :   function (id) {
-                $('#' + id).remove();
-                alert(errorWord);
+            runtimes        :   'html5,flash,html4',
+            flash_swf_url   :   '<?php $options->adminStaticUrl('js', 'Moxie.swf'); ?>',
+            drop_element    :   $('.upload-area').get(0),
+            filters         :   {
+                max_file_size       :   '<?php echo $phpMaxFilesize ?>',
+                mime_types          :   [{'title' : '<?php _e('允许上传的文件'); ?>', 'extensions' : '<?php echo implode(',', $options->allowedAttachmentTypes); ?>'}],
+                prevent_duplicates  :   true
             },
-            onComplete  :   fileUploadComplete
-        });
-    });
 
-    $('#upload-panel').filedrop({
-        url             :   '<?php $options->index('/action/upload' 
-            . (isset($fileParentContent) ? '?cid=' . $fileParentContent->cid : '')); ?>',
-        allowedfileextensions   :   <?php
-    $attachmenttypes = $options->allowedattachmenttypes;
-    $attachmenttypescount = count($attachmenttypes);
-    $types = array();
+            init            :   {
+                FilesAdded      :   function (up, files) {
+                    for (var i = 0; i < files.length; i ++) {
+                        fileUploadStart(files[i]);
+                    }
 
-    for ($i = 0; $i < $attachmenttypescount; $i ++) {
-        $types[] = '.' . $attachmenttypes[$i];
-    }
+                    completeFile = null;
+                    uploader.start();
+                },
 
-    echo json_encode($types);
-?>,
+                UploadComplete  :   function () {
+                    if (completeFile) {
+                        Typecho.uploadComplete(completeFile);
+                    }
+                },
 
-        maxfilesize     :   <?php 
-        $val = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
-            // The 'G' modifier is available since PHP 5.1.0
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-        }
+                FileUploaded    :   function (up, file, result) {
+                    if (200 == result.status) {
+                        var data = $.parseJSON(result.response);
 
-        echo ceil($val / (1024 * 1024));
-        ?>,
+                        if (data) {
+                            fileUploadComplete(file.id, data[0], data[1]);
+                            uploader.removeFile(file);
+                            return;
+                        }
+                    }
 
-        queuefiles      :   5,
+                    fileUploadError.call(uploader, {
+                        code : plupload.HTTP_ERROR,
+                        file : file
+                    });
+                },
 
-        error: function(err, file) {
-            switch(err) {
-                case 'BrowserNotSupported':
-                    alert('<?php _e('浏览器不支持拖拽上传'); ?>');
-                    break;
-                case 'TooManyFiles':
-                    alert('<?php _e('一次上传的文件不能多于%d个', 25); ?>');
-                    break;
-                case 'FileTooLarge':
-                    alert('<?php $val = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
-            // The 'G' modifier is available since PHP 5.1.0
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-        }
-
-        $val = number_format(ceil($val / (1024 *1024)));
-        _e('文件尺寸不能超过 %s', "{$val}Mb"); ?>');
-                    break;
-                case 'FileTypeNotAllowed':
-                    // The file type is not in the specified list 'allowedfiletypes'
-                    break;
-                case 'FileExtensionNotAllowed':
-                    alert('<?php _e('文件 %s 的类型不被支持'); ?>'.replace('%s', file.name));
-                    break;
-                default:
-                    break;
+                Error           :   function (up, error) {
+                    fileUploadError.call(uploader, error);
+                }
             }
-        },
-        
-        
-        dragOver : function () {
-            $(this).addClass('drag');
-        },
+        });
 
-        dragLeave : function () {
-            $(this).removeClass('drag');
-        },
-
-        drop : function () {
-            $(this).removeClass('drag');
-        },
-
-        uploadStarted   :   function (i, file, len) {
-            fileUploadStart(file.name, 'drag-' + i);
-        },
-
-        uploadFinished  :   function (i, file, response) {
-            fileUploadComplete('drag-' + i, response[0], response[1]);
-        }
+        uploader.init();
     });
 
+    Typecho.uploadFile = function (file, name) {
+        if (!uploader) {
+            $('#tab-files-btn').parent().trigger('click');
+        }
+        
+        var timer = setInterval(function () {
+            if (!uploader) {
+                return;
+            }
+
+            clearInterval(timer);
+            timer = null;
+
+            uploader.addFile(file, name);
+        }, 50);
+    };
+
     function attachInsertEvent (el) {
         $('.insert', el).click(function () {
             var t = $(this), p = t.parents('li');
@@ -195,7 +206,7 @@ $(document).ready(function() {
         $('.delete', el).click(function () {
             if (confirm('<?php _e('确认要删除文件 %s 吗?'); ?>'.replace('%s', file))) {
                 var cid = $(this).parents('li').data('cid');
-                $.post('<?php $options->index('/action/contents-attachment-edit'); ?>',
+                $.post('<?php $security->index('/action/contents-attachment-edit'); ?>',
                     {'do' : 'delete', 'cid' : cid},
                     function () {
                         $(el).fadeOut(function () {

admin/file-upload.php

@@ -1,19 +1,19 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
 
 <?php
 if (isset($post) || isset($page)) {
     $cid = isset($post) ? $post->cid : $page->cid;
-    
+
     if ($cid) {
-        Typecho_Widget::widget('Widget_Contents_Attachment_Related', 'parentId=' . $cid)->to($attachment);
+        \Widget\Contents\Attachment\Related::alloc(['parentId' => $cid])->to($attachment);
     } else {
-        Typecho_Widget::widget('Widget_Contents_Attachment_Unattached')->to($attachment);
+        \Widget\Contents\Attachment\Unattached::alloc()->to($attachment);
     }
 }
 ?>
 
 <div id="upload-panel" class="p">
-    <div class="upload-area"><?php _e('拖放文件到这里<br>或者 %s选择文件上传%s', '<a href="###" class="upload-file">', '</a>'); ?></div>
+    <div class="upload-area" draggable="true"><?php _e('拖放文件到这里<br>或者 %s选择文件上传%s', '<a href="###" class="upload-file">', '</a>'); ?></div>
     <ul id="file-list">
     <?php while ($attachment->next()): ?>
         <li data-cid="<?php $attachment->cid(); ?>" data-url="<?php echo $attachment->attachment->url; ?>" data-image="<?php echo $attachment->attachment->isImage ? 1 : 0; ?>"><input type="hidden" name="attachment[]" value="<?php $attachment->cid(); ?>" />

admin/footer.php

@@ -1,6 +1,6 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
     </body>
 </html>
 <?php
-/** 注册一个初始化插件 */
-Typecho_Plugin::factory('admin/footer.php')->end();
+/** 注册一个结束插件 */
+\Typecho\Plugin::factory('admin/footer.php')->end();

admin/form-js.php

@@ -1,11 +1,11 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
 <script>
 (function () {
     $(document).ready(function () {
         var error = $('.typecho-option .error:first');
 
         if (error.length > 0) {
-            $('html,body').scrollTop(error.offset().top);
+            $('html,body').scrollTop(error.parents('.typecho-option').offset().top);
         }
 
         $('form').submit(function () {

admin/header.php

@@ -1,31 +1,23 @@
 <?php
-if (!defined('__TYPECHO_ROOT_DIR__')) {
+if (!defined('__TYPECHO_ADMIN__')) {
     exit;
 }
 
-$header = '<link rel="stylesheet" href="' . Typecho_Common::url('css/normalize.css?v=' . $suffixVersion, $options->adminUrl) . '"> 
-<link rel="stylesheet" href="' . Typecho_Common::url('css/grid.css?v=' . $suffixVersion, $options->adminUrl) . '"> 
-<link rel="stylesheet" href="' . Typecho_Common::url('css/style.css?v=' . $suffixVersion, $options->adminUrl) . '">
-<!--[if lt IE 9]>
-<script src="' . Typecho_Common::url('js/html5shiv.js?v=' . $suffixVersion, $options->adminUrl) . '"></script>
-<script src="' . Typecho_Common::url('js/respond.js?v=' . $suffixVersion, $options->adminUrl) . '"></script>
-<![endif]-->';
+$header = '<link rel="stylesheet" href="' . $options->adminStaticUrl('css', 'normalize.css', true) . '">
+<link rel="stylesheet" href="' . $options->adminStaticUrl('css', 'grid.css', true) . '">
+<link rel="stylesheet" href="' . $options->adminStaticUrl('css', 'style.css', true) . '">';
 
 /** 注册一个初始化插件 */
-$header = Typecho_Plugin::factory('admin/header.php')->header($header);
+$header = \Typecho\Plugin::factory('admin/header.php')->header($header);
 
 ?><!DOCTYPE HTML>
-<html class="no-js">
+<html>
     <head>
         <meta charset="<?php $options->charset(); ?>">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
         <meta name="renderer" content="webkit">
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
         <title><?php _e('%s - %s - Powered by Typecho', $menu->title, $options->title); ?></title>
         <meta name="robots" content="noindex, nofollow">
         <?php echo $header; ?>
     </head>
     <body<?php if (isset($bodyClass)) {echo ' class="' . $bodyClass . '"';} ?>>
-    <!--[if lt IE 9]>
-        <div class="message error browsehappy"><?php _e('您正在使用 <strong>旧版本</strong> 的浏览器. 为了更好的访问本页面, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>'); ?>.</div>
-    <![endif]-->

admin/img/typecho-logo.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="110px" height="26px" viewBox="0 0 110 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>typecho-logo</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M34.75,5.288 C34.288,6.542 33.76,7.73 32.22,7.862 L32,9.468 L33.562,9.468 L33.562,15.342 C33.562,16.882 33.54,18.994 36.972,18.994 C38.006,18.994 39.106,18.686 39.766,18.224 L39.106,16.53 C38.754,16.75 38.204,16.992 37.61,16.992 C36.708,16.992 36.18,16.596 36.18,15.254 L36.18,9.468 L38.886,9.468 L39.106,7.62 L36.18,7.62 L36.18,5.288 L34.75,5.288 Z M48.258,18.268 C48.258,20.27 47.444,21.502 45.42,21.502 C44.76,21.502 44.276,21.436 43.858,21.282 C43.462,21.128 43.352,20.908 43.352,20.49 L43.352,19.434 L41.262,19.61 L41.262,22.668 C42.186,23.13 44.012,23.394 45.398,23.394 C48.676,23.394 50.502,21.898 50.502,18.268 L50.502,7.62 L46.63,7.62 L46.63,9.424 L47.334,9.468 C47.752,9.468 47.884,9.644 47.884,10.128 L47.884,14.11 C47.884,15.254 47.07,16.288 45.53,16.288 C44.122,16.288 43.902,15.276 43.902,13.934 L43.902,7.62 L40.03,7.62 L40.03,9.424 L40.734,9.468 C41.108,9.49 41.284,9.622 41.284,10.084 L41.284,14.506 C41.284,17.102 42.494,18.312 44.694,18.312 C46.146,18.312 47.488,17.696 48.258,16.596 L48.258,18.268 Z M54,20.776 C54,21.326 53.78,21.458 53.362,21.502 L52.636,21.568 L52.636,23.24 L58.312,23.24 L58.312,21.502 L56.53,21.414 L56.53,18.378 C57.102,18.73 58.026,19.016 58.884,19.016 C61.788,19.016 63.702,16.926 63.702,12.878 C63.702,8.94 62.162,7.29 59.72,7.29 C57.85,7.29 56.64,8.302 56.244,9.05 L56.244,7.62 L52.526,7.62 L52.526,9.402 L53.45,9.468 C53.868,9.468 54,9.644 54,10.128 L54,20.776 Z M60.974,13.098 C60.974,15.012 60.336,16.926 58.466,16.926 C57.894,16.926 57.102,16.75 56.53,16.376 L56.53,11.316 C56.53,10.304 57.498,9.424 58.752,9.424 C59.918,9.424 60.974,10.172 60.974,13.098 Z M70.786,7.29 C67.178,7.29 65.352,10.15 65.352,13.406 C65.352,16.684 66.804,18.972 70.544,18.972 C72.612,18.972 74.064,18.048 74.416,17.74 L73.58,15.958 C73.052,16.332 72.106,16.926 70.808,16.926 C68.938,16.926 68.19,15.76 68.102,14.33 C70.698,14.308 74.372,13.736 74.372,10.348 C74.372,8.39 72.942,7.29 70.786,7.29 Z M71.952,10.392 C71.952,12.086 69.642,12.46 68.014,12.482 C68.08,10.854 68.872,9.16 70.632,9.16 C71.424,9.16 71.952,9.578 71.952,10.392 Z M81.192,16.97 C79.234,16.97 78.354,15.43 78.354,13.032 C78.354,10.59 79.256,9.27 81.016,9.27 C81.346,9.27 81.61,9.314 81.874,9.402 C82.27,9.534 82.336,9.732 82.336,10.15 L82.336,11.206 L84.36,11.052 L84.36,8.192 C83.304,7.62 82.248,7.29 80.928,7.29 C78.442,7.29 75.692,8.83 75.692,13.296 C75.692,16.948 77.606,18.994 80.84,18.994 C82.468,18.994 83.81,18.422 84.668,17.718 L83.722,16.024 C82.82,16.684 82.05,16.97 81.192,16.97 Z M87.286,16.222 C87.286,16.772 87.066,16.904 86.648,16.948 L85.922,17.014 L85.922,18.686 L91.158,18.686 L91.158,16.926 L89.904,16.86 L89.904,11.536 C89.904,10.392 90.718,9.314 92.258,9.314 C93.666,9.314 93.974,10.348 93.974,11.69 L93.974,16.222 C93.974,16.772 93.754,16.904 93.336,16.948 L92.61,17.014 L92.61,18.686 L97.846,18.686 L97.846,16.926 L96.592,16.86 L96.592,11.118 C96.592,8.522 95.294,7.29 93.094,7.29 C91.642,7.29 90.542,7.972 89.882,8.918 L89.882,3 L85.966,3 L85.966,4.826 L86.736,4.87 C87.154,4.892 87.286,5.024 87.286,5.508 L87.286,16.222 Z M98.924,13.142 C98.924,17.124 100.86,19.016 103.808,19.016 C106.712,19.016 109.066,17.08 109.066,12.856 C109.066,7.796 105.788,7.29 104.16,7.29 C101.894,7.29 98.924,8.566 98.924,13.142 Z M103.984,17.08 C101.872,17.08 101.586,14.88 101.586,12.834 C101.586,10.722 102.29,9.226 104.028,9.226 C105.788,9.226 106.382,10.744 106.382,13.208 C106.382,15.496 105.7,17.08 103.984,17.08 Z" id="typecho" fill="#000000" sketch:type="MSShapeGroup"></path>
+        <path d="M13,26 C3.36833333,26 0,22.631 0,13 C0,3.36866667 3.36833333,0 13,0 C22.6316667,0 26,3.36866667 26,13 C26,22.631 22.6316667,26 13,26 Z M6,9 L20,9 L20,7 L6,7 L6,9 Z M6,14 L16,14 L16,12 L6,12 L6,14 Z M6,19 L18,19 L18,17 L6,17 L6,19 Z" id="icon" fill="#000000" sketch:type="MSShapeGroup"></path>
+    </g>
+</svg>

admin/index.php

@@ -3,109 +3,102 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$stat = Typecho_Widget::widget('Widget_Stat');
+$stat = \Widget\Stat::alloc();
 ?>
 <div class="main">
     <div class="container typecho-dashboard">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
-            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav" role="main">
-                <p class="intro"><?php _e('欢迎使用 Typecho, 您可以使用下面的链接开始您的 Blog 之旅:'); ?></p>
-            
-                <ul class="intro-link">
-                    <?php if($user->pass('contributor', true)): ?>
-                    <li><a href="<?php $options->adminUrl('write-post.php'); ?>"><?php _e('撰写新文章'); ?></a></li>
-                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->waitingCommentsNum > 0): ?> 
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核的评论'); ?></a>
-                        <span class="balloon"><?php $stat->waitingCommentsNum(); ?></span>
-                        </li>
-                    <?php elseif($stat->myWaitingCommentsNum > 0): ?>
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核的评论'); ?></a>
-                        <span class="balloon"><?php $stat->myWaitingCommentsNum(); ?></span>
-                        </li>
-                    <?php endif; ?>
-                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->spamCommentsNum > 0): ?> 
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
-                        <span class="balloon"><?php $stat->spamCommentsNum(); ?></span>
-                        </li>
-                    <?php elseif($stat->mySpamCommentsNum > 0): ?>
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
-                        <span class="balloon"><?php $stat->mySpamCommentsNum(); ?></span>
-                        </li>
-                    <?php endif; ?>
-                    <?php if($user->pass('administrator', true)): ?>
-                    <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('更换外观模板'); ?></a></li>
-                    <li><a href="<?php $options->adminUrl('options-general.php'); ?>"><?php _e('修改系统设置'); ?></a></li>
-                    <?php endif; ?>
+        <div class="row typecho-page-main">
+            <div class="col-mb-12 welcome-board" role="main">
+                <p><?php _e('目前有 <em>%s</em> 篇文章, 并有 <em>%s</em> 条关于你的评论在 <em>%s</em> 个分类中.',
+                        $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?>
+                    <br><?php _e('点击下面的链接快速开始:'); ?></p>
+
+                <ul id="start-link" class="clearfix">
+                    <?php if ($user->pass('contributor', true)): ?>
+                        <li><a href="<?php $options->adminUrl('write-post.php'); ?>"><?php _e('撰写新文章'); ?></a></li>
+                        <?php if ($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->waitingCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核的评论'); ?></a>
+                                <span class="balloon"><?php $stat->waitingCommentsNum(); ?></span>
+                            </li>
+                        <?php elseif ($stat->myWaitingCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核评论'); ?></a>
+                                <span class="balloon"><?php $stat->myWaitingCommentsNum(); ?></span>
+                            </li>
+                        <?php endif; ?>
+                        <?php if ($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->spamCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
+                                <span class="balloon"><?php $stat->spamCommentsNum(); ?></span>
+                            </li>
+                        <?php elseif ($stat->mySpamCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
+                                <span class="balloon"><?php $stat->mySpamCommentsNum(); ?></span>
+                            </li>
+                        <?php endif; ?>
+                        <?php if ($user->pass('administrator', true)): ?>
+                            <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('更换外观'); ?></a></li>
+                            <li><a href="<?php $options->adminUrl('plugins.php'); ?>"><?php _e('插件管理'); ?></a></li>
+                            <li><a href="<?php $options->adminUrl('options-general.php'); ?>"><?php _e('系统设置'); ?></a>
+                            </li>
+                        <?php endif; ?>
                     <?php endif; ?>
                     <!--<li><a href="<?php $options->adminUrl('profile.php'); ?>"><?php _e('更新我的资料'); ?></a></li>-->
                 </ul>
-            
-                <h3><?php _e('统计信息'); ?></h3>
-                <div class="status">
-                    <p><?php _e('目前有 <em>%s</em> 篇 Blog, 并有 <em>%s</em> 条关于你的评论在已设定的 <em>%s</em> 个分类中.', 
-                    $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?></p>
-                    
-                    <p><?php 
-                    if ($user->logged > 0) {
-                        _e('最后登录: %s', Typecho_I18n::dateWord($user->logged  + $options->timezone, $options->gmtTime + $options->timezone));
-                    }
-                    ?></p>
-                </div>
             </div>
 
-            <div class="col-mb-12 col-tb-6 typecho-dashboard-main" role="complementary">
-                <section>
-                    <h3><?php _e('最近发表的文章'); ?></h3>
-                    <?php Typecho_Widget::widget('Widget_Contents_Post_Recent', 'pageSize=7')->to($posts); ?>
+            <div class="col-mb-12 col-tb-4" role="complementary">
+                <section class="latest-link">
+                    <h3><?php _e('最近发布的文章'); ?></h3>
+                    <?php \Widget\Contents\Post\Recent::alloc('pageSize=10')->to($posts); ?>
                     <ul>
-                    <?php if($posts->have()): ?>
-                    <?php while($posts->next()): ?>
-                        <li>
-                            <a href="<?php $posts->permalink(); ?>" class="title"><?php $posts->title(); ?></a>
-                            <span>- <?php $posts->dateWord(); ?></span>
-                        </li>
-                    <?php endwhile; ?>
-                    <?php else: ?>
-                        <li><em><?php _e('暂时没有文章'); ?></em></li>
-                    <?php endif; ?>
-                    </ul>
-                </section>
-
-            	<section>
-                    <h3><?php _e('最新得到的回复'); ?></h3>
-                    <ul>
-                        <?php Typecho_Widget::widget('Widget_Comments_Recent', 'pageSize=7')->to($comments); ?>
-                        <?php if($comments->have()): ?>
-                        <?php while($comments->next()): ?>
-                        <li>
-                            <a href="<?php $comments->permalink(); ?>" class="title"><?php $comments->title(); ?></a>
-                            <span>- <?php $comments->dateWord(); ?>, <?php $comments->author(true); ?></span>
-                        </li>
-                        <?php endwhile; ?>
+                        <?php if ($posts->have()): ?>
+                            <?php while ($posts->next()): ?>
+                                <li>
+                                    <span><?php $posts->date('n.j'); ?></span>
+                                    <a href="<?php $posts->permalink(); ?>" class="title"><?php $posts->title(); ?></a>
+                                </li>
+                            <?php endwhile; ?>
                         <?php else: ?>
-                        <li><em><?php _e('暂时没有回复'); ?></em></li>
+                            <li><em><?php _e('暂时没有文章'); ?></em></li>
                         <?php endif; ?>
                     </ul>
                 </section>
             </div>
 
-            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav" role="complementary">
-                <?php $version = Typecho_Cookie::get('__typecho_check_version'); ?>
-                <?php if ($version && $version['available']): ?>
-                <div class="update-check">
-                    <p>
-                        <?php _e('您当前使用的版本是'); ?> <?php echo $version['current']; ?><br>
-                        <strong><a href="<?php echo $version['link']; ?>"><?php _e('官方最新版本是'); ?> <?php echo $version['latest']; ?></a></strong>
-                    </p>
-                </div>
-                <?php endif; ?>
-                <h3><?php _e('官方消息'); ?></h3>
-                <div id="typecho-message" class="intro-link">
+            <div class="col-mb-12 col-tb-4" role="complementary">
+                <section class="latest-link">
+                    <h3><?php _e('最近得到的回复'); ?></h3>
                     <ul>
-                        <li><?php _e('读取中...'); ?></li>
+                        <?php \Widget\Comments\Recent::alloc('pageSize=10')->to($comments); ?>
+                        <?php if ($comments->have()): ?>
+                            <?php while ($comments->next()): ?>
+                                <li>
+                                    <span><?php $comments->date('n.j'); ?></span>
+                                    <a href="<?php $comments->permalink(); ?>"
+                                       class="title"><?php $comments->author(false); ?></a>:
+                                    <?php $comments->excerpt(35, '...'); ?>
+                                </li>
+                            <?php endwhile; ?>
+                        <?php else: ?>
+                            <li><?php _e('暂时没有回复'); ?></li>
+                        <?php endif; ?>
                     </ul>
-                </div>
+                </section>
+            </div>
+
+            <div class="col-mb-12 col-tb-4" role="complementary">
+                <section class="latest-link">
+                    <h3><?php _e('官方最新日志'); ?></h3>
+                    <div id="typecho-message">
+                        <ul>
+                            <li><?php _e('读取中...'); ?></li>
+                        </ul>
+                    </div>
+                </section>
             </div>
         </div>
     </div>
@@ -117,47 +110,46 @@ include 'common-js.php';
 ?>
 
 <script>
-$(document).ready(function () {
-    var ul = $('.intro-link ul'), cache = window.sessionStorage,
-        html = cache ? cache.getItem('feed') : '',
-        update = cache ? cache.getItem('update') : '';
-
-    if (!!html) {
-        ul.html(html);
-    } else {
-        html = '';
-        $.get('<?php $options->index('/action/ajax?do=feed'); ?>', function (o) {
-            for (var i = 0; i < o.length; i ++) {
-                var item = o[i];
-                html += '<li><a href="' + item.link + '" target="_blank">' + item.title 
-                    + '</a> <span>' + item.date + '</span></li>';
-            }
+    $(document).ready(function () {
+        var ul = $('#typecho-message ul'), cache = window.sessionStorage,
+            html = cache ? cache.getItem('feed') : '',
+            update = cache ? cache.getItem('update') : '';
 
+        if (!!html) {
             ul.html(html);
-            cache.setItem('feed', html);
-        }, 'json');
-    }
+        } else {
+            html = '';
+            $.get('<?php $options->index('/action/ajax?do=feed'); ?>', function (o) {
+                for (var i = 0; i < o.length; i++) {
+                    var item = o[i];
+                    html += '<li><span>' + item.date + '</span> <a href="' + item.link + '" target="_blank">' + item.title
+                        + '</a></li>';
+                }
 
-    function applyUpdate(update) {
-        if (update.available) {
-            $('<div class="update-check"><p>' 
-                + '<?php _e('您当前使用的版本是 %s'); ?>'.replace('%s', update.current) + '<br />'
-                + '<strong><a href="' + update.link + '" target="_blank">' 
-                + '<?php _e('官方最新版本是 %s'); ?>'.replace('%s', update.latest) + '</a></strong></p></div>')
-            .prependTo('.typecho-dashboard-nav').effect('highlight');
+                ul.html(html);
+                cache.setItem('feed', html);
+            }, 'json');
         }
-    }
 
-    if (!!update) {
-        applyUpdate($.parseJSON(update));
-    } else {
-        update = '';
-        $.get('<?php $options->index('/action/ajax?do=checkVersion'); ?>', function (o, status, resp) {
-            applyUpdate(o);
-            cache.setItem('update', resp.responseText);
-        }, 'json');
-    }
-});
+        function applyUpdate(update) {
+            if (update.available) {
+                $('<div class="update-check message error"><p>'
+                    + '<?php _e('您当前使用的版本是 %s'); ?>'.replace('%s', update.current) + '<br />'
+                    + '<strong><a href="' + update.link + '" target="_blank">'
+                    + '<?php _e('官方最新版本是 %s'); ?>'.replace('%s', update.latest) + '</a></strong></p></div>')
+                    .insertAfter('.typecho-page-title').effect('highlight');
+            }
+        }
+
+        if (!!update) {
+            applyUpdate($.parseJSON(update));
+        } else {
+            $.get('<?php $options->index('/action/ajax?do=checkVersion'); ?>', function (o, status, resp) {
+                applyUpdate(o);
+                cache.setItem('update', resp.responseText);
+            }, 'json');
+        }
+    });
 
 </script>
 <?php include 'footer.php'; ?>

admin/js/filedrop.js

@@ -1,557 +0,0 @@
-/*global jQuery:false, alert:false */
-
-/*
- * Default text - jQuery plugin for html5 dragging files from desktop to browser
- *
- * Author: Weixi Yen
- *
- * Email: [Firstname][Lastname]@gmail.com
- *
- * Copyright (c) 2010 Resopollution
- *
- * Licensed under the MIT license:
- *   http://www.opensource.org/licenses/mit-license.php
- *
- * Project home:
- *   http://www.github.com/weixiyen/jquery-filedrop
- *
- * Version:  0.1.0
- *
- * Features:
- *      Allows sending of extra parameters with file.
- *      Works with Firefox 3.6+
- *      Future-compliant with HTML5 spec (will work with Webkit browsers and IE9)
- * Usage:
- *  See README at project homepage
- *
- */
-;(function($) {
-
-  jQuery.event.props.push("dataTransfer");
-
-  var default_opts = {
-      fallback_id: '',
-      url: '',
-      refresh: 1000,
-      paramname: 'userfile',
-      requestType: 'POST',    // just in case you want to use another HTTP verb
-      allowedfileextensions:[],
-      allowedfiletypes:[],
-      maxfiles: 25,           // Ignored if queuefiles is set > 0
-      maxfilesize: 1,         // MB file size limit
-      queuefiles: 0,          // Max files before queueing (for large volume uploads)
-      queuewait: 200,         // Queue wait time if full
-      data: {},
-      headers: {},
-      drop: empty,
-      dragStart: empty,
-      dragEnter: empty,
-      dragOver: empty,
-      dragLeave: empty,
-      docEnter: empty,
-      docOver: empty,
-      docLeave: empty,
-      beforeEach: empty,
-      afterAll: empty,
-      rename: empty,
-      error: function(err, file, i, status) {
-        alert(err);
-      },
-      uploadOpened: empty,
-      uploadStarted: empty,
-      uploadFinished: empty,
-      progressUpdated: empty,
-      globalProgressUpdated: empty,
-      speedUpdated: empty
-      },
-      errors = ["BrowserNotSupported", "TooManyFiles", "FileTooLarge", "FileTypeNotAllowed", "NotFound", "NotReadable", "AbortError", "ReadError", "FileExtensionNotAllowed"];
-
-  $.fn.filedrop = function(options) {
-    var opts = $.extend({}, default_opts, options),
-        global_progress = [],
-        doc_leave_timer, stop_loop = false,
-        files_count = 0,
-        files;
-
-    $('#' + opts.fallback_id).css({
-      display: 'none',
-      width: 0,
-      height: 0
-    });
-
-    this.on('drop', drop).on('dragstart', opts.dragStart).on('dragenter', dragEnter).on('dragover', dragOver).on('dragleave', dragLeave);
-    $(document).on('drop', docDrop).on('dragenter', docEnter).on('dragover', docOver).on('dragleave', docLeave);
-
-    this.on('click', function(e){
-      $('#' + opts.fallback_id).trigger(e);
-    });
-
-    $('#' + opts.fallback_id).change(function(e) {
-      opts.drop(e);
-      files = e.target.files;
-      files_count = files.length;
-      upload();
-    });
-
-    function drop(e) {
-      if( opts.drop.call(this, e) === false ) return false;
-      if(!e.dataTransfer)
-        return;
-      files = e.dataTransfer.files;
-      if (files === null || files === undefined || files.length === 0) {
-        opts.error(errors[0]);
-        return false;
-      }
-      files_count = files.length;
-      upload();
-      e.preventDefault();
-      return false;
-    }
-
-    function getBuilder(filename, filedata, mime, boundary) {
-      var dashdash = '--',
-          crlf = '\r\n',
-          builder = '',
-          paramname = opts.paramname;
-
-      if (opts.data) {
-        var params = $.param(opts.data).replace(/\+/g, '%20').split(/&/);
-
-        $.each(params, function() {
-          var pair = this.split("=", 2),
-              name = decodeURIComponent(pair[0]),
-              val  = decodeURIComponent(pair[1]);
-
-          if (pair.length !== 2) {
-              return;
-          }
-
-          builder += dashdash;
-          builder += boundary;
-          builder += crlf;
-          builder += 'Content-Disposition: form-data; name="' + name + '"';
-          builder += crlf;
-          builder += crlf;
-          builder += val;
-          builder += crlf;
-        });
-      }
-
-      if (jQuery.isFunction(paramname)){
-        paramname = paramname(filename);
-      }
-
-      builder += dashdash;
-      builder += boundary;
-      builder += crlf;
-      builder += 'Content-Disposition: form-data; name="' + (paramname||"") + '"';
-      builder += '; filename="' + filename + '"';
-      builder += crlf;
-
-      builder += 'Content-Type: ' + mime;
-      builder += crlf;
-      builder += crlf;
-
-      builder += filedata;
-      builder += crlf;
-
-      builder += dashdash;
-      builder += boundary;
-      builder += dashdash;
-      builder += crlf;
-      return builder;
-    }
-
-    function progress(e) {
-      if (e.lengthComputable) {
-        var percentage = Math.round((e.loaded * 100) / e.total);
-        if (this.currentProgress !== percentage) {
-
-          this.currentProgress = percentage;
-          opts.progressUpdated(this.index, this.file, this.currentProgress);
-
-          global_progress[this.global_progress_index] = this.currentProgress;
-          globalProgress();
-
-          var elapsed = new Date().getTime();
-          var diffTime = elapsed - this.currentStart;
-          if (diffTime >= opts.refresh) {
-            var diffData = e.loaded - this.startData;
-            var speed = diffData / diffTime; // KB per second
-            opts.speedUpdated(this.index, this.file, speed);
-            this.startData = e.loaded;
-            this.currentStart = elapsed;
-          }
-        }
-      }
-    }
-
-    function globalProgress() {
-      if (global_progress.length === 0) {
-        return;
-      }
-
-      var total = 0, index;
-      for (index in global_progress) {
-        if(global_progress.hasOwnProperty(index)) {
-          total = total + global_progress[index];
-        }
-      }
-
-      opts.globalProgressUpdated(Math.round(total / global_progress.length));
-    }
-
-    // Respond to an upload
-    function upload() {
-      stop_loop = false;
-
-      if (!files) {
-        opts.error(errors[0]);
-        return false;
-      }
-
-      if (opts.allowedfiletypes.push && opts.allowedfiletypes.length) {
-        for(var fileIndex = files.length;fileIndex--;) {
-          if(!files[fileIndex].type || $.inArray(files[fileIndex].type, opts.allowedfiletypes) < 0) {
-            opts.error(errors[3], files[fileIndex]);
-            return false;
-          }
-        }
-      }
-
-      if (opts.allowedfileextensions.push && opts.allowedfileextensions.length) {
-        for(var fileIndex = files.length;fileIndex--;) {
-          var allowedextension = false;
-          for (i=0;i<opts.allowedfileextensions.length;i++){
-            if (files[fileIndex].name.substr(files[fileIndex].name.length-opts.allowedfileextensions[i].length) == opts.allowedfileextensions[i]) {
-              allowedextension = true;
-            }
-          }
-          if (!allowedextension){
-            opts.error(errors[8], files[fileIndex]);
-            return false;
-          }
-        }
-      }
-
-      var filesDone = 0,
-          filesRejected = 0;
-
-      if (files_count > opts.maxfiles && opts.queuefiles === 0) {
-        opts.error(errors[1]);
-        return false;
-      }
-
-      // Define queues to manage upload process
-      var workQueue = [];
-      var processingQueue = [];
-      var doneQueue = [];
-
-      // Add everything to the workQueue
-      for (var i = 0; i < files_count; i++) {
-        workQueue.push(i);
-        opts.uploadOpened(i, files[i]);
-      }
-
-      // Helper function to enable pause of processing to wait
-      // for in process queue to complete
-      var pause = function(timeout) {
-        setTimeout(process, timeout);
-        return;
-      };
-
-      // Process an upload, recursive
-      var process = function() {
-
-        var fileIndex;
-
-        if (stop_loop) {
-          return false;
-        }
-
-        // Check to see if are in queue mode
-        if (opts.queuefiles > 0 && processingQueue.length >= opts.queuefiles) {
-          return pause(opts.queuewait);
-        } else {
-          // Take first thing off work queue
-          fileIndex = workQueue[0];
-          workQueue.splice(0, 1);
-
-          // Add to processing queue
-          processingQueue.push(fileIndex);
-        }
-
-        try {
-          if (beforeEach(files[fileIndex]) !== false) {
-            if (fileIndex === files_count) {
-              return;
-            }
-            var reader = new FileReader(),
-                max_file_size = 1048576 * opts.maxfilesize;
-
-            reader.index = fileIndex;
-            if (files[fileIndex].size > max_file_size) {
-              opts.error(errors[2], files[fileIndex], fileIndex);
-              // Remove from queue
-              processingQueue.forEach(function(value, key) {
-                if (value === fileIndex) {
-                  processingQueue.splice(key, 1);
-                }
-              });
-              filesRejected++;
-              return true;
-            }
-
-            reader.onerror = function(e) {
-                switch(e.target.error.code) {
-                    case e.target.error.NOT_FOUND_ERR:
-                        opts.error(errors[4]);
-                        return false;
-                    case e.target.error.NOT_READABLE_ERR:
-                        opts.error(errors[5]);
-                        return false;
-                    case e.target.error.ABORT_ERR:
-                        opts.error(errors[6]);
-                        return false;
-                    default:
-                        opts.error(errors[7]);
-                        return false;
-                };
-            };
-
-            reader.onloadend = !opts.beforeSend ? send : function (e) {
-              opts.beforeSend(files[fileIndex], fileIndex, function () { send(e); });
-            };
-
-            reader.readAsDataURL(files[fileIndex]);
-
-          } else {
-            filesRejected++;
-          }
-        } catch (err) {
-          // Remove from queue
-          processingQueue.forEach(function(value, key) {
-            if (value === fileIndex) {
-              processingQueue.splice(key, 1);
-            }
-          });
-          opts.error(errors[0]);
-          return false;
-        }
-
-        // If we still have work to do,
-        if (workQueue.length > 0) {
-          process();
-        }
-      };
-
-      var send = function(e) {
-
-        var fileIndex = (e.srcElement || e.target).index;
-
-        // Sometimes the index is not attached to the
-        // event object. Find it by size. Hack for sure.
-        if (e.target.index === undefined) {
-          e.target.index = getIndexBySize(e.total);
-        }
-
-        var xhr = new XMLHttpRequest(),
-            upload = xhr.upload,
-            file = files[e.target.index],
-            index = e.target.index,
-            start_time = new Date().getTime(),
-            boundary = '------multipartformboundary' + (new Date()).getTime(),
-            global_progress_index = global_progress.length,
-            builder,
-            newName = rename(file.name),
-            mime = file.type;
-
-        if (opts.withCredentials) {
-          xhr.withCredentials = opts.withCredentials;
-        }
-
-        var data = atob(e.target.result.split(',')[1]);
-        if (typeof newName === "string") {
-          builder = getBuilder(newName, data, mime, boundary);
-        } else {
-          builder = getBuilder(file.name, data, mime, boundary);
-        }
-
-        upload.index = index;
-        upload.file = file;
-        upload.downloadStartTime = start_time;
-        upload.currentStart = start_time;
-        upload.currentProgress = 0;
-        upload.global_progress_index = global_progress_index;
-        upload.startData = 0;
-        upload.addEventListener("progress", progress, false);
-
-        // Allow url to be a method
-        if (jQuery.isFunction(opts.url)) {
-            xhr.open(opts.requestType, opts.url(), true);
-        } else {
-            xhr.open(opts.requestType, opts.url, true);
-        }
-
-        xhr.setRequestHeader('content-type', 'multipart/form-data; boundary=' + boundary);
-        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-
-        // Add headers
-        $.each(opts.headers, function(k, v) {
-          xhr.setRequestHeader(k, v);
-        });
-
-        xhr.sendAsBinary(builder);
-
-        global_progress[global_progress_index] = 0;
-        globalProgress();
-
-        opts.uploadStarted(index, file, files_count);
-
-        xhr.onload = function() {
-            var serverResponse = null;
-
-            if (xhr.responseText) {
-              try {
-                serverResponse = jQuery.parseJSON(xhr.responseText);
-              }
-              catch (e) {
-                serverResponse = xhr.responseText;
-              }
-            }
-
-            var now = new Date().getTime(),
-                timeDiff = now - start_time,
-                result = opts.uploadFinished(index, file, serverResponse, timeDiff, xhr);
-            filesDone++;
-
-            // Remove from processing queue
-            processingQueue.forEach(function(value, key) {
-              if (value === fileIndex) {
-                processingQueue.splice(key, 1);
-              }
-            });
-
-            // Add to donequeue
-            doneQueue.push(fileIndex);
-
-            // Make sure the global progress is updated
-            global_progress[global_progress_index] = 100;
-            globalProgress();
-
-            if (filesDone === (files_count - filesRejected)) {
-              afterAll();
-            }
-            if (result === false) {
-              stop_loop = true;
-            }
-
-
-          // Pass any errors to the error option
-          if (xhr.status < 200 || xhr.status > 299) {
-            opts.error(xhr.statusText, file, fileIndex, xhr.status);
-          }
-        };
-      };
-
-      // Initiate the processing loop
-      process();
-    }
-
-    function getIndexBySize(size) {
-      for (var i = 0; i < files_count; i++) {
-        if (files[i].size === size) {
-          return i;
-        }
-      }
-
-      return undefined;
-    }
-
-    function rename(name) {
-      return opts.rename(name);
-    }
-
-    function beforeEach(file) {
-      return opts.beforeEach(file);
-    }
-
-    function afterAll() {
-      return opts.afterAll();
-    }
-
-    function dragEnter(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.dragEnter.call(this, e);
-    }
-
-    function dragOver(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.docOver.call(this, e);
-      opts.dragOver.call(this, e);
-    }
-
-    function dragLeave(e) {
-      clearTimeout(doc_leave_timer);
-      opts.dragLeave.call(this, e);
-      e.stopPropagation();
-    }
-
-    function docDrop(e) {
-      e.preventDefault();
-      opts.docLeave.call(this, e);
-      return false;
-    }
-
-    function docEnter(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.docEnter.call(this, e);
-      return false;
-    }
-
-    function docOver(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.docOver.call(this, e);
-      return false;
-    }
-
-    function docLeave(e) {
-      doc_leave_timer = setTimeout((function(_this) {
-        return function() {
-          opts.docLeave.call(_this, e);
-        };
-      })(this), 200);
-    }
-
-    return this;
-  };
-
-  function empty() {}
-
-  try {
-    if (XMLHttpRequest.prototype.sendAsBinary) {
-        return;
-    }
-    XMLHttpRequest.prototype.sendAsBinary = function(datastr) {
-      function byteValue(x) {
-        return x.charCodeAt(0) & 0xff;
-      }
-      var ords = Array.prototype.map.call(datastr, byteValue);
-      var ui8a = new Uint8Array(ords);
-
-      // Not pretty: Chrome 22 deprecated sending ArrayBuffer, moving instead
-      // to sending ArrayBufferView.  Sadly, no proper way to detect this
-      // functionality has been discovered.  Happily, Chrome 22 also introduced
-      // the base ArrayBufferView class, not present in Chrome 21.
-      if ('ArrayBufferView' in window)
-        this.send(ui8a);
-      else
-        this.send(ui8a.buffer);
-    };
-  } catch (e) {}
-
-})(jQuery);

admin/js/html5shiv.js

@@ -1,301 +0,0 @@
-/**
-* @preserve HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-;(function(window, document) {
-/*jshint evil:true */
-  /** version */
-  var version = '3.7.0';
-
-  /** Preset options */
-  var options = window.html5 || {};
-
-  /** Used to skip problem elements */
-  var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
-
-  /** Not all elements can be cloned in IE **/
-  var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
-
-  /** Detect whether the browser supports default html5 styles */
-  var supportsHtml5Styles;
-
-  /** Name of the expando, to work with multiple documents or to re-shiv one document */
-  var expando = '_html5shiv';
-
-  /** The id for the the documents expando */
-  var expanID = 0;
-
-  /** Cached data for each document */
-  var expandoData = {};
-
-  /** Detect whether the browser supports unknown elements */
-  var supportsUnknownElements;
-
-  (function() {
-    try {
-        var a = document.createElement('a');
-        a.innerHTML = '<xyz></xyz>';
-        //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
-        supportsHtml5Styles = ('hidden' in a);
-
-        supportsUnknownElements = a.childNodes.length == 1 || (function() {
-          // assign a false positive if unable to shiv
-          (document.createElement)('a');
-          var frag = document.createDocumentFragment();
-          return (
-            typeof frag.cloneNode == 'undefined' ||
-            typeof frag.createDocumentFragment == 'undefined' ||
-            typeof frag.createElement == 'undefined'
-          );
-        }());
-    } catch(e) {
-      // assign a false positive if detection fails => unable to shiv
-      supportsHtml5Styles = true;
-      supportsUnknownElements = true;
-    }
-
-  }());
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * Creates a style sheet with the given CSS text and adds it to the document.
-   * @private
-   * @param {Document} ownerDocument The document.
-   * @param {String} cssText The CSS text.
-   * @returns {StyleSheet} The style element.
-   */
-  function addStyleSheet(ownerDocument, cssText) {
-    var p = ownerDocument.createElement('p'),
-        parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
-
-    p.innerHTML = 'x<style>' + cssText + '</style>';
-    return parent.insertBefore(p.lastChild, parent.firstChild);
-  }
-
-  /**
-   * Returns the value of `html5.elements` as an array.
-   * @private
-   * @returns {Array} An array of shived element node names.
-   */
-  function getElements() {
-    var elements = html5.elements;
-    return typeof elements == 'string' ? elements.split(' ') : elements;
-  }
-
-    /**
-   * Returns the data associated to the given document
-   * @private
-   * @param {Document} ownerDocument The document.
-   * @returns {Object} An object of data.
-   */
-  function getExpandoData(ownerDocument) {
-    var data = expandoData[ownerDocument[expando]];
-    if (!data) {
-        data = {};
-        expanID++;
-        ownerDocument[expando] = expanID;
-        expandoData[expanID] = data;
-    }
-    return data;
-  }
-
-  /**
-   * returns a shived element for the given nodeName and document
-   * @memberOf html5
-   * @param {String} nodeName name of the element
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived element.
-   */
-  function createElement(nodeName, ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createElement(nodeName);
-    }
-    if (!data) {
-        data = getExpandoData(ownerDocument);
-    }
-    var node;
-
-    if (data.cache[nodeName]) {
-        node = data.cache[nodeName].cloneNode();
-    } else if (saveClones.test(nodeName)) {
-        node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
-    } else {
-        node = data.createElem(nodeName);
-    }
-
-    // Avoid adding some elements to fragments in IE < 9 because
-    // * Attributes like `name` or `type` cannot be set/changed once an element
-    //   is inserted into a document/fragment
-    // * Link elements with `src` attributes that are inaccessible, as with
-    //   a 403 response, will cause the tab/window to crash
-    // * Script elements appended to fragments will execute when their `src`
-    //   or `text` property is set
-    return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node;
-  }
-
-  /**
-   * returns a shived DocumentFragment for the given document
-   * @memberOf html5
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived DocumentFragment.
-   */
-  function createDocumentFragment(ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createDocumentFragment();
-    }
-    data = data || getExpandoData(ownerDocument);
-    var clone = data.frag.cloneNode(),
-        i = 0,
-        elems = getElements(),
-        l = elems.length;
-    for(;i<l;i++){
-        clone.createElement(elems[i]);
-    }
-    return clone;
-  }
-
-  /**
-   * Shivs the `createElement` and `createDocumentFragment` methods of the document.
-   * @private
-   * @param {Document|DocumentFragment} ownerDocument The document.
-   * @param {Object} data of the document.
-   */
-  function shivMethods(ownerDocument, data) {
-    if (!data.cache) {
-        data.cache = {};
-        data.createElem = ownerDocument.createElement;
-        data.createFrag = ownerDocument.createDocumentFragment;
-        data.frag = data.createFrag();
-    }
-
-
-    ownerDocument.createElement = function(nodeName) {
-      //abort shiv
-      if (!html5.shivMethods) {
-          return data.createElem(nodeName);
-      }
-      return createElement(nodeName, ownerDocument, data);
-    };
-
-    ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
-      'var n=f.cloneNode(),c=n.createElement;' +
-      'h.shivMethods&&(' +
-        // unroll the `createElement` calls
-        getElements().join().replace(/[\w\-]+/g, function(nodeName) {
-          data.createElem(nodeName);
-          data.frag.createElement(nodeName);
-          return 'c("' + nodeName + '")';
-        }) +
-      ');return n}'
-    )(html5, data.frag);
-  }
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * Shivs the given document.
-   * @memberOf html5
-   * @param {Document} ownerDocument The document to shiv.
-   * @returns {Document} The shived document.
-   */
-  function shivDocument(ownerDocument) {
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    var data = getExpandoData(ownerDocument);
-
-    if (html5.shivCSS && !supportsHtml5Styles && !data.hasCSS) {
-      data.hasCSS = !!addStyleSheet(ownerDocument,
-        // corrects block display not defined in IE6/7/8/9
-        'article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}' +
-        // adds styling not present in IE6/7/8/9
-        'mark{background:#FF0;color:#000}' +
-        // hides non-rendered elements
-        'template{display:none}'
-      );
-    }
-    if (!supportsUnknownElements) {
-      shivMethods(ownerDocument, data);
-    }
-    return ownerDocument;
-  }
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * The `html5` object is exposed so that more elements can be shived and
-   * existing shiving can be detected on iframes.
-   * @type Object
-   * @example
-   *
-   * // options can be changed before the script is included
-   * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };
-   */
-  var html5 = {
-
-    /**
-     * An array or space separated string of node names of the elements to shiv.
-     * @memberOf html5
-     * @type Array|String
-     */
-    'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video',
-
-    /**
-     * current version of html5shiv
-     */
-    'version': version,
-
-    /**
-     * A flag to indicate that the HTML5 style sheet should be inserted.
-     * @memberOf html5
-     * @type Boolean
-     */
-    'shivCSS': (options.shivCSS !== false),
-
-    /**
-     * Is equal to true if a browser supports creating unknown/HTML5 elements
-     * @memberOf html5
-     * @type boolean
-     */
-    'supportsUnknownElements': supportsUnknownElements,
-
-    /**
-     * A flag to indicate that the document's `createElement` and `createDocumentFragment`
-     * methods should be overwritten.
-     * @memberOf html5
-     * @type Boolean
-     */
-    'shivMethods': (options.shivMethods !== false),
-
-    /**
-     * A string to describe the type of `html5` object ("default" or "default print").
-     * @memberOf html5
-     * @type String
-     */
-    'type': 'default',
-
-    // shivs the document according to the specified `html5` object options
-    'shivDocument': shivDocument,
-
-    //creates a shived element
-    createElement: createElement,
-
-    //creates a shived documentFragment
-    createDocumentFragment: createDocumentFragment
-  };
-
-  /*--------------------------------------------------------------------------*/
-
-  // expose html5
-  window.html5 = html5;
-
-  // shiv the document
-  shivDocument(document);
-
-}(this, document));