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

fixed + support for value

This commit is contained in:
Cristo 2015-03-06 23:02:31 +01:00
parent 56dbad41ad
commit da1bf00a78
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,37 +153,36 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
return this.applyChangeset(builder); return this.applyChangeset(builder);
}, },
/* /**
Removes a specified attribute on a line * Removes a specified attribute on a line
@param lineNum: the number of the affected line * @param lineNum the number of the affected line
@param attributeKey: the name of the attribute to remove, e.g. list * @param attributeName the name of the attribute to remove, e.g. list
* @param attributeValue if given only attributes with equal value will be removed
*/ */
removeAttributeOnLine: function(lineNum, attributeName, attributeValue){ removeAttributeOnLine: function(lineNum, attributeName, attributeValue){
var loc = [0,0]; var builder = Changeset.builder(this.rep.lines.totalWidth());
var builder = Changeset.builder(this.rep.lines.totalWidth()); var hasMarker = this.lineHasMarker(lineNum);
var hasMarker = this.lineHasMarker(lineNum); var found = false;
var attribs
var foundAttrib = false var attribs = _(this.getAttributesOnLine(lineNum)).map(function (attrib) {
if (attrib[0] === attributeName && (!attributeValue || attrib[0] === attributeValue)){
attribs = this.getAttributesOnLine(lineNum).map(function(attrib) { found = true;
if(attrib[0] === attributeName) { return [attributeName, ''];
foundAttrib = true }
return [attributeName, null] // remove this attrib from the linemarker return attrib;
});
if (!found) {
return;
}
ChangesetUtils.buildKeepToStartOfRange(this.rep, builder, [lineNum, 0]);
var list = _.chain(attribs).filter(function(a){return !!a[1];}).map(function(a){return a[0];}).value();
//if we have marker and any of attributes don't need to have marker. we need delete it
if(hasMarker && !_.intersection(lineAttributes,list)){
ChangesetUtils.buildRemoveRange(this.rep, builder, [lineNum, 0], [lineNum, 1]);
}else{
ChangesetUtils.buildKeepRange(this.rep, builder, [lineNum, 0], [lineNum, 1], attribs, this.rep.apool);
} }
return attrib
})
if(!foundAttrib) {
return
}
if(hasMarker){
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(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);
}
return this.applyChangeset(builder); return this.applyChangeset(builder);
}, },
@ -202,4 +201,4 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
} }
}); });
module.exports = AttributeManager; module.exports = AttributeManager;