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

Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs 

Clean-up after removing list attribute: Remove list numbering attribute
This commit is contained in:
John McLear 2014-12-31 13:19:24 +00:00
parent 335bf3dc4a cfe75c7f3f
commit b5c671a9b6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/js/AttributeManager.js
View File

@ -169,11 +169,11 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
if(attrib[0] === attributeName) return [attributeName, null] if(attrib[0] === attributeName) return [attributeName, null]
return attrib return attrib
}) })
if(hasMarker){ if(hasMarker){
ChangesetUtils.buildKeepRange(this.rep, builder, loc, (loc = [lineNum, 0])); ChangesetUtils.buildKeepRange(this.rep, builder, loc, (loc = [lineNum, 0]));
// If length == 4, there's [author, lmkr, insertorder, + the attrib being removed] thus we can remove the marker entirely // If length == 4, there's [author, lmkr, insertorder, + the attrib being removed] thus we can remove the marker entirely
if(attribs.length == 4) ChangesetUtils.buildRemoveRange(this.rep, builder, loc, (loc = [lineNum, 1])) if(attribs.length <= 4) ChangesetUtils.buildRemoveRange(this.rep, builder, loc, (loc = [lineNum, 1]))
else ChangesetUtils.buildKeepRange(this.rep, builder, loc, (loc = [lineNum, 1]), attribs, this.rep.apool); else ChangesetUtils.buildKeepRange(this.rep, builder, loc, (loc = [lineNum, 1]), attribs, this.rep.apool);
} }

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

@ -5073,6 +5073,7 @@ function Ace2Inner(){
{ {
if(listType == ''){ if(listType == ''){
documentAttributeManager.removeAttributeOnLine(lineNum, listAttributeName); documentAttributeManager.removeAttributeOnLine(lineNum, listAttributeName);
documentAttributeManager.removeAttributeOnLine(lineNum, 'start');
}else{ }else{
documentAttributeManager.setAttributeOnLine(lineNum, listAttributeName, listType); documentAttributeManager.setAttributeOnLine(lineNum, listAttributeName, listType);
} }