libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3119 from storytouch/fix_3118 

Create plugin to run tests for line attribs + fix #3118
This commit is contained in:
Luiza Pagliari 2017-02-02 17:54:20 -02:00 committed by GitHub
parent 40f54fed38 520f257ed1
commit a6436ac8d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -4,6 +4,7 @@ node_js:
install: install:
- "bin/installDeps.sh" - "bin/installDeps.sh"
- "export GIT_HASH=$(git rev-parse --verify --short HEAD)" - "export GIT_HASH=$(git rev-parse --verify --short HEAD)"
- "npm install ep_test_line_attrib"
before_script: before_script:
- "tests/frontend/travis/sauce_tunnel.sh" - "tests/frontend/travis/sauce_tunnel.sh"
script: script:

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

@ -1782,9 +1782,9 @@ function Ace2Inner(){
return !!STYLE_ATTRIBS[aname]; return !!STYLE_ATTRIBS[aname];
} }
function isIncorpedAttribute(aname) function isOtherIncorpedAttribute(aname)
{ {
return ( !! STYLE_ATTRIBS[aname]) || ( !! OTHER_INCORPED_ATTRIBS[aname]); return !!OTHER_INCORPED_ATTRIBS[aname];
} }
function insertDomLines(nodeToAddAfter, infoStructs, isTimeUp) function insertDomLines(nodeToAddAfter, infoStructs, isTimeUp)
@ -2526,7 +2526,6 @@ function Ace2Inner(){
function doIncorpLineSplice(startLine, deleteCount, newLineEntries, lineAttribs, hints) function doIncorpLineSplice(startLine, deleteCount, newLineEntries, lineAttribs, hints)
{ {
var startOldChar = rep.lines.offsetOfIndex(startLine); var startOldChar = rep.lines.offsetOfIndex(startLine);
var endOldChar = rep.lines.offsetOfIndex(startLine + deleteCount); var endOldChar = rep.lines.offsetOfIndex(startLine + deleteCount);
@ -2760,7 +2759,7 @@ function Ace2Inner(){
{ {
function incorpedAttribFilter(anum) function incorpedAttribFilter(anum)
{ {
return isStyleAttribute(rep.apool.getAttribKey(anum)); return !isOtherIncorpedAttribute(rep.apool.getAttribKey(anum));
} }
function attribRuns(attribs) function attribRuns(attribs)