X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/72006ca5628befdc32bb1cd31002f22c4a7c8bca..a29236f6a3f5166a3cace703dd5f89cf17405617:/modules/documentCanvas/canvas/canvas.js
diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 3ae6a3e..5ec69ea 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -6,41 +6,45 @@ define([
'use strict';
-var Canvas = function(xml) {
- xml = $.parseXML(xml);
- this.d = xml !== null ? $(xml.childNodes[0]) : null;
- if(this.d) {
- var wrapper = $('
');
- wrapper.append(this.d);
- wrapper.find(':not(iframe)').addBack().contents()
- .filter(function() {return this.nodeType === Node.TEXT_NODE})
- .each(function() {
-
- var el = $(this);
-
- // TODO: use DocumentElement API
- var spanParent = el.parent().prop('tagName') === 'span',
- spanBefore = el.prev().length > 0 && $(el.prev()[0]).prop('tagName') === 'span',
- spanAfter = el.next().length > 0 && $(el.next()[0]).prop('tagName') === 'span';
-
- if(spanParent || spanBefore || spanAfter) {
- var startSpace = /\s/g.test(this.data.substr(0,1));
- var endSpace = /\s/g.test(this.data.substr(-1)) && this.data.length > 1;
- var trimmed = $.trim(this.data);
- this.data = (startSpace && (spanParent || spanBefore) ? ' ' : '')
- + trimmed
- + (endSpace && (spanParent || spanAfter) ? ' ' : '');
-
- } else {
- this.data = $.trim(this.data);
- }
- });
- this.d.unwrap();
- };
+var Canvas = function(wlxml) {
+ this.loadWlxml(wlxml);
};
$.extend(Canvas.prototype, {
+ loadWlxml: function(wlxml) {
+ var xml = $.parseXML(wlxml);
+ this.d = xml !== null ? $(xml.childNodes[0]) : null;
+ if(this.d) {
+ var wrapper = $('
');
+ wrapper.append(this.d);
+ wrapper.find(':not(iframe)').addBack().contents()
+ .filter(function() {return this.nodeType === Node.TEXT_NODE})
+ .each(function() {
+
+ var el = $(this);
+
+ // TODO: use DocumentElement API
+ var spanParent = el.parent().prop('tagName') === 'span',
+ spanBefore = el.prev().length > 0 && $(el.prev()[0]).prop('tagName') === 'span',
+ spanAfter = el.next().length > 0 && $(el.next()[0]).prop('tagName') === 'span';
+
+ if(spanParent || spanBefore || spanAfter) {
+ var startSpace = /\s/g.test(this.data.substr(0,1));
+ var endSpace = /\s/g.test(this.data.substr(-1)) && this.data.length > 1;
+ var trimmed = $.trim(this.data);
+ this.data = (startSpace && (spanParent || spanBefore) ? ' ' : '')
+ + trimmed
+ + (endSpace && (spanParent || spanAfter) ? ' ' : '');
+
+ } else {
+ this.data = $.trim(this.data);
+ }
+ });
+ this.d.unwrap();
+ };
+ },
+
doc: function() {
if(this.d === null)
return null;