From e6697248acad24e0171ed7f31a3d40565b461d4c Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Fri, 18 Oct 2013 15:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7markdown?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/js/markdown.js         |  2 +-
 admin/write-js.php           | 49 ++++++++++++++++++++++++++++++++++++
 admin/write-page.php         |  2 --
 admin/write-post.php         | 16 ------------
 var/Typecho/Common.php       |  2 +-
 var/Widget/Users/Profile.php |  2 +-
 6 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/admin/js/markdown.js b/admin/js/markdown.js
index 35413378..0ebed704 100644
--- a/admin/js/markdown.js
+++ b/admin/js/markdown.js
@@ -3314,7 +3314,7 @@ else
     function PanelCollection(postfix) {
         this.buttonBar = doc.getElementById("wmd-button-bar" + postfix);
         this.preview = doc.getElementById("wmd-preview" + postfix);
-        this.input = doc.getElementById("wmd-input" + postfix);
+        this.input = doc.getElementById("text");
     };
 
     // Returns true if the DOM element is visible, false if it's hidden.
diff --git a/admin/write-js.php b/admin/write-js.php
index 87a74f56..9d1ef9ca 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -156,4 +156,53 @@ $(document).ready(function() {
     
 });
 </script>
+<?php $content = !empty($post) ? $post : $page; if ($options->markdown && (!$content->have() || $content->isMarkdown)): ?>
+<script src="<?php $options->adminUrl('js/markdown.js?v=' . $suffixVersion); ?>"></script>
+<script>
+$(document).ready(function () {
+    var toolbar = $('<p class="editor" id="wmd-button-bar" />').insertBefore($('#text').parent())
+        preview = $('<div id="wmd-preview" />').insertAfter('.submit');
+
+    var converter = new Showdown.converter(), options = {};
+
+    options.strings = {
+        bold: '<?php _e('加粗'); ?> <strong> Ctrl+B',
+        boldexample: '<?php _e('加粗文字'); ?>',
+            
+        italic: '<?php _e('斜体'); ?> <em> Ctrl+I',
+        italicexample: '<?php _e('斜体文字'); ?>',
+
+        link: '<?php _e('链接'); ?> <a> Ctrl+L',
+        linkdescription: '<?php _e('请输入链接描述'); ?>',
+
+        quote:  '<?php _e('引用'); ?> <blockquote> Ctrl+Q',
+        quoteexample: '<?php _e('引用文字'); ?>',
+
+        code: '<?php _e('代码'); ?> <pre><code> Ctrl+K',
+        codeexample: '<?php _e('请输入代码'); ?>',
+
+        image: '<?php _e('图片'); ?> <img> Ctrl+G',
+        imagedescription: '<?php _e('请输入图片描述'); ?>',
+
+        olist: '<?php _e('数字列表'); ?> <ol> Ctrl+O',
+        ulist: '<?php _e('普通列表'); ?> <ul> Ctrl+U',
+        litem: '<?php _e('列表项目'); ?>',
+
+        heading: '<?php _e('标题'); ?> <h1>/<h2> Ctrl+H',
+        headingexample: '<?php _e('标题文字'); ?>',
+
+        hr: '<?php _e('分割线'); ?> <hr> Ctrl+R',
+
+        undo: '<?php _e('撤销'); ?> - Ctrl+Z',
+        redo: '<?php _e('重做'); ?> - Ctrl+Y',
+        redomac: '<?php _e('重做'); ?> - Ctrl+Shift+Z',
+
+        help: '<?php _e('Markdown语法帮助'); ?>'
+    };
+
+    var editor = new Markdown.Editor(converter, '', options);
+    editor.run();
+});
+</script>
+<?php endif; ?>
 
diff --git a/admin/write-page.php b/admin/write-page.php
index 8037c0c0..5e03700d 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -41,8 +41,6 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                             <button type="submit" name="do" value="publish" class="primary" id="btn-submit"><?php _e('发布页面'); ?></button>
                         </span>
                     </p>
-                        
-                    <div id="typecho-preview-box"></div>
                 </div>
                 <div class="col-mb-12 col-tb-3">
                         <section  class="typecho-post-option">
diff --git a/admin/write-post.php b/admin/write-post.php
index 0e85323c..a4497a63 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -27,21 +27,6 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                     <p class="mono url-slug"><?php echo preg_replace("/\[slug:?[_0-9a-z-:]*\]/i", $input, $permalink); ?></p>
                     <?php endif; ?>
 
-                    <p class="editor">
-                        <span class="btnBold">bold</span><!--
-                        --><span class="btnItalic">italic</span><!--
-                        --><span class="btnLink">link</span><!--
-                        --><span class="btnQuote">quote</span><!--
-                        --><span class="btnDel">del</span><!--
-                        --><span class="btnImg">img</span><!--
-                        --><span class="btnUl">ul</span><!--
-                        --><span class="btnOl">ol</span><!--
-                        --><span class="btnHeading">title</span><!--
-                        --><span class="btnCode">code</span><!--
-                        --><span class="btnPre">pre</span><!--
-                        --><span class="btnMore">more</span><!--
-                        --><span class="btnHr">hr</span>
-                    </p>
                     <p>
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($post->text); ?></textarea>
                         <span id="auto-save-message"></span>
@@ -57,7 +42,6 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                             <button type="submit" name="do" value="publish" class="primary" id="btn-submit"><?php _e('发布文章'); ?></button>
                         </span>
                     </p>
-                    <!-- <div id="typecho-preview-box">预览</div> -->
                 </div>
                 <div class="col-mb-12 col-tb-3">
                     <section class="typecho-post-option">
diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php
index 939308eb..4cf54feb 100644
--- a/var/Typecho/Common.php
+++ b/var/Typecho/Common.php
@@ -20,7 +20,7 @@
 class Typecho_Common
 {
     /** 程序版本 */
-    const VERSION = '0.9/13.10.8';
+    const VERSION = '0.9/13.10.18';
 
     /**
      * 缓存的包含路径
diff --git a/var/Widget/Users/Profile.php b/var/Widget/Users/Profile.php
index 29856ff7..0ec9f9c6 100644
--- a/var/Widget/Users/Profile.php
+++ b/var/Widget/Users/Profile.php
@@ -271,7 +271,7 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface
     public function updateOptions()
     {
         $settings['autoSave'] = $this->request->autoSave ? 1 : 0;
-        //$settings['useRichEditor'] = $this->request->useRichEditor;
+        $settings['markdown'] = $this->request->markdown ? 1 : 0;
 
         $settings['defaultAllowComment'] = is_array($this->request->defaultAllow)
         && in_array('comment', $this->request->defaultAllow) ? 1 : 0;