From 4784d977819f73fba790fd7dee6755787cc23ae9 Mon Sep 17 00:00:00 2001 From: minyi Date: 2018年7月27日 10:20:21 +0800 Subject: [PATCH] format code style --- .gitignore | 2 + html2wxml/html2json.js | 133 ++++++++++++---------------------------- test/htmlparser.test.js | 10 +++ 3 files changed, 50 insertions(+), 95 deletions(-) create mode 100644 test/htmlparser.test.js diff --git a/.gitignore b/.gitignore index 485dee6..1076f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .idea + +.DS_Store diff --git a/html2wxml/html2json.js b/html2wxml/html2json.js index fd4e468..39d6c98 100755 --- a/html2wxml/html2json.js +++ b/html2wxml/html2json.js @@ -1,43 +1,41 @@ /** * html2Json 改造来自: https://github.com/Jxck/html2json - * - * + * + * * author: Di (微信小程序开发工程师) * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com) * 垂直微信小程序开发交流社区 - * + * * github地址: https://github.com/icindy/wxParse - * + * * for: 微信小程序富文本解析 * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184 */ -var __placeImgeUrlHttps = "https"; -var __emojisReg = ''; -var __emojisBaseSrc = ''; -var __emojis = {}; +var __placeImgeUrlHttps = 'https'; var wxDiscode = require('./wxDiscode.js'); var HTMLParser = require('./htmlparser.js'); // Empty Elements - HTML 5 -var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr"); +var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5 -var block = makeMap("br,a,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video"); +var block = makeMap('br,a,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'); // Inline Elements - HTML 5 -var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var"); +var inline = makeMap('abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'); // Elements that you can, intentionally, leave open // (and which close themselves) -var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr"); +var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled" -var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"); +var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything) -var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block"); +var special = makeMap('wxxxcode-style,script,style,view,scroll-view,block'); + function makeMap(str) { var obj = {}, - items = str.split(","); + items = str.split(','); for (var i = 0; i < items.length; i++) { obj[items[i]] = true; } @@ -56,7 +54,7 @@ function removeDOCTYPE(html) { } function trimHtml(html) { - return html + return html .replace(//ig, '') .replace(/\/\*.*?\*\//ig, '') .replace(/[ ]+

AltStyle によって変換されたページ (->オリジナル) /