Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add line number feature #11

Open
wants to merge 2 commits into
base: 2.0
Choose a base branch
from
Open

add line number feature #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b52f64
add line number feature
huruji Apr 11, 2018
18e065f
add fullscreen and preview feature
huruji Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 56 additions & 22 deletions src/components/inputer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
<template>
<div>
<textarea id="inputer" :value='rawTxt' @input='inputting' @scroll='syncStroll' @drop.stop.prevent='dragging' autofocus></textarea>
<div class="inputer-container" :class="{'fullscreen': fullscreen, 'preview': preview}">
<div class="inputer-content">
<textarea id="inputer" :value='rawTxt' @input='inputting' @scroll='syncStroll' @drop.stop.prevent='dragging' autofocus>
</textarea>
<line-number/>
</div>
</div>
</template>

<script>
import lineNumber from './lineNumber.vue';

export default {
components:{
lineNumber
},
computed: {
rawTxt () {
return this.$store.getters.articleRaw
},
fullscreen() {
return this.$store.state.fullscreen;
},
preview() {
return this.$store.state.preview;
}
},
methods: {
Expand All @@ -18,14 +33,18 @@
},
syncStroll (e) {
let outputer = document.querySelector('.outputer')
let lineContainer = document.querySelector('.line-container')
console.log(e.target.scrollTop);
outputer.scrollTop = e.target.scrollTop
console.log(lineContainer.style.top );
lineContainer.style.top = -e.target.scrollTop + 'px';
},
dragging (e) {
let self = this
let dt = e.dataTransfer;
let files = dt.files;
let fileReader = new FileReader();
fileReader.readAsText(files[0], 'UTF-8');
let dt = e.dataTransfer;
let files = dt.files;
let fileReader = new FileReader();
ileReader.readAsText(files[0], 'UTF-8');
fileReader.onloadend = function (e) {
let value = e.target.result
self.$store.dispatch('textInput', value)
Expand All @@ -37,25 +56,40 @@
</script>

<style scoped lang="less">
div {
div.inputer-container.fullscreen{
width:100%;
}
div.inputer-container.preview{
display:none;
}
div.inputer-container {
position:relative;
width: 50%;
height: 100%;
margin-right: 10px;
textarea {
box-sizing: border-box;
height: 100%;
width: 100%;
vertical-align: top;
padding: 15px;
resize: none;
border: none;
background-color: #f5f5f5;
outline: none;
font-family: inherit;
font-size: 18px;
color: #616161;
box-shadow: 4px 5px 3px #aaa;
transition: all ease .3s;
overflow:hidden;
div.inputer-content{
margin-left:45px;
height:100%;
textarea {
position:relative;
z-index:99999;
box-sizing: border-box;
height: 100%;
width: 100%;
vertical-align: top;
padding: 15px 15px 15px 10px;
resize: none;
border: none;
background-color: #f5f5f5;
outline: none;
font-family: inherit;
font-size: 18px;
color: #616161;
box-shadow: 4px 5px 3px #aaa;
transition: all ease .3s;
line-height:26px;
}
}
}
</style>
73 changes: 73 additions & 0 deletions src/components/lineNumber.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<template>
<div class="line-container">
<ul>
<li v-for="(line, index) in lineArr" class="line-item">
<span class="line-number">{{index + 1}}</span>
<pre class="line-content">{{line === '' ? ' ' : line}}</pre>
</li>
</ul>
</div>
</template>


<script>
export default{
name: 'lineNumber',
computed: {
lineArr: function() {
return this.$store.getters.articleLineRaw
}
}
}
</script>

<style scoped lang="less">
div.line-container{
position: absolute;
top: 0px;
left: 0px;
min-height:100%;
width: 100%;
margin:0;
padding-top:15px;
background:#cecece;
.line-bar{
position: absolute;

}
.line-content{
visibility: hidden;
}
ul{
height: 100%;
padding: 0;
margin-top: 0;
li{
list-style:none;
position:relative;
.line-number{
position: absolute;
font-size: 14px;
width: 35px;
padding:0 5px;
line-height:26px;
text-align:right;
overflow: hidden;
color:#777;
}
.line-content{
font-size: 18px;
line-height: 26px;
margin: 0 17px 0 55px;
padding: 0;
display: inline-block;
word-wrap: break-word;
white-space: pre-wrap;
word-break: normal;
border: none;
border-radius: 0;
}
}
}
}
</style>
107 changes: 93 additions & 14 deletions src/components/navBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,81 @@
<template>
<nav>
<ul>
<li><button @click='showMenu'><i class="fa fa-bars"></i></button></li>
<li><button @click='insert("**Bold**")'><i class="fa fa-bold"></i></button></li>
<li><button @click='insert("*Italic*")'><i class="fa fa-italic"></i></button></li>
<li><button @click='insert("[Link](http://example.com/)")'><i class="fa fa-link"></i></button></li>
<li><button @click='insert("\n> ")'><i class="fa fa-quote-left"></i></button></li>
<li><button @click='insert("`code`")'><i class="fa fa-code"></i></button></li>
<li><button @click='insert("![Img](http://example.com/)")'><i class="fa fa-picture-o"></i></button></li>
<li><button @click='insert("\n- ")'><i class="fa fa-list-ul"></i></button></li>
<li><button @click='insert("\n# ")'><i class="fa fa-header"></i></button></li>
<li><button @click='insert("\n\n---\n\n")'><i class="fa fa-underline"></i></button></li>
<li><button @click='insert("\n\n| title | title | title |\n| --- | --- | --- |\n| item | item | item |")'><i class="fa fa-th"></i></button></li>
<li><button @click='redirect("https://github.com/jrainlau/markcook")'><i class="fa fa-github"></i></button></li>
<li><button @click='redirect("https://github.com/jrainlau/markcook/issues")'><i class="fa fa-question"></i></button></li>
<li>
<button title="Menu" @click='showMenu'>
<i class="fa fa-bars"></i>
</button>
</li>
<li>
<button title="Bold" @click='insert("**Bold**")'>
<i class="fa fa-bold"></i>
</button>
</li>
<li>
<button title="Italic" @click='insert("*Italic*")'>
<i class="fa fa-italic"></i>
</button>
</li>
<li>
<button title="Link" @click='insert("[Link](http://example.com/)")'>
<i class="fa fa-link"></i>
</button>
</li>
<li>
<button title="Quote" @click='insert("\n> ")'>
<i class="fa fa-quote-left"></i>
</button>
</li>
<li>
<button title="Code" @click='insert("`code`")'>
<i class="fa fa-code"></i>
</button>
</li>
<li>
<button title="Image" @click='insert("![Img](http://example.com/)")'>
<i class="fa fa-picture-o"></i>
</button>
</li>
<li>
<button title="List" @click='insert("\n- ")'>
<i class="fa fa-list-ul"></i>
</button>
</li>
<li>
<button title="Headline" @click='insert("\n# ")'>
<i class="fa fa-header"></i>
</button>
</li>
<li>
<button title="Underline" @click='insert("\n\n---\n\n")'>
<i class="fa fa-underline"></i>
</button>
</li>
<li>
<button title="Table" @click='insert("\n\n| title | title | title |\n| --- | --- | --- |\n| item | item | item |")'>
<i class="fa fa-th"></i>
</button>
</li>
<li>
<button title="Fullscreen" @click='showFullscreen' :class="{'active': fullscreen}">
<i class="fa fa-arrows-alt"></i>
</button>
</li>
<li>
<button title="Preview" @click='showPreview' :class="{'active': preview}">
<i class="fa fa-columns"></i>
</button>
</li>
<li>
<button title="Github" @click='redirect("https://github.com/jrainlau/markcook")'>
<i class="fa fa-github"></i>
</button>
</li>
<li>
<button title="Question" @click='redirect("https://github.com/jrainlau/markcook/issues")'>
<i class="fa fa-question"></i>
</button>
</li>
</ul>
</nav>
</template>
Expand All @@ -35,6 +97,14 @@
}

export default {
computed: {
fullscreen() {
return this.$store.state.fullscreen;
},
preview() {
return this.$store.state.preview;
}
},
methods: {
showMenu () {
this.$store.dispatch('showMenu')
Expand All @@ -44,7 +114,7 @@
let startPosition = inputer.selectionStart
let endPosition = inputer.selectionEnd
let oldContent = inputer.value

inputer.focus()

let newContent = ''
Expand Down Expand Up @@ -100,6 +170,12 @@
},
redirect (url) {
window.open(url, '_blank')
},
showFullscreen(){
this.$store.commit('FULLSCREEN')
},
showPreview(){
this.$store.commit('PREVIEW')
}
}
}
Expand Down Expand Up @@ -135,6 +211,9 @@
background: none;
outline: none;
transition: all ease .3s;
&.active{
background: #00796B;
}
&:hover {
background: #00897B;
}
Expand Down
17 changes: 16 additions & 1 deletion src/components/outputer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="outputer" v-html='ripeTxt'></div>
<div class="outputer" v-html='ripeTxt' :class="{'fullscreen': fullscreen, 'preview': preview}"></div>
</template>

<script>
Expand All @@ -12,6 +12,12 @@
computed: {
ripeTxt () {
return this.$store.getters.articleMd
},
fullscreen() {
return this.$store.state.fullscreen;
},
preview() {
return this.$store.state.preview;
}
}
}
Expand All @@ -35,4 +41,13 @@
overflow-y: scroll;
word-wrap: break-word;
}

div.outputer.fullscreen{
display:none
}

div.outputer.preview{
width:100%;
max-width:1200px;
}
</style>
Loading