fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editor: remove unused code
[fnpeditor.git]
/
src
/
wlxml
/
extensions
/
list
/
list.js
diff --git
a/src/wlxml/extensions/list/list.js
b/src/wlxml/extensions/list/list.js
index
6d7b251
..
2a996ac
100644
(file)
--- a/
src/wlxml/extensions/list/list.js
+++ b/
src/wlxml/extensions/list/list.js
@@
-22,6
+22,13
@@
extension.wlxmlClass.list.methods = {
}
};
}
};
+extension.wlxmlClass.list.transformations = {
+ extractAllItems: function() {
+ var contents = this.contents();
+ return this.document.extractItems({item1: contents[0], item2: _.last(contents)});
+ }
+};
+
extension.document.methods = {
areItemsOfSameList: function(params) {
return params.node1.parent().sameNode(params.node2.parent()) && params.node2.parent().is('list');
extension.document.methods = {
areItemsOfSameList: function(params) {
return params.node1.parent().sameNode(params.node2.parent()) && params.node2.parent().is('list');
@@
-35,15
+42,20
@@
extension.document.transformations.createList = {
/* globals Node */
var parent = params.node1.parent(),
parentContents = parent.contents(),
/* globals Node */
var parent = params.node1.parent(),
parentContents = parent.contents(),
- nodeIndexes = [params.node1.getIndex(), params.node2.getIndex()].sort(),
+ nodeIndexes = [params.node1.getIndex(), params.node2.getIndex()].sort(
function(a,b) { return a-b; }
),
nodesToWrap = [],
nodesToWrap = [],
- listNode = params.node1.document.createDocumentNode({tagName: 'div', attrs: {'class': 'list'}}),
+ listClass = params.klass || 'list',
+ listNode = params.node1.document.createDocumentNode({tagName: 'div', attrs: {'class': listClass}}),
+ listPlacePtr = params.node1,
node, i;
node, i;
-
+
for(i = nodeIndexes[0]; i <= nodeIndexes[1]; i++) {
node = parentContents[i];
if(node.nodeType === Node.TEXT_NODE) {
node = node.wrapWith({tagName: 'div', attrs: {'class': 'item'}});
for(i = nodeIndexes[0]; i <= nodeIndexes[1]; i++) {
node = parentContents[i];
if(node.nodeType === Node.TEXT_NODE) {
node = node.wrapWith({tagName: 'div', attrs: {'class': 'item'}});
+ if(i === nodeIndexes[0]) {
+ listPlacePtr = node;
+ }
} else {
node.setClass('item');
}
} else {
node.setClass('item');
}
@@
-60,7
+72,7
@@
extension.document.transformations.createList = {
toInsert = listNode;
}
toInsert = listNode;
}
-
params.node1
.before(toInsert);
+
listPlacePtr
.before(toInsert);
nodesToWrap.forEach(function(node) {
listNode.append(node);
nodesToWrap.forEach(function(node) {
listNode.append(node);
@@
-78,7
+90,7
@@
extension.document.transformations.extractItems = {
impl: function(params) {
params = _.extend({}, {merge: true}, params);
var list = params.item1.parent(),
impl: function(params) {
params = _.extend({}, {merge: true}, params);
var list = params.item1.parent(),
- indexes = [params.item1.getIndex(), params.item2.getIndex()].sort(),
+ indexes = [params.item1.getIndex(), params.item2.getIndex()].sort(
function(a,b) { return a-b;}
),
precedingItems = [],
extractedItems = [],
succeedingItems = [],
precedingItems = [],
extractedItems = [],
succeedingItems = [],
@@
-105,7
+117,7
@@
extension.document.transformations.extractItems = {
reference.after(item);
reference = item;
if(!listIsNested) {
reference.after(item);
reference = item;
if(!listIsNested) {
- item.setClass(
null
);
+ item.setClass(
''
);
}
});
if(precedingItems.length === 0) {
}
});
if(precedingItems.length === 0) {
@@
-115,18
+127,18
@@
extension.document.transformations.extractItems = {
extractedItems.forEach(function(item) {
reference.before(item);
if(!listIsNested) {
extractedItems.forEach(function(item) {
reference.before(item);
if(!listIsNested) {
- item.setClass(
null
);
+ item.setClass(
''
);
}
});
} else {
extractedItems.forEach(function(item) {
reference.after(item);
if(!listIsNested) {
}
});
} else {
extractedItems.forEach(function(item) {
reference.after(item);
if(!listIsNested) {
- item.setClass(
null
);
+ item.setClass(
''
);
}
reference = item;
});
}
reference = item;
});
- var secondList = params.item1.document.createDocumentNode({tagName: 'div', attrs: {'class':'list'}}),
+ var secondList = params.item1.document.createDocumentNode({tagName: 'div', attrs: {'class':
list.getClass() ||
'list'}}),
toAdd = secondList;
if(listIsNested) {
toAdd = secondList;
if(listIsNested) {