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

Removed filtering for username/Fixed all JSON errors. #64

Merged
merged 2 commits into from Jan 19, 2017
Merged

Removed filtering for username/Fixed all JSON errors. #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c79836
Removed filtering for username
duncannevin Jan 19, 2017
a4116d2
Fixed count error
duncannevin Jan 19, 2017
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
Prev Previous commit
Fixed count error
  • Loading branch information
@duncannevin
duncannevin committed Jan 19, 2017
commit a4116d2c3b64c0b3ddbf0e4eb8f67c660a8f6514
6 changes: 3 additions & 3 deletions client/js/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ module.exports = {
})
},

quillOn(doc) {
quillOn(context, doc) {
this.quill.on('text-change', () => {
let text = this.quill.getText()
let stats = this.textStats(text)
this.time = stats.display
this.count = stats.length
context.time = stats.display
context.count = stats.length

docsave.docData.currentDoc.doc = text;
})
Expand Down
3 changes: 2 additions & 1 deletion client/vue-components/main_content.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@
editor.doc = connection.get('docs', this.uri);
// New quill
editor.makeQuill();
editor.quillOn(editor.doc);
editor.quillOn(this, editor.doc);
editor.docSubscribe(editor.quill, editor.doc);

},
data() {
return {
Expand Down
1 change: 1 addition & 0 deletions client/vue-components/navbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import docsave from '../js/docsave.js'
import Signin from './signin.vue'
import Signup from './signup.vue'

export default {
created() {
},
Expand Down