caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pre' of insomnia247.nl:/home/benweet/stackedit into pre

Browse Source
This commit is contained in:
benweet 2014-07-24 18:14:38 +01:00
commit c4bdc6cfe9
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
public/res/editor.js
View File

@ -159,21 +159,21 @@ define([
start = start < 0 ? 0 : start; start = start < 0 ? 0 : start;
end = end < 0 ? 0 : end; end = end < 0 ? 0 : end;
var range = document.createRange(); var range = document.createRange();
var offsetList = []; var offsetList = [], startIndex, endIndex;
if(_.isNumber(start)) { if(_.isNumber(start)) {
offsetList.push(start); offsetList.push(start);
start = offsetList.length - 1; startIndex = offsetList.length - 1;
} }
if(_.isNumber(end)) { if(_.isNumber(end)) {
offsetList.push(end); offsetList.push(end);
end = offsetList.length - 1; endIndex = offsetList.length - 1;
} }
offsetList = this.findOffsets(offsetList); offsetList = this.findOffsets(offsetList);
var startOffset = _.isObject(start) ? start : offsetList[start]; var startOffset = _.isObject(start) ? start : offsetList[startIndex];
range.setStart(startOffset.container, startOffset.offsetInContainer); range.setStart(startOffset.container, startOffset.offsetInContainer);
var endOffset = startOffset; var endOffset = startOffset;
if(end && end != start) { if(end && end != start) {
endOffset = _.isObject(end) ? end : offsetList[end]; endOffset = _.isObject(end) ? end : offsetList[endIndex];
} }
range.setEnd(endOffset.container, endOffset.offsetInContainer); range.setEnd(endOffset.container, endOffset.offsetInContainer);
return range; return range;
@ -627,6 +627,22 @@ define([
eventMgr.addListener('onDiscussionRemoved', onComment); eventMgr.addListener('onDiscussionRemoved', onComment);
eventMgr.addListener('onCommentsChanged', onComment); eventMgr.addListener('onCommentsChanged', onComment);
var triggerSpellCheck = _.debounce(function() {
if(!selectionMgr.hasFocus || selectionMgr.selectionStart !== selectionMgr.selectionEnd) {
return;
}
var selection = window.getSelection();
// Hack for Chrome to trigger the spell checker
if(selectionMgr.selectionStart) {
selection.modify("move", "backward", "character");
selection.modify("move", "forward", "character");
}
else {
selection.modify("move", "forward", "character");
selection.modify("move", "backward", "character");
}
}, 10);
var trailingLfNode; var trailingLfNode;
function checkContentChange() { function checkContentChange() {
@ -661,6 +677,7 @@ define([
eventMgr.onContentChanged(fileDesc, textContent); eventMgr.onContentChanged(fileDesc, textContent);
updateDiscussionList && eventMgr.onCommentsChanged(fileDesc); updateDiscussionList && eventMgr.onCommentsChanged(fileDesc);
undoMgr.saveState(); undoMgr.saveState();
triggerSpellCheck();
} }
else { else {
textContent = newTextContent; textContent = newTextContent;