fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2471 from ether/ie-fix-backspace 

Ie fix backspace
This commit is contained in:
John McLear 2015-01-19 15:16:55 +00:00
parent edbeb66d5e c315defc31
commit f31b2fc9b5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/static/js/ace2_inner.js
View File

@ -1605,7 +1605,7 @@ function Ace2Inner(){
if (linesWrapped > 0) if (linesWrapped > 0)
{ {
if(!browser.ie){ if(!browser.msie){
// chrome decides in it's infinite wisdom that its okay to put the browsers visisble window in the middle of the span // chrome decides in it's infinite wisdom that its okay to put the browsers visisble window in the middle of the span
// an outcome of this is that the first chars of the string are no longer visible to the user.. Yay chrome.. // an outcome of this is that the first chars of the string are no longer visible to the user.. Yay chrome..
// Move the browsers visible area to the left hand side of the span // Move the browsers visible area to the left hand side of the span
@ -1910,6 +1910,7 @@ function Ace2Inner(){
if (charsLeft === 0) if (charsLeft === 0)
{ {
var index = 0; var index = 0;
browser.msie = false; // Temp fix to resolve enter and backspace issues..
if (browser.msie && line == (rep.lines.length() - 1) && lineNode.childNodes.length === 0) if (browser.msie && line == (rep.lines.length() - 1) && lineNode.childNodes.length === 0)
{ {
// best to stay at end of last empty div in IE // best to stay at end of last empty div in IE
@ -3583,6 +3584,7 @@ function Ace2Inner(){
// On Mac and Linux, move right moves to end of word and move left moves to start; // On Mac and Linux, move right moves to end of word and move left moves to start;
// on Windows, always move to start of word. // on Windows, always move to start of word.
// On Windows, Firefox and IE disagree on whether to stop for punctuation (FF says no). // On Windows, Firefox and IE disagree on whether to stop for punctuation (FF says no).
/*
if (browser.windows && forwardNotBack) if (browser.windows && forwardNotBack)
{ {
while ((!isDone()) && isWordChar(nextChar())) while ((!isDone()) && isWordChar(nextChar()))
@ -3605,6 +3607,7 @@ function Ace2Inner(){
advance(); advance();
} }
} }
*/
return i; return i;
} }
@ -4867,7 +4870,7 @@ function Ace2Inner(){
}) })
// CompositionEvent is not implemented below IE version 8 // CompositionEvent is not implemented below IE version 8
if ( !(browser.msie && browser.version < 9) && document.documentElement) if ( !(browser.msie && parseInt(browser.version) < 9) && document.documentElement)
{ {
$(document.documentElement).on("compositionstart", handleCompositionEvent); $(document.documentElement).on("compositionstart", handleCompositionEvent);
$(document.documentElement).on("compositionend", handleCompositionEvent); $(document.documentElement).on("compositionend", handleCompositionEvent);

2
src/static/js/contentcollector.js
View File

@ -625,13 +625,11 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
_ensureColumnZero(state); _ensureColumnZero(state);
} }
} }
if (browser.msie) if (browser.msie)
{ {
// in IE, a point immediately after a DIV appears on the next line // in IE, a point immediately after a DIV appears on the next line
_reachBlockPoint(node, 1, state); _reachBlockPoint(node, 1, state);
} }
state.localAttribs = localAttribs; state.localAttribs = localAttribs;
}; };
// can pass a falsy value for end of doc // can pass a falsy value for end of doc