修正后台主页载入官方消息和自动检测版本

fixed #6
fixed #10

admin/file-upload-js.php

@@ -174,7 +174,7 @@ $(document).ready(function() {
     }
 
     function attachDeleteEvent (el) {
-        var file = $('a.file', el).text();
+        var file = $('a.insert', el).text();
         $('.delete', el).click(function () {
             if (confirm('<?php _e('确认要删除文件 %s 吗?'); ?>'.replace('%s', file))) {
                 var cid = $(this).parents('li').data('cid');

admin/index.php

@@ -101,21 +101,9 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                 </div>
                 <?php endif; ?>
                 <h3><?php _e('官方消息'); ?></h3>
-                <?php $feed = Typecho_Cookie::get('__typecho_feed'); ?>
                 <div id="typecho-message" class="intro-link">
                     <ul>
-                        <?php if (empty($feed)): ?>
                         <li><?php _e('读取中...'); ?></li>
-                        <?php else: ?>
-                        <?php $feed = Typecho_Json::decode($feed);
-                        foreach ($feed as $item): ?>
-                        <?php $item = (array) $item; ?>
-                        <li>
-                            <a href="<?php echo $item['link']; ?>"><?php echo $item['title']; ?></a>
-                            <br><span><?php echo $item['date']; ?></span>
-                        </li>
-                        <?php endforeach; ?>
-                        <?php endif; ?>
                     </ul>
                 </div>
             </div>
@@ -129,41 +117,45 @@ include 'common-js.php';
 ?>
 
 <script>
-    (function () {
-        window.addEvent('domready', function() {
-            <?php if (!Typecho_Cookie::get('__typecho_feed')): ?>
-            var _feedRequest = new Request.JSON({url: '<?php $options->index('/action/ajax'); ?>'}).send("do=feed");
-            _feedRequest.addEvent('onSuccess', function (responseJSON) {
-                $(document).getElement('#typecho-message ul li').destroy();
-                
-                if (responseJSON) {
-                    responseJSON.each(function (item) {
-                        var _li = document.createElement('li');
-                        $(_li).set('html', '<a target="_blank" href="' + item.link + '">' + item.title + '</a> - <span class="date">' + item.date + '</span>');
-                        var _ul = $(document).getElement('#typecho-message ul');
-                        _ul.appendChild(_li);
-                    });
-                }
-            });
-            <?php endif; ?>
-            
-            <?php if ($user->pass('editor', true) && !Typecho_Cookie::get('__typecho_check_version')): ?>
-            var _checkVersionRequest = new Request.JSON({url: '<?php $options->index('/action/ajax'); ?>'}).send("do=checkVersion");
-            _checkVersionRequest.addEvent('onSuccess', function (responseJSON) {
-                if (responseJSON && responseJSON.available) {
-                    var _div = document.createElement('div', {
-                        'class' : 'update-check typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright',
-                        'html'  : '<p class="current"><?php _e('您当前使用的版本是'); ?> <em>' + responseJSON.current + '</em></p>' +
-                        '<p class="latest"><a target="_blank" href="' + responseJSON.link + '"><?php _e('官方最新版本是'); ?> <em>' + responseJSON.latest + '</em></a></p>'
-                    });
-                    
-                    $(_div).fade('hide');
-                    $(document).getElement('.start-19').insertBefore(_div, $(document).getElement('.start-19 h3'));
-                    $(_div).fade('in');
-                }
-            });
-            <?php endif; ?>
+$(document).ready(function () {
+    var ul = $('.intro-link ul'), html = $.cookie('__typecho_feed'), update = $.cookie('__typecho_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>';
+            }
+
+            ul.html(html);
+            $.cookie('__typecho_feed', html);
         });
-    })();
+    }
+
+    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');
+        }
+    }
+
+    if (!!update) {
+        applyUpdate($.parseJSON(update));
+    } else {
+        update = '';
+        $.get('<?php $options->index('/action/ajax?do=checkVersion'); ?>', function (o, status, resp) {
+            applyUpdate(o);
+            $.cookie('__typecho_update', resp.responseText);
+        });
+    }
+});
+
 </script>
 <?php include 'footer.php'; ?>

admin/js/tokeninput.js

@@ -271,6 +271,9 @@ $.TokenList = function (input, url_or_data, settings) {
                     add_token($(selected_dropdown_item).data("tokeninput"));
                     hidden_input.change();
                     return false;
+                  } else {
+                    add_token(null);
+                    return false;
                   }
                     
                   break;
@@ -491,7 +494,7 @@ $.TokenList = function (input, url_or_data, settings) {
         var callback = settings.onAdd;
 
         // fix null bug
-        if (!item) {
+        if (!item && input_box.val().length > 0) {
             item = {
                 id  :   input_box.val()
             };

admin/manage-metas.php

@@ -90,7 +90,7 @@ include 'menu.php';
                         <div class="btn-group btn-drop">
                         <button class="dropdown-toggle btn-s" type="button" href="">选中项 <i class="i-caret-down"></i></button>
                         <ul class="dropdown-menu">
-                            <li><a lang="<?php _e('此标签下的所有内容将被删除, 你确认要删除这些标签吗?'); ?>" href="<?php $options->index('/action/metas-tag-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+                            <li><a lang="<?php _e('你确认要删除这些标签吗?'); ?>" href="<?php $options->index('/action/metas-tag-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
                             <li><a lang="<?php _e('刷新标签可能需要等待较长时间, 你确认要刷新这些标签吗?'); ?>" href="<?php $options->index('/action/metas-tag-edit?do=refresh'); ?>"><?php _e('刷新'); ?></a></li>
                             <li class="multiline">
                                 <button type="button" class="merge" rel="<?php $options->index('/action/metas-tag-edit?do=merge'); ?>"><?php _e('合并到'); ?></button>

var/Widget/Ajax.php

@@ -67,7 +67,6 @@ class Widget_Ajax extends Widget_Abstract_Options implements Widget_Interface_Do
                 }
             }
 
-            Typecho_Cookie::set('__typecho_check_version', $result);
             $this->response->throwJson($result);
             return;
         }
@@ -110,10 +109,6 @@ class Widget_Ajax extends Widget_Abstract_Options implements Widget_Interface_Do
                 }
             }
             
-            if (!empty($data)) {
-                Typecho_Cookie::set('__typecho_feed', Typecho_Json::encode($data));
-            }
-            
             $this->response->throwJson($data);
             return;
         }