From 3f8e7d509aa8844ffd74a41a8d010958ce2f8a42 Mon Sep 17 00:00:00 2001 From: Oger-Me Date: Wed, 30 Jul 2014 21:46:57 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E9=83=BD=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E4=B8=8D=E4=BA=86=E3=80=82=E4=B8=8D=E7=9F=A5=E9=81=93?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=80=85=E6=80=8E=E4=B9=88=E5=B0=B1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jquery.wmd.js | 2 +- jquery.wmd.min.js | 2 +- wmd-test.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jquery.wmd.js b/jquery.wmd.js index 6f96f524..b803b535 100644 --- a/jquery.wmd.js +++ b/jquery.wmd.js @@ -1295,7 +1295,7 @@ var UndoManager = function(textarea, pastePollInterval, callback){ // {{{ WMDEditor.util = util; WMDEditor.position = position; WMDEditor.TextareaState = TextareaState; -WMDEditor.Checks = Checks; +WMDEditor.Chunks = Chunks; WMDEditor.InputPoller = InputPoller; WMDEditor.PreviewManager = PreviewManager; WMDEditor.UndoManager = UndoManager; diff --git a/jquery.wmd.min.js b/jquery.wmd.min.js index 3bd2ee83..0ac55959 100644 --- a/jquery.wmd.min.js +++ b/jquery.wmd.min.js @@ -99,7 +99,7 @@ return;}};var handleModeChange=function(event){if(!event.ctrlKey&&!event.metaKey else if(keyCode==8||keyCode==46||keyCode==127){setMode("deleting");} else if(keyCode==13){setMode("newlines");} else if(keyCode==27){setMode("escape");} -else if((keyCode<16||keyCode>20)&&keyCode!=91){setMode("typing");}}};var setEventHandlers=function(){util.addEvent(textarea,"keypress",function(event){if((event.ctrlKey||event.metaKey)&&(event.keyCode==89||event.keyCode==90)){event.preventDefault();}});var handlePaste=function(){if(browser.isIE||(inputStateObj&&inputStateObj.text!=textarea.value)){if(timer==undefined){mode="paste";saveState();refreshState();}}};poller=new InputPoller(textarea,handlePaste,pastePollInterval);util.addEvent(textarea,"keydown",handleCtrlYZ);util.addEvent(textarea,"keydown",handleModeChange);util.addEvent(textarea,"mousedown",function(){setMode("moving");});textarea.onpaste=handlePaste;textarea.ondrop=handlePaste;};var init=function(){setEventHandlers();refreshState();saveState();};this.destroy=function(){if(poller){poller.destroy();}};init();};WMDEditor.util=util;WMDEditor.position=position;WMDEditor.TextareaState=TextareaState;WMDEditor.Checks=Checks;WMDEditor.InputPoller=InputPoller;WMDEditor.PreviewManager=PreviewManager;WMDEditor.UndoManager=UndoManager;var doc=top.document;var re=top.RegExp;var nav=top.navigator;function get_browser(){var b={};b.isIE=/msie/.test(nav.userAgent.toLowerCase());b.isIE_5or6=/msie 6/.test(nav.userAgent.toLowerCase())||/msie 5/.test(nav.userAgent.toLowerCase());b.isIE_7plus=b.isIE&&!b.isIE_5or6;b.isOpera=/opera/.test(nav.userAgent.toLowerCase());b.isKonqueror=/konqueror/.test(nav.userAgent.toLowerCase());return b;} +else if((keyCode<16||keyCode>20)&&keyCode!=91){setMode("typing");}}};var setEventHandlers=function(){util.addEvent(textarea,"keypress",function(event){if((event.ctrlKey||event.metaKey)&&(event.keyCode==89||event.keyCode==90)){event.preventDefault();}});var handlePaste=function(){if(browser.isIE||(inputStateObj&&inputStateObj.text!=textarea.value)){if(timer==undefined){mode="paste";saveState();refreshState();}}};poller=new InputPoller(textarea,handlePaste,pastePollInterval);util.addEvent(textarea,"keydown",handleCtrlYZ);util.addEvent(textarea,"keydown",handleModeChange);util.addEvent(textarea,"mousedown",function(){setMode("moving");});textarea.onpaste=handlePaste;textarea.ondrop=handlePaste;};var init=function(){setEventHandlers();refreshState();saveState();};this.destroy=function(){if(poller){poller.destroy();}};init();};WMDEditor.util=util;WMDEditor.position=position;WMDEditor.TextareaState=TextareaState;WMDEditor.Chunks=Chunks;WMDEditor.InputPoller=InputPoller;WMDEditor.PreviewManager=PreviewManager;WMDEditor.UndoManager=UndoManager;var doc=top.document;var re=top.RegExp;var nav=top.navigator;function get_browser(){var b={};b.isIE=/msie/.test(nav.userAgent.toLowerCase());b.isIE_5or6=/msie 6/.test(nav.userAgent.toLowerCase())||/msie 5/.test(nav.userAgent.toLowerCase());b.isIE_7plus=b.isIE&&!b.isIE_5or6;b.isOpera=/opera/.test(nav.userAgent.toLowerCase());b.isKonqueror=/konqueror/.test(nav.userAgent.toLowerCase());return b;} var browser=get_browser();var wmdBase=function(wmd,wmd_options){wmd.Command={};wmd.Global={};wmd.buttons={};wmd.showdown=top.Attacklab&&top.Attacklab.showdown;var util=WMDEditor.util;var position=WMDEditor.position;var command=wmd.Command;wmd.ieCachedRange=null;wmd.ieRetardedClick=false;wmd.editor=function(previewRefreshCallback){if(!previewRefreshCallback){previewRefreshCallback=function(){};} var inputBox=wmd.panels.input;var offsetHeight=0;var editObj=this;var mainDiv;var mainSpan;var div;var creationHandle;var undoMgr;var doClick=function(button){inputBox.focus();if(button.textOp){if(undoMgr){undoMgr.setCommandMode();} var state=new TextareaState(wmd.panels.input);if(!state){return;} diff --git a/wmd-test.html b/wmd-test.html index 0f455891..7ee61e74 100644 --- a/wmd-test.html +++ b/wmd-test.html @@ -6,7 +6,7 @@ - + From cb71bf0ca75e9302a0caf79b2edc0e218e5cfd06 Mon Sep 17 00:00:00 2001 From: Oger-Me Date: Wed, 30 Jul 2014 22:31:32 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=88=86=E9=9A=94=E7=BA=BF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jquery.wmd.js | 14 +++++++++++++- jquery.wmd.min.js | 2 +- wmd-test.html | 5 +++-- wmd.css | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/jquery.wmd.js b/jquery.wmd.js index b803b535..7011007c 100644 --- a/jquery.wmd.js +++ b/jquery.wmd.js @@ -1521,10 +1521,22 @@ var wmdBase = function(wmd, wmd_options){ // {{{ return button; } + var spacerIndex = 0; function addSpacer() { var spacer = document.createElement("li"); - spacer.className = "wmd-spacer"; + switch(spacerIndex){ + case 0: + spacer.className = "wmd-spacer wmd-spacer1"; + break; + case 1: + spacer.className = "wmd-spacer wmd-spacer2"; + break; + case 2: + spacer.className = "wmd-spacer wmd-spacer3"; + break; + } buttonRow.appendChild(spacer); + spacerIndex = spacerIndex + 1; return spacer; } diff --git a/jquery.wmd.min.js b/jquery.wmd.min.js index 0ac55959..3407c258 100644 --- a/jquery.wmd.min.js +++ b/jquery.wmd.min.js @@ -115,7 +115,7 @@ buttonRow=buttonBar.appendChild(buttonRow);var xoffset=0;function createButton(n button.title=title;if(textOp) button.textOp=textOp;return button;} function addButton(name,title,textOp){var button=createButton(name,title,textOp);setupButton(button,true);buttonRow.appendChild(button);return button;} -function addSpacer(){var spacer=document.createElement("li");spacer.className="wmd-spacer";buttonRow.appendChild(spacer);return spacer;} +var spacerIndex = 0;function addSpacer(){var spacer=document.createElement("li");switch(spacerIndex){case 0:spacer.className = "wmd-spacer wmd-spacer1";break;case 1:spacer.className = "wmd-spacer wmd-spacer2";break;case 2:spacer.className = "wmd-spacer wmd-spacer3";break;}buttonRow.appendChild(spacer);spacerIndex=spacerIndex+1;return spacer;} var boldButton=addButton("wmd-bold-button","Strong Ctrl+B",command.doBold);var italicButton=addButton("wmd-italic-button","Emphasis Ctrl+I",command.doItalic);var spacer1=addSpacer();var linkButton=addButton("wmd-link-button","Hyperlink Ctrl+L",function(chunk,postProcessing,useDefaultText){return command.doLinkOrImage(chunk,postProcessing,false);});var quoteButton=addButton("wmd-quote-button","Blockquote
Ctrl+Q",command.doBlockquote);var codeButton=addButton("wmd-code-button","Code Sample 
 Ctrl+K",command.doCode);var imageButton=addButton("wmd-image-button","Image  Ctrl+G",function(chunk,postProcessing,useDefaultText){return command.doLinkOrImage(chunk,postProcessing,true);});var spacer2=addSpacer();var olistButton=addButton("wmd-olist-button","Numbered List 
     Ctrl+O",function(chunk,postProcessing,useDefaultText){command.doList(chunk,postProcessing,true,useDefaultText);});var ulistButton=addButton("wmd-ulist-button","Bulleted List