fix editor

admin/editor-js.php

@@ -1,20 +0,0 @@
-<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<script type="text/javascript">
-    var textEditor = new Typecho.textarea('#text', {
-        autoSaveTime: 30,
-        resizeAble: true,
-        autoSave: <?php echo ($options->autoSave ? 'true' : 'false'); ?>,
-        autoSaveMessageElement: 'auto-save-message',
-        autoSaveLeaveMessage: '<?php _e('您的内容尚未保存, 是否离开此页面?'); ?>',
-        resizeUrl: '<?php $options->index('/action/ajax'); ?>'
-    });
-
-    /** 这两个函数在插件中必须实现 */
-    var insertImageToEditor = function (title, url, link, cid) {
-        textEditor.setContent('<a href="' + link + '" title="' + title + '"><img src="' + url + '" alt="' + title + '" /></a>', '');
-    };
-    
-    var insertLinkToEditor = function (title, url, link, cid) {
-        textEditor.setContent('<a href="' + url + '" title="' + title + '">' + title + '</a>', '');
-    };
-</script>

admin/javascript/tokeninput.js

@@ -186,9 +186,9 @@ $.TokenList = function (input, url_or_data, settings) {
 
     // Create a new text input an attach keyup events
     var input_box = $("<input type=\"text\"  autocomplete=\"off\">")
-        .css({
-            outline: "none"
-        })
+    //    .css({
+    //        outline: "none"
+    //    })
         .attr("id", settings.idPrefix + input.id)
         .focus(function () {
             if (settings.tokenLimit === null || settings.tokenLimit !== token_count) {
@@ -199,7 +199,7 @@ $.TokenList = function (input, url_or_data, settings) {
             hide_dropdown();
             $(this).val("");
         })
-        .bind("keyup keydown blur update", resize_input)
+    //    .bind("keyup keydown blur update", resize_input)
         .keydown(function (event) {
             var previous_token;
             var next_token;

admin/javascript/typecho.js

@@ -546,3 +546,342 @@ jQuery.fn.extend(
 );
 })($);
 
+/*
+	Masked Input plugin for jQuery
+	Copyright (c) 2007-2013 Josh Bush (digitalbush.com)
+	Licensed under the MIT license (http://digitalbush.com/projects/masked-input-plugin/#license)
+	Version: 1.3.1
+*/
+(function($) {
+	function getPasteEvent() {
+    var el = document.createElement('input'),
+        name = 'onpaste';
+    el.setAttribute(name, '');
+    return (typeof el[name] === 'function')?'paste':'input';             
+}
+
+var pasteEventName = getPasteEvent() + ".mask",
+	ua = navigator.userAgent,
+	iPhone = /iphone/i.test(ua),
+	android=/android/i.test(ua),
+	caretTimeoutId;
+
+$.mask = {
+	//Predefined character definitions
+	definitions: {
+		'9': "[0-9]",
+		'a': "[A-Za-z]",
+		'*': "[A-Za-z0-9]"
+	},
+	dataName: "rawMaskFn",
+	placeholder: '_',
+};
+
+$.fn.extend({
+	//Helper Function for Caret positioning
+	caret: function(begin, end) {
+		var range;
+
+		if (this.length === 0 || this.is(":hidden")) {
+			return;
+		}
+
+		if (typeof begin == 'number') {
+			end = (typeof end === 'number') ? end : begin;
+			return this.each(function() {
+				if (this.setSelectionRange) {
+					this.setSelectionRange(begin, end);
+				} else if (this.createTextRange) {
+					range = this.createTextRange();
+					range.collapse(true);
+					range.moveEnd('character', end);
+					range.moveStart('character', begin);
+					range.select();
+				}
+			});
+		} else {
+			if (this[0].setSelectionRange) {
+				begin = this[0].selectionStart;
+				end = this[0].selectionEnd;
+			} else if (document.selection && document.selection.createRange) {
+				range = document.selection.createRange();
+				begin = 0 - range.duplicate().moveStart('character', -100000);
+				end = begin + range.text.length;
+			}
+			return { begin: begin, end: end };
+		}
+	},
+	unmask: function() {
+		return this.trigger("unmask");
+	},
+	mask: function(mask, settings) {
+		var input,
+			defs,
+			tests,
+			partialPosition,
+			firstNonMaskPos,
+			len;
+
+		if (!mask && this.length > 0) {
+			input = $(this[0]);
+			return input.data($.mask.dataName)();
+		}
+		settings = $.extend({
+			placeholder: $.mask.placeholder, // Load default placeholder
+			completed: null
+		}, settings);
+
+
+		defs = $.mask.definitions;
+		tests = [];
+		partialPosition = len = mask.length;
+		firstNonMaskPos = null;
+
+		$.each(mask.split(""), function(i, c) {
+			if (c == '?') {
+				len--;
+				partialPosition = i;
+			} else if (defs[c]) {
+				tests.push(new RegExp(defs[c]));
+				if (firstNonMaskPos === null) {
+					firstNonMaskPos = tests.length - 1;
+				}
+			} else {
+				tests.push(null);
+			}
+		});
+
+		return this.trigger("unmask").each(function() {
+			var input = $(this),
+				buffer = $.map(
+				mask.split(""),
+				function(c, i) {
+					if (c != '?') {
+						return defs[c] ? settings.placeholder : c;
+					}
+				}),
+				focusText = input.val();
+
+			function seekNext(pos) {
+				while (++pos < len && !tests[pos]);
+				return pos;
+			}
+
+			function seekPrev(pos) {
+				while (--pos >= 0 && !tests[pos]);
+				return pos;
+			}
+
+			function shiftL(begin,end) {
+				var i,
+					j;
+
+				if (begin<0) {
+					return;
+				}
+
+				for (i = begin, j = seekNext(end); i < len; i++) {
+					if (tests[i]) {
+						if (j < len && tests[i].test(buffer[j])) {
+							buffer[i] = buffer[j];
+							buffer[j] = settings.placeholder;
+						} else {
+							break;
+						}
+
+						j = seekNext(j);
+					}
+				}
+				writeBuffer();
+				input.caret(Math.max(firstNonMaskPos, begin));
+			}
+
+			function shiftR(pos) {
+				var i,
+					c,
+					j,
+					t;
+
+				for (i = pos, c = settings.placeholder; i < len; i++) {
+					if (tests[i]) {
+						j = seekNext(i);
+						t = buffer[i];
+						buffer[i] = c;
+						if (j < len && tests[j].test(t)) {
+							c = t;
+						} else {
+							break;
+						}
+					}
+				}
+			}
+
+			function keydownEvent(e) {
+				var k = e.which,
+					pos,
+					begin,
+					end;
+
+				//backspace, delete, and escape get special treatment
+				if (k === 8 || k === 46 || (iPhone && k === 127)) {
+					pos = input.caret();
+					begin = pos.begin;
+					end = pos.end;
+
+					if (end - begin === 0) {
+						begin=k!==46?seekPrev(begin):(end=seekNext(begin-1));
+						end=k===46?seekNext(end):end;
+					}
+					clearBuffer(begin, end);
+					shiftL(begin, end - 1);
+
+					e.preventDefault();
+				} else if (k == 27) {//escape
+					input.val(focusText);
+					input.caret(0, checkVal());
+					e.preventDefault();
+				}
+			}
+
+			function keypressEvent(e) {
+				var k = e.which,
+					pos = input.caret(),
+					p,
+					c,
+					next;
+
+				if (e.ctrlKey || e.altKey || e.metaKey || k < 32) {//Ignore
+					return;
+				} else if (k) {
+					if (pos.end - pos.begin !== 0){
+						clearBuffer(pos.begin, pos.end);
+						shiftL(pos.begin, pos.end-1);
+					}
+
+					p = seekNext(pos.begin - 1);
+					if (p < len) {
+						c = String.fromCharCode(k);
+						if (tests[p].test(c)) {
+							shiftR(p);
+
+							buffer[p] = c;
+							writeBuffer();
+							next = seekNext(p);
+
+							if(android){
+								setTimeout($.proxy($.fn.caret,input,next),0);
+							}else{
+								input.caret(next);
+							}
+
+							if (settings.completed && next >= len) {
+								settings.completed.call(input);
+							}
+						}
+					}
+					e.preventDefault();
+				}
+			}
+
+			function clearBuffer(start, end) {
+				var i;
+				for (i = start; i < end && i < len; i++) {
+					if (tests[i]) {
+						buffer[i] = settings.placeholder;
+					}
+				}
+			}
+
+			function writeBuffer() { input.val(buffer.join('')); }
+
+			function checkVal(allow) {
+				//try to place characters where they belong
+				var test = input.val(),
+					lastMatch = -1,
+					i,
+					c;
+
+				for (i = 0, pos = 0; i < len; i++) {
+					if (tests[i]) {
+						buffer[i] = settings.placeholder;
+						while (pos++ < test.length) {
+							c = test.charAt(pos - 1);
+							if (tests[i].test(c)) {
+								buffer[i] = c;
+								lastMatch = i;
+								break;
+							}
+						}
+						if (pos > test.length) {
+							break;
+						}
+					} else if (buffer[i] === test.charAt(pos) && i !== partialPosition) {
+						pos++;
+						lastMatch = i;
+					}
+				}
+				if (allow) {
+					writeBuffer();
+				} else if (lastMatch + 1 < partialPosition) {
+					input.val("");
+					clearBuffer(0, len);
+				} else {
+					writeBuffer();
+					input.val(input.val().substring(0, lastMatch + 1));
+				}
+				return (partialPosition ? i : firstNonMaskPos);
+			}
+
+			input.data($.mask.dataName,function(){
+				return $.map(buffer, function(c, i) {
+					return tests[i]&&c!=settings.placeholder ? c : null;
+				}).join('');
+			});
+
+			if (!input.attr("readonly"))
+				input
+				.one("unmask", function() {
+					input
+						.unbind(".mask")
+						.removeData($.mask.dataName);
+				})
+				.bind("focus.mask", function() {
+					clearTimeout(caretTimeoutId);
+					var pos,
+						moveCaret;
+
+					focusText = input.val();
+					pos = checkVal();
+					
+					caretTimeoutId = setTimeout(function(){
+						writeBuffer();
+						if (pos == mask.length) {
+							input.caret(0, pos);
+						} else {
+							input.caret(pos);
+						}
+					}, 10);
+				})
+				.bind("blur.mask", function() {
+					checkVal();
+					if (input.val() != focusText)
+						input.change();
+				})
+				.bind("keydown.mask", keydownEvent)
+				.bind("keypress.mask", keypressEvent)
+				.bind(pasteEventName, function() {
+					setTimeout(function() { 
+						var pos=checkVal(true);
+						input.caret(pos); 
+						if (settings.completed && pos == input.val().length)
+							settings.completed.call(input);
+					}, 0);
+				});
+			checkVal(); //Perform initial check for existing values
+		});
+	}
+});
+
+
+})(jQuery);
+

admin/write-js.php

@@ -1,28 +1,12 @@
-<?php Typecho_Plugin::factory('admin/write-js.php')->trigger($plugged)->editorPreview(); ?>
-<?php if (!$plugged): ?>
-<script type="text/javascript">
-    var editorPreview = function () {
-        var textarea = $('text'), old = '', preview = $('typecho-preview-box');
-
-        var t = setInterval(function () {
-            var current = textarea.get('value');
-            
-            if (old != current) {
-                preview.set('html', Typecho.preview.autop(current));
-                old = current;
-            }
-        }, 100);
-    }
-</script>
-<?php endif; ?>
-
+<?php Typecho_Plugin::factory('admin/write-js.php')->write(); ?>
+<?php Typecho_Widget::widget('Widget_Metas_Tag_Cloud', 'sort=count&desc=1&limit=200')->to($tags); ?>
 
 <script src="<?php $options->adminUrl('javascript/timepicker.js?v=' . $suffixVersion); ?>"></script>
 <script src="<?php $options->adminUrl('javascript/tokeninput.js?v=' . $suffixVersion); ?>"></script>
 <script>
 $(document).ready(function() {
     // 日期时间控件
-    $('#date').datetimepicker({
+    $('#date').mask('9999-99-99 99:99').datetimepicker({
         currentText     :   '<?php _e('现在'); ?>',
         prevText        :   '<?php _e('上一月'); ?>',
         nextText        :   '<?php _e('下一月'); ?>',
@@ -50,10 +34,28 @@ $(document).ready(function() {
     });
 
     // tag autocomplete 提示
-    $('#tags').tokenInput('http://shell.loopj.com/tokeninput/tvshows.php');
+    $('#tags').tokenInput(<?php 
+    $data = array();
+    while ($tags->next()) {
+        $data[] = array(
+            'tags'  =>  $tags->name
+        );
+    }
+    echo json_encode($data);
+    ?>, {
+        propertyToSearch:   'tags',
+        tokenValue      :   'tags',
+        searchDelay     :   0,
+        animateDropdown :   false,
+        hintText        :   '<?php _e('请输入标签名'); ?>',
+        noResultsText   :   '此标签不存在, 按回车创建'
+    });
+
     // tag autocomplete 提示宽度设置
     $('#token-input-tags').focus(function() {
-        $('.token-input-dropdown').width($('.token-input-list').css('width'));
+        var t = $('.token-input-dropdown'),
+            offset = t.outerWidth() - t.width();
+        t.width($('.token-input-list').outerWidth() - offset);
     });
 
     // 高级选项控制
@@ -65,74 +67,3 @@ $(document).ready(function() {
 });
 </script>
 
-<script type="text/javascript">
-    (function () {
-        window.addEvent('domready', function() {
-        
-            $(document).getElements('.typecho-date').each(function (item) {
-                item.setProperty('name', '_' + item.getProperty('name'));
-                item.addEvent('change', function () {
-
-                    $(document).getElements('.typecho-date').each(function (_item) {
-                        var name = _item.name;
-
-                        if (0 == name.indexOf('_')) {
-                            _item.setProperty('name', name.slice(1));
-                        }
-                    });
-                    
-                });
-                
-                item.removeProperty('disabled');
-            });
-        
-            /** 绑定按钮 */
-            $(document).getElement('span.advance').addEvent('click', function () {
-                Typecho.toggle('#advance-panel', this,
-                '<?php _e('收起高级选项'); ?>', '<?php _e('展开高级选项'); ?>');
-            });
-            
-            $(document).getElement('span.attach').addEvent('click', function () {
-                Typecho.toggle('#upload-panel', this,
-                '<?php _e('收起附件'); ?>', '<?php _e('展开附件'); ?>');
-            });
-            
-            $('btn-save').removeProperty('disabled');
-            $('btn-submit').removeProperty('disabled');
-            
-            $('btn-save').addEvent('click', function (e) {
-                this.getParent('span').addClass('loading');
-                this.setProperty('disabled', true);
-                $(document).getElement('input[name=do]').set('value', 'save');
-                $(document).getElement('.typecho-post-area form').submit();
-            });
-            
-            $('btn-submit').addEvent('click', function (e) {
-                this.getParent('span').addClass('loading');
-                this.setProperty('disabled', true);
-                $(document).getElement('input[name=do]').set('value', 'publish');
-                $(document).getElement('.typecho-post-area form').submit();
-            });
-
-            if ('undefined' != typeof(editorPreview)) {
-                //$(document).getElement('.typecho-preview-label').setStyle('display', 'block');
-
-                function togglePreview(el) {
-                    if (el.getProperty('checked')) {
-                        $('typecho-preview-box').setStyle('display', 'block');
-                    } else {
-                        $('typecho-preview-box').setStyle('display', 'none');
-                    }
-
-                    return el;
-                }
-
-                togglePreview($('btn-preview')).addEvent('click', function (e) {
-                    togglePreview(this);
-                });
-
-                editorPreview();
-            }
-        });
-    })();
-</script>

admin/write-page.php

@@ -130,12 +130,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
 include 'copyright.php';
 include 'common-js.php';
 include 'write-js.php';
-
-Typecho_Plugin::factory('admin/write-page.php')->trigger($plugged)->richEditor($page);
-if (!$plugged) {
-    include 'editor-js.php';
-}
-Typecho_Plugin::factory('admin/write-page.php')->bottom($page);
 include 'file-upload-js.php';
+
+Typecho_Plugin::factory('admin/write-page.php')->bottom($page);
 include 'footer.php';
 ?>

admin/write-post.php

@@ -138,30 +138,9 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
 <?php
 include 'copyright.php';
 include 'common-js.php';
-?>
-
-<?php Typecho_Widget::widget('Widget_Metas_Tag_Cloud', 'sort=count&desc=1&limit=200')->to($tags); ?>
-<script type="text/javascript">
-    (function () {
-        window.addEvent('domready', function() {
-            /** 标签自动完成 */
-            var _tags = [<?php while ($tags->next()) { echo '"' . str_replace('"', '\"', $tags->name) . '"'
-            . ($tags->sequence != $tags->length ? ',' : NULL); } ?>];
-            
-            /** 自动完成 */
-            Typecho.autoComplete('#tags', _tags);
-        });
-    })();
-</script>
-
-<?php
 include 'write-js.php';
-
-Typecho_Plugin::factory('admin/write-post.php')->trigger($plugged)->richEditor($post);
-if (!$plugged) {
-    include 'editor-js.php';
-}
-Typecho_Plugin::factory('admin/write-post.php')->bottom($post);
 include 'file-upload-js.php';
+
+Typecho_Plugin::factory('admin/write-post.php')->bottom($post);
 include 'footer.php';
 ?>