다른 변경사항 롤백

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8085 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-02-10 06:16:36 +00:00
parent 651c66cb2b
commit 5f38afe37e
12 changed files with 81 additions and 77 deletions

View file

@ -895,26 +895,24 @@ var TextWriter = xe.createPlugin('TextWriter', {
obj.children('div._txt').each(function(){
var div = $(this), node = null;
div
.contents()
.each(function(){
var $this = $(this);
div.contents().each(function(){
var t = $(this);
if(this.nodeType == 3 || $this.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) {
if( $this.is('br,img') || $.trim($this.text()) ) {
if(!node) div.before(node = $('<p>'));
node.append(this);
} else {
$this.remove();
}
return true;
}
if(this.nodeType == 3 || t.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) {
if( t.is('br,img') || $.trim(t.text()) ) {
if(!node) div.before(node = $('<p>'));
node.append(this);
} else {
t.remove();
}
return true;
}
div.before($this);
node = null;
})
.end()
.remove();
div.before(t);
node = null;
});
div.remove();
});
},
API_OPEN_TXT_EDITOR : function(sender, params) {
@ -963,7 +961,6 @@ var TextWriter = xe.createPlugin('TextWriter', {
if(save) {
var newBox = $('<div>').html( cfg.xpress.getIR() );
if (newBox.find('>p'))
box.remove();
this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'TXT']);
} else {