移除旧组件

build.dev.js

@@ -15,8 +15,8 @@ const VERSION = require('./package.json').version
 const BUILD_DATE = new Date().format()
 
 const BASE_SCSS = `
-$ct: #3fc2a7 #19b491 #16967a;
+$ct: #26a69a #009688 #00897b;
-$cg: #58d68d #2ecc71 #27ae60;
+$cg: #66bb6a #4caf50 #43a047;
 $cpp: #ac61ce #9b59b6 #8e44ad;
 $cb: #66b1ff #409eff #3a8ee6;
 $cr: #ff5061 #eb3b48 #ce3742;

build.prod.js

@@ -15,8 +15,8 @@ const VERSION = require('./package.json').version
 const BUILD_DATE = new Date().format()
 
 const BASE_SCSS = `
-$ct: #3fc2a7 #19b491 #16967a;
+$ct: #26a69a #009688 #00897b;
-$cg: #58d68d #2ecc71 #27ae60;
+$cg: #66bb6a #4caf50 #43a047;
 $cpp: #ac61ce #9b59b6 #8e44ad;
 $cb: #66b1ff #409eff #3a8ee6;
 $cr: #ff5061 #eb3b48 #ce3742;

src/css/marked.scss

@@ -1,158 +0,0 @@
-@charset "UTF-8";
-/**
- * 
- * @authors yutent (yutent@doui.cc)
- * @date    2017-09-29 00:05:45
- * @version $Id$
- */
-@import "var.scss";
-
-.do-marked-theme, 
-.do-marked-theme-gfm,
-.do-marked-theme-vue {position:relative;line-height:1.5;font-size:13px;color:nth($cd, 1);
-
-  a {text-decoration:underline;color:nth($cb, 2)}
-  a:hover {color:nth($cb, 1);text-decoration:none;}
-  em {color:nth($cgr, 3);}
-  strong {color:nth($cd, 3);}
-  em,strong,del {padding:0 3px;}
-  p {margin:15px 0;}
-  img {max-width:100%;}
-
-  blockquote {
-    &.md-quote {margin:10px 0;padding:5px 10px;border-left:5px solid nth($cp, 3);background:nth($cp, 1);color:nth($cgr, 1);
-
-      p {margin:0;}
-    }
-  }
-
-
-  /* 提醒文本 */
-  .md-warn,.md-mark {display:inline-block;position:relative;min-height:35px;margin:3px 0;padding:3px 8px 3px 35px;line-height:27px;border:1px solid nth($co, 2);border-radius:5px;background:#fffbed;color:nth($co, 3);word-break: break-all;
-
-    p {margin:0!important;}
-    i {position:absolute;left:8px;top:6px;line-height:1;font-size:20px;color:nth($cr, 2);}
-  }
-  .md-mark {border-color:nth($ct, 1);color:nth($ct, 3);background:#edfbf8;
-    i {color:nth($ct, 3);}
-  }
-  .md-task {position:relative;display:inline-block;width:auto;height:30px;padding-right:10px;line-height:30px;text-align:center;cursor:default;
-
-    &__box {float:left;width:18px;height:18px;margin:6px;margin-left:0;line-height:1;border:1px solid nth($cgr, 1);border-radius:3px;font-size:16px;text-align:center;}
-    &.done {
-      .md-task__box {color:nth($cgr, 1);border-color:nth($cp, 3);background:nth($cp, 3);}
-      .md-task__text {color:nth($cgr, 1);text-decoration:line-through;}
-    }
-  }
-
-  hr {height:1px;margin:30px 0;line-height:1px;border:0;color:nth($cgr, 1);background-color:nth($cgr, 1);}
-  ol {margin-left:1em;list-style:decimal outside none;}
-  ul {margin-left:1em;list-style:disc outside none;}
-  li {margin:.5em 0;}
-  li ol {margin-left:1em;}
-  li ul {margin-left:1em;list-style-type: circle;}
-  li ol ul,
-  li ul ul {list-style-type: square;}
-
-}
-
-.do-marked-theme {
-
-  h1,h2,h3,h4,h5,h6 {position:relative;margin:15px 0;padding-left:30px;font-weight:normal;font-size:16px;
-    
-    span {position:relative;display:inline-block;padding:0 8px;background:#fff;color:nth($cd, 3);}
-    a {padding:0 3px;font-weight:bold;text-decoration:none;}
-    a:hover {transform:scale(1.2)}
-  }
-  h1 {margin:0 0 30px;padding-left:0;font-size:24px;
-
-    &:after {display:block;width:100%;content:"";border-bottom:1px solid nth($cp, 3);}
-    span {padding-left:0;}
-  }
-  h2,h3,h4,h5,h6 {
-    &:before {display:block;position:absolute;left:0;top:50%;width:100%;content:"";border-bottom:1px solid nth($cp, 3);}
-  }
-  h2 {margin:20px 0;font-size:22px;}
-  h3 {margin:20px 0 15px;font-size:20px;}
-  h4 {font-size:18px;}
-
-  
-  
-  table {width:100%;line-height:25px;
-    thead tr {height:45px;background:nth($cp, 1)}
-    thead th {padding:10px 8px;border:0;}
-    tbody tr {height:auto;@include ts(all, .3s);
-      &:hover {background:#fbfbfb;}
-    }
-    tbody td {padding:9px 8px;border-bottom:1px solid nth($cp, 1)}
-  }
-
- 
-}
-
-.do-marked-theme-gfm,
-.do-marked-theme-vue {
-
-  h1,h2,h3,h4,h5,h6 {position:relative;margin:15px 0;font-weight:normal;font-size:16px;
-    
-    span {position:relative;display:inline-block;padding:0 5px;color:nth($cd, 3);}
-    a {visibility:hidden;position:absolute;left:-25px;width:25px;padding:0 3px;font-weight:bold;text-decoration:none;text-align:center;}
-    &:hover a {visibility:visible;}
-    &:after {display:block;width:100%;content:"";border-bottom:1px solid nth($cp, 3);}
-  }
-  h1 {margin:0 0 30px;font-size:24px;}
-  h2 {margin:20px 0;font-size:22px;}
-  h3 {margin:20px 0 15px;font-size:20px;}
-  h4 {font-size:18px;}
-
-  table {border-spacing:0;border-collapse:collapse;
-
-    tr {border-top:1px solid #ccc;background-color: #fff;}
-    th, td {padding:6px 13px;border:1px solid #ddd;}
-    th {font-weight:bold;}
-    tr:nth-child(2n) {background-color:#fbfbfb;}
-  }
-}
-
-.do-marked-theme-gfm {color:nth($cd, 3);
-
-  blockquote {
-    &.md-quote {background:none;
-
-    }
-  }
-
-
-  .do-ui-blockcode,.do-ui-inlinecode {border:1px solid nth($cp, 3)}
-  .do-ui-inlinecode {color:inherit;}
-
-}
-
-
-
-.do-marked-theme-vue {
-
-  a {color:nth($ct, 2)}
-  a:hover {color:nth($ct, 1);}
-
-  blockquote {
-    &.md-quote {border-color:nth($ct, 1);background:#f2faf7;
-
-    }
-  }
-
-  h1,h2,h3,h4,h5,h6 {font-weight:bold;
-    span {color:inherit;}
-    &:after {display:none;}
-  }
-
-
-  table {display:table;
-    thead tr {background:nth($cp, 1)}
-  }
-
-  .do-ui-blockcode,.do-ui-inlinecode {}
-  .do-ui-inlinecode {color:nth($co, 3);}
-
-}
-

src/css/pager.scss

@@ -1,153 +0,0 @@
-@charset "UTF-8";
-/**
- * 
- * @authors yutent (yutent@doui.cc)
- * @date    2017-09-08 20:03:06
- * @version $Id$
- */
-
-@import "var.scss";
-
-.do-pager {display:block;height:auto;text-align:center;font-size:14px;color: nth($cgr, 2);
-
-  &.mini {line-height:30px;
-    .button,.page {min-width:30px;height:30px}
-  }
-  &.medium {line-height:35px;
-    .button,.page {min-width:35px;height:35px}
-  }
-  &.large {line-height:40px;
-    .button,.page {min-width:40px;height:40px}
-  }
-    
-  .button,.page {display:inline-block;border:0;color: nth($cgr, 2);text-decoration:none;cursor:pointer;vertical-align:top;font-size:14px;font-weight:100;appearance:none;}
-  .button {font-size:18px;}
-  .curr, .disabled {cursor:default;}
-  
-  &.skin-1 {width:100%;
-
-    .page,
-    .button,
-    .disabled,
-    .curr {padding:0 8px;margin:0 3px;}
-    
-    .curr {font-weight:bold;font-size:15px;}
-    .page.disabled {min-width:0;padding:0;background:none;color:nth($cgr, 2);
-      &:hover,&:active {background:none;}
-    }
-    .page.curr {background:none;color:nth($cgr, 2);
-      &:hover,&:active {background:none;}
-    }
-    .button[disabled] {cursor:not-allowed;}
-
-    .total-box,.input-box {display:inline-block;padding:0 8px;}
-    .input-box input {display:inline-block;width:40px;height:30px;padding:0 3px;font-size:14px;background:#fff;border:1px solid #ddd;text-align:center;}
-  }
-
-  &.skin-2 {float:right;width:auto;
-      
-    .page,
-    .button,
-    .disabled,
-    .curr {float:left;margin:0;padding:0 5px;color:#fff;}
-
-    .page.disabled {display:none;}
-    .button[disabled] {cursor:not-allowed;}
-    
-    .input-box {display:none;}
-    .total-box {float:left;display:inline-block;padding:0 8px;}
-  }
-
-  &.plain {
-    .page,.button {background:nth($cp, 2);color:nth($cgr, 2);
-
-      &:hover {background:nth($cp, 1)}
-      &:active {background:nth($cp, 3)}
-    }
-    .button[disabled] {background:nth($cp, 2);}
-    &.skin-2 .curr {background:nth($cp, 3)}
-  }
-
-  &.grey {
-    .page,.button {background:nth($cgr, 2);color: #fff;
-
-      &:hover {background:nth($cgr, 1)}
-      &:active {background:nth($cgr, 3)}
-    }
-    .button[disabled] {background:nth($cgr, 2);}
-    &.skin-2 .curr {background:nth($cgr, 3)}
-  }
-
-  &.dark {
-    .page,.button {background:nth($cd, 2);color: #fff;
-
-      &:hover {background:nth($cd, 2)}
-      &:active {background:nth($cd, 3)}
-    }
-    .button[disabled] {background:nth($cd, 2);}
-    &.skin-2 .curr {background:nth($cd, 3)}
-  }
-
-  &.red {
-    .page,.button {background:nth($cr, 2);color: #fff;
-
-      &:hover {background:nth($cr, 1)}
-      &:active {background:nth($cr, 3)}
-    }
-    .button[disabled] {background:nth($cr, 2);}
-    &.skin-2 .curr {background:nth($cr, 3)}
-  }
-
-  &.orange {
-    .page,.button {background:nth($co, 2);color: #fff;
-
-      &:hover {background:nth($co, 1)}
-      &:active {background:nth($co, 3)}
-    }
-    .button[disabled] {background:nth($co, 2);}
-    &.skin-2 .curr {background:nth($co, 3)}
-  }
-
-  &.green {
-    .page,.button {background:nth($cg, 2);color: #fff;
-
-      &:hover {background:nth($cg, 1)}
-      &:active {background:nth($cg, 3)}
-    }
-    .button[disabled] {background:nth($cg, 2);}
-    &.skin-2 .curr {background:nth($cg, 3)}
-  }
-
-  &.teal {
-    .page,.button {background:nth($ct, 2);color: #fff;
-
-      &:hover {background:nth($ct, 1)}
-      &:active {background:nth($ct, 3)}
-    }
-    .button[disabled] {background:nth($ct, 2);}
-    &.skin-2 .curr {background:nth($ct, 3)}
-  }
-
-  &.blue {
-    .page,.button {background:nth($cb, 2);color: #fff;
-
-      &:hover {background:nth($cb, 1)}
-      &:active {background:nth($cb, 3)}
-    }
-    .button[disabled] {background:nth($cb, 2);}
-    &.skin-2 .curr {background:nth($cb, 3)}
-  }
-
-  &.purple,.button {
-    .page {background:nth($cpp, 2);color: #fff;
-
-      &:hover {background:nth($cpp, 1)}
-      &:active {background:nth($cpp, 3)}
-    }
-    .button[disabled] {background:nth($cpp, 2);}
-    &.skin-2 .curr {background:nth($cpp, 3)}
-  }  
-
-}
-
-

src/css/prism.scss

@@ -1,49 +0,0 @@
-@charset "UTF-8";
-/**
- *
- * @authors yutent (yutent@doui.cc)
- * @date    2017-02-13 13:53:38
- *
- */
-
-@import 'var.scss';
-
-/*代码块*/
-.do-ui-blockcode {position: relative;margin: 15px 0;padding: 8px 0;line-height: 1.5;border-radius:3px;background: nth($cp, 1);
-
-  /*语法高亮*/
-  .lang {position: relative;display: block;padding: 0 8px;color: #383a42;word-wrap: break-word;white-space: pre-wrap;
-
-    .c-comment{color: #8e908c;font-style:italic;}
-    .c-smartyx {color: #607d8b;}
-    .c-important {color: #f5871f;font-style:italic;}
-    .c-punctuation {color: #986756;}
-    .c-regex {color: #c82829;}
-
-    .c-boolean,
-    .c-number,.c-params {color: #f5871f;}
-    .c-function {color:#009688;}
-
-    .c-class-name,
-    .c-build-in {color:#3aa9f3;}
-
-    .c-class-name,
-    .c-build-in {font-style:italic;font-weight:bold;}
-
-    .c-attr-name,
-    .c-property {color: #c79f0f;font-weight:bold;}
-
-
-    .c-string,
-    .c-attr-value {color: #5ab302;}
-
-    .c-tag,
-    .c-keyword,
-    .c-selector,
-    .c-operator {color: #d81406;}
-
-    .c-keyword,.c-params,.c-property {font-style:italic;}
-  }
-}
-/*行内代码*/
-.do-ui-inlinecode {display:inline-block;margin:0 2px;padding:0 5px;line-height: 1.5;color:#d14;background: nth($cp, 1);border-radius:3px;}

src/css/var.scss

@@ -1,5 +1,5 @@
-$ct: #3fc2a7 #19b491 #16967a;
+$ct: #26a69a #009688 #00897b;
-$cg: #58d68d #2ecc71 #27ae60;
+$cg: #66bb6a #4caf50 #43a047;
 $cpp: #ac61ce #9b59b6 #8e44ad;
 $cb: #66b1ff #409eff #3a8ee6;
 $cr: #ff5061 #eb3b48 #ce3742;

src/markd/core.js

@@ -138,8 +138,9 @@ const Decoder = {
 }
 
 class Tool {
-  constructor(list) {
+  constructor(list, links) {
     this.list = list
+    this.__LINKS__ = links
   }
 
   // 初始化字符串, 处理多余换行等
@@ -157,7 +158,6 @@ class Tool {
     var isCodeBlock = false // 是否代码块
     var isTable = false // 是否表格
     var emptyLineLength = 0 //连续空行的数量
-    var ins = null
 
     for (let it of lines) {
       let tmp = it.trim()
@@ -206,9 +206,7 @@ class Tool {
       }
     }
 
-    ins = new this(list)
+    return new this(list, links)
-    ins.__LINKS__ = links
-    return ins
   }
 
   parse() {
@@ -422,6 +420,8 @@ class Tool {
         isParagraph = true
       }
     }
+    delete this.list
+    delete this.__LINKS__
     return html
   }
 }