fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wlxml: lists - extractListItems
[fnpeditor.git]
/
src
/
editor
/
modules
/
documentCanvas
/
canvas
/
documentElement.js
diff --git
a/src/editor/modules/documentCanvas/canvas/documentElement.js
b/src/editor/modules/documentCanvas/canvas/documentElement.js
index
f4505b0
..
27160e7
100644
(file)
--- a/
src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/
src/editor/modules/documentCanvas/canvas/documentElement.js
@@
-11,9
+11,6
@@
define([
// DocumentElement represents a text or an element node from WLXML document rendered inside Canvas
var DocumentElement = function(wlxmlNode, canvas) {
// DocumentElement represents a text or an element node from WLXML document rendered inside Canvas
var DocumentElement = function(wlxmlNode, canvas) {
- if(arguments.length === 0) {
- return;
- }
this.wlxmlNode = wlxmlNode;
this.canvas = canvas;
this.wlxmlNode = wlxmlNode;
this.canvas = canvas;
@@
-50,16
+47,9
@@
$.extend(DocumentElement.prototype, {
return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
},
return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
},
- markAsCurrent: function() {
- this.canvas.markAsCurrent(this);
- },
-
getVerticallyFirstTextElement: function() {
var toret;
this.children().some(function(child) {
getVerticallyFirstTextElement: function() {
var toret;
this.children().some(function(child) {
- if(!child.isVisible()) {
- return false; // continue
- }
if(child instanceof DocumentTextElement) {
toret = child;
return true; // break
if(child instanceof DocumentTextElement) {
toret = child;
return true; // break
@@
-87,16
+77,6
@@
$.extend(DocumentElement.prototype, {
return this.canvas.getDocumentElement(utils.nearestInDocumentOrder(selector, direction, this.dom()[0]));
},
return this.canvas.getDocumentElement(utils.nearestInDocumentOrder(selector, direction, this.dom()[0]));
},
- isVisible: function() {
- return this instanceof DocumentTextElement || this.getWlxmlTag() !== 'metadata';
- },
-
- isInsideList: function() {
- return this.parents().some(function(parent) {
- return parent.is('list');
- });
- },
-
exec: function(method) {
if(this.manager && this.manager[method]) {
return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1));
exec: function(method) {
if(this.manager && this.manager[method]) {
return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1));
@@
-124,7
+104,7
@@
var manipulate = function(e, params, action) {
return element;
};
return element;
};
-DocumentNodeElement.prototype =
new DocumentElement(
);
+DocumentNodeElement.prototype =
Object.create(DocumentElement.prototype
);
$.extend(DocumentNodeElement.prototype, {
$.extend(DocumentNodeElement.prototype, {
@@
-226,12
+206,6
@@
$.extend(DocumentNodeElement.prototype, {
this.manager = wlxmlManagers.getFor(this);
this.manager.setup();
},
this.manager = wlxmlManagers.getFor(this);
this.manager.setup();
},
- is: function(what) {
- if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass())) {
- return true;
- }
- return false;
- },
toggleLabel: function(toggle) {
var displayCss = toggle ? 'inline-block' : 'none';
var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');
toggleLabel: function(toggle) {
var displayCss = toggle ? 'inline-block' : 'none';
var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');
@@
-262,7
+236,7
@@
$.extend(DocumentTextElement, {
}
});
}
});
-DocumentTextElement.prototype =
new DocumentElement(
);
+DocumentTextElement.prototype =
Object.create(DocumentElement.prototype
);
$.extend(DocumentTextElement.prototype, {
createDOM: function() {
$.extend(DocumentTextElement.prototype, {
createDOM: function() {