Skip to content

Commit 1babf58

Browse files
authored
Merge pull request #24 from TitanSnow/fix23
fix #23
2 parents d58e671 + a9b42f1 commit 1babf58

File tree

5 files changed

+84
-38
lines changed

5 files changed

+84
-38
lines changed

demo.html

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@
1414
<script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
1515
<script src="MarkdownPalettes.umd.js"></script>
1616
<script>
17-
var app = new Vue({
18-
functional: true,
19-
el: '#editor',
20-
render: h => h(MarkdownPalettes)
21-
})
17+
const app = new Vue({
18+
template: '<markdown-palettes v-model="code"/>',
19+
el: '#editor',
20+
data: {
21+
code: '# Demo'
22+
},
23+
components: {
24+
MarkdownPalettes
25+
}
26+
})
2227
</script>
2328
</body>
2429
</html>

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"lint": "vue-cli-service lint",
1515
"lint-fix": "vue-cli-service lint --fix",
1616
"analyze": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --report",
17-
"test-dist": "node ./test_dist_server.js"
17+
"test-dist": "hs dist"
1818
},
1919
"dependencies": {
2020
"@fortawesome/fontawesome-free": "^5.1.0",
@@ -33,8 +33,7 @@
3333
"@vue/cli-service": "^3.0.0-beta.15",
3434
"@vue/eslint-config-standard": "^3.0.0-rc.3",
3535
"babel-plugin-lodash": "^3.3.4",
36-
"express": "^4.16.3",
37-
"morgan": "^1.9.0",
36+
"http-server": "^0.11.1",
3837
"stylus": "^0.54.5",
3938
"stylus-loader": "^3.0.2",
4039
"vue": "^2.5.11",

src/MarkdownPalettes.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,10 @@ export default {
261261
},
262262
methods: {
263263
setCode (code) {
264-
this.code = code
265-
this.editor.setValue(code)
264+
if (this.code !== code) {
265+
this.code = code
266+
this.editor.setValue(code)
267+
}
266268
},
267269
getCode () {
268270
return this.code

test_dist_server.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

yarn.lock

Lines changed: 68 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,12 +1404,6 @@ base@^0.11.1:
14041404
mixin-deep "^1.2.0"
14051405
pascalcase "^0.1.1"
14061406

1407-
basic-auth@~2.0.0:
1408-
version "2.0.0"
1409-
resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba"
1410-
dependencies:
1411-
safe-buffer "5.1.1"
1412-
14131407
14141408
version "0.6.1"
14151409
resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -1893,6 +1887,10 @@ colormin@^1.0.5:
18931887
css-color-names "0.0.4"
18941888
has "^1.0.1"
18951889

1890+
1891+
version "1.0.3"
1892+
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
1893+
18961894
colors@~1.1.2:
18971895
version "1.1.2"
18981896
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -2034,6 +2032,10 @@ [email protected], core-util-is@~1.0.0:
20342032
version "1.0.2"
20352033
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
20362034

2035+
corser@~2.0.0:
2036+
version "2.0.1"
2037+
resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
2038+
20372039
cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
20382040
version "2.2.2"
20392041
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
@@ -2489,6 +2491,15 @@ ecc-jsbn@~0.1.1:
24892491
dependencies:
24902492
jsbn "~0.1.0"
24912493

2494+
ecstatic@^3.0.0:
2495+
version "3.3.0"
2496+
resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.0.tgz#91cd417d152abf85b37b1ab3ebf3bd25cdc64e80"
2497+
dependencies:
2498+
he "^1.1.1"
2499+
mime "^1.6.0"
2500+
minimist "^1.1.0"
2501+
url-join "^2.0.5"
2502+
24922503
24932504
version "1.1.1"
24942505
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -2850,7 +2861,7 @@ expand-range@^1.8.1:
28502861
dependencies:
28512862
fill-range "^2.1.0"
28522863

2853-
express@^4.16.2, express@^4.16.3:
2864+
express@^4.16.2:
28542865
version "4.16.3"
28552866
resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
28562867
dependencies:
@@ -3425,7 +3436,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
34253436
inherits "^2.0.3"
34263437
minimalistic-assert "^1.0.1"
34273438

3428-
[email protected], he@^1.1.0:
3439+
[email protected], he@^1.1.0, he@^1.1.1:
34293440
version "1.1.1"
34303441
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
34313442

@@ -3530,14 +3541,27 @@ http-proxy-middleware@~0.18.0:
35303541
lodash "^4.17.5"
35313542
micromatch "^3.1.9"
35323543

3533-
http-proxy@^1.16.2:
3544+
http-proxy@^1.16.2, http-proxy@^1.8.1:
35343545
version "1.17.0"
35353546
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
35363547
dependencies:
35373548
eventemitter3 "^3.0.0"
35383549
follow-redirects "^1.0.0"
35393550
requires-port "^1.0.0"
35403551

3552+
http-server@^0.11.1:
3553+
version "0.11.1"
3554+
resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
3555+
dependencies:
3556+
colors "1.0.3"
3557+
corser "~2.0.0"
3558+
ecstatic "^3.0.0"
3559+
http-proxy "^1.8.1"
3560+
opener "~1.4.0"
3561+
optimist "0.6.x"
3562+
portfinder "^1.0.13"
3563+
union "~0.4.3"
3564+
35413565
http-signature@~1.2.0:
35423566
version "1.2.0"
35433567
resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4469,6 +4493,10 @@ [email protected]:
44694493
version "1.4.1"
44704494
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
44714495

4496+
mime@^1.6.0:
4497+
version "1.6.0"
4498+
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
4499+
44724500
mime@^2.0.3, mime@^2.1.0:
44734501
version "2.3.1"
44744502
resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -4503,10 +4531,14 @@ [email protected]:
45034531
version "0.0.8"
45044532
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
45054533

4506-
minimist@^1.1.3, minimist@^1.2.0:
4534+
minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
45074535
version "1.2.0"
45084536
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
45094537

4538+
minimist@~0.0.1:
4539+
version "0.0.10"
4540+
resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
4541+
45104542
minipass@^2.2.1, minipass@^2.3.3:
45114543
version "2.3.3"
45124544
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
@@ -4548,16 +4580,6 @@ [email protected], [email protected], mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@
45484580
dependencies:
45494581
minimist "0.0.8"
45504582

4551-
morgan@^1.9.0:
4552-
version "1.9.0"
4553-
resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051"
4554-
dependencies:
4555-
basic-auth "~2.0.0"
4556-
debug "2.6.9"
4557-
depd "~1.1.1"
4558-
on-finished "~2.3.0"
4559-
on-headers "~1.0.1"
4560-
45614583
move-concurrently@^1.0.1:
45624584
version "1.0.1"
45634585
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -4861,7 +4883,7 @@ onetime@^2.0.0:
48614883
dependencies:
48624884
mimic-fn "^1.0.0"
48634885

4864-
opener@^1.4.3:
4886+
opener@^1.4.3, opener@~1.4.0:
48654887
version "1.4.3"
48664888
resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
48674889

@@ -4871,6 +4893,13 @@ opn@^5.1.0, opn@^5.2.0:
48714893
dependencies:
48724894
is-wsl "^1.1.0"
48734895

4896+
4897+
version "0.6.1"
4898+
resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
4899+
dependencies:
4900+
minimist "~0.0.1"
4901+
wordwrap "~0.0.2"
4902+
48744903
optimize-css-assets-webpack-plugin@^4.0.1:
48754904
version "4.0.3"
48764905
resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-4.0.3.tgz#4f714e276b279700892c4a6202b7e22812d6f683"
@@ -5534,6 +5563,10 @@ [email protected]:
55345563
version "6.5.1"
55355564
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
55365565

5566+
qs@~2.3.3:
5567+
version "2.3.3"
5568+
resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
5569+
55375570
qs@~6.5.1:
55385571
version "6.5.2"
55395572
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -6672,6 +6705,12 @@ union-value@^1.0.0:
66726705
is-extendable "^0.1.1"
66736706
set-value "^0.4.3"
66746707

6708+
union@~0.4.3:
6709+
version "0.4.6"
6710+
resolved "https://registry.yarnpkg.com/union/-/union-0.4.6.tgz#198fbdaeba254e788b0efcb630bc11f24a2959e0"
6711+
dependencies:
6712+
qs "~2.3.3"
6713+
66756714
uniq@^1.0.1:
66766715
version "1.0.1"
66776716
resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
@@ -6725,6 +6764,10 @@ urix@^0.1.0:
67256764
version "0.1.0"
67266765
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
67276766

6767+
url-join@^2.0.5:
6768+
version "2.0.5"
6769+
resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
6770+
67286771
url-join@^4.0.0:
67296772
version "4.0.0"
67306773
resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
@@ -7048,6 +7091,10 @@ wide-align@^1.1.0:
70487091
dependencies:
70497092
string-width "^1.0.2 || 2"
70507093

7094+
wordwrap@~0.0.2:
7095+
version "0.0.3"
7096+
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
7097+
70517098
wordwrap@~1.0.0:
70527099
version "1.0.0"
70537100
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"

0 commit comments

Comments
 (0)