Merge branch 'master' of https://github.com/typecho/typecho

Conflicts:
	admin/editor-js.php

admin/editor-js.php

@@ -173,14 +173,19 @@ $(document).ready(function () {
             + '<i class="i-upload"><?php _e('附件'); ?></i></button>')
             .prependTo('.submit .right')
             .click(function() {
-                $(this).toggleClass('active');
+                $('a', $('.typecho-option-tabs li').not('.active')).trigger('click');
                 $(this).find('i').toggleClass('i-upload-active');
-                $('.tab-content').toggleClass('hidden');
-                $('.typecho-option-tabs li').toggleClass('active');
-
                 return false;
             });
 
+    $('.typecho-option-tabs li').click(function () {
+        if ($('#tab-files-btn', this).length) {
+            uploadBtn.addClass('active');
+        } else {
+            uploadBtn.removeClass('active');
+        }
+    });
+
     editor.hooks.chain('enterFakeFullScreen', function () {
         th = textarea.height();
         ph = preview.height();