fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearranging document toolbar icons
[fnpeditor.git]
/
modules
/
documentCanvas
/
canvas
/
canvas.js
diff --git
a/modules/documentCanvas/canvas/canvas.js
b/modules/documentCanvas/canvas/canvas.js
index
3eb4c6e
..
c4bfc09
100644
(file)
--- a/
modules/documentCanvas/canvas/canvas.js
+++ b/
modules/documentCanvas/canvas/canvas.js
@@
-115,6
+115,11
@@
$.extend(Canvas.prototype, {
wrapperElement.after({text: suffixOutside});
return wrapperElement;
},
wrapperElement.after({text: suffixOutside});
return wrapperElement;
},
+ getDocumentElement: function(from) {
+ if(from instanceof HTMLElement || from instanceof Text) {
+ return documentElement.wrap(from, this);
+ }
+ },
list: {}
});
list: {}
});
@@
-135,7
+140,8
@@
$.extend(Canvas.prototype.list, {
var place = 'before';
var canvas = this;
var place = 'before';
var canvas = this;
- parent.children().forEach(function(element) {
+ parent.children().some(function(element) {
+ var _e = element;
if(element.sameNode(params.element1))
place = 'inside';
if(place === 'inside') {
if(element.sameNode(params.element1))
place = 'inside';
if(place === 'inside') {
@@
-147,15
+153,15
@@
$.extend(Canvas.prototype.list, {
element.setWlxmlClass('item');
elementsToWrap.push(element);
}
element.setWlxmlClass('item');
elementsToWrap.push(element);
}
- if(
element
.sameNode(params.element2))
- return
fals
e;
+ if(
_e
.sameNode(params.element2))
+ return
tru
e;
});
var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
var toret;
if(parent.is('list')) {
});
var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
var toret;
if(parent.is('list')) {
- listElement.wrap({tag: 'div', klass: 'item'});
+ listElement.wrap
WithNodeElement
({tag: 'div', klass: 'item'});
toret = listElement.parent();
} else {
toret = listElement;
toret = listElement.parent();
} else {
toret = listElement;
@@
-169,6
+175,7
@@
$.extend(Canvas.prototype.list, {
});
},
extractItems: function(params) {
});
},
extractItems: function(params) {
+ params = _.extend({merge: true}, params);
var list = params.element1.parent();
if(!list.is('list') || !(list.sameNode(params.element2.parent())))
return false;
var list = params.element1.parent();
if(!list.is('list') || !(list.sameNode(params.element2.parent())))
return false;
@@
-199,7
+206,7
@@
$.extend(Canvas.prototype.list, {
var reference = listIsNested ? list.parent() : list;
if(succeedingItems.length === 0) {
var reference = listIsNested ? list.parent() : list;
if(succeedingItems.length === 0) {
- var
list
= reference;
+ var
reference_orig
= reference;
extractedItems.forEach(function(item) {
reference.after(item);
reference = item;
extractedItems.forEach(function(item) {
reference.after(item);
reference = item;
@@
-207,7
+214,7
@@
$.extend(Canvas.prototype.list, {
item.setWlxmlClass(null);
});
if(precedingItems.length === 0)
item.setWlxmlClass(null);
});
if(precedingItems.length === 0)
-
list
.detach();
+
reference_orig
.detach();
} else if(precedingItems.length === 0) {
extractedItems.forEach(function(item) {
reference.before(item);
} else if(precedingItems.length === 0) {
extractedItems.forEach(function(item) {
reference.before(item);
@@
-215,12
+222,11
@@
$.extend(Canvas.prototype.list, {
item.setWlxmlClass(null);
});
} else {
item.setWlxmlClass(null);
});
} else {
- var ptr = reference;
extractedItems.forEach(function(item) {
extractedItems.forEach(function(item) {
-
ptr
.after(item);
+
reference
.after(item);
if(!listIsNested)
item.setWlxmlClass(null);
if(!listIsNested)
item.setWlxmlClass(null);
-
ptr
= item;
+
reference
= item;
});
var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
toAdd = secondList;
});
var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
toAdd = secondList;
@@
-232,8
+238,18
@@
$.extend(Canvas.prototype.list, {
secondList.append(item);
});
secondList.append(item);
});
- ptr.after(toAdd);
+ reference.after(toAdd);
+ }
+ if(!params.merge && listIsNested) {
+ return this.extractItems({element1: extractedItems[0], element2: extractedItems[extractedItems.length-1]});
}
}
+ return true;
+ },
+ areItemsOfTheSameList: function(params) {
+ var e1 = params.element1,
+ e2 = params.element2;
+ return e1.parent().sameNode(e2.parent())
+ && e1.parent().is('list');
}
});
}
});