Changeset 9146

Timestamp:

Nov 14, 2008, 11:55:14 AM (14 years ago)

Author:

akamine

Message:

#3133 editor_pluginのfontタグの処理を修正

Location:

OpenPNE/branches/stable-2.12.x/public_html/js/tiny_mce/plugins/openpne

Files:

• editor_plugin.js (modified) (1 diff)
• editor_plugin.js.src (modified) (1 diff)

OpenPNE/branches/stable-2.12.x/public_html/js/tiny_mce/plugins/openpne/editor_plugin.js

@@ -37 +37 @@
 tagList=doc.getElementsByTagName(org_tagname);continue;}
 if(size=='5'){tagname='op:large';}else if(size=='1'){tagname='op:small';}
-if(color){tagname='op:color';args={code:color};}}else if(org_tagname=='span'){if(targetObj.style.fontWeight=='bold'){tagname='op:b';}else if(targetObj.style.textDecoration=='underline'){tagname='op:u';}else if(targetObj.style.textDecoration=='line-through'){tagname='op:s';}else if(targetObj.style.fontStyle=='italic'){tagname='op:i';}else if(targetObj.style.color){var color=tinyMCE.activeEditor.dom.toHex(targetObj.style.color);tagname='op:color';args={code:color};}else if(targetObj.style.fontSize=='x-large'){tagname='op:large';}else if(targetObj.style.fontSize=='x-small'){tagname='op:small';}else{editor.dom.remove(targetObj,true);continue;}}else{tagname='op:'+org_tagname;}
+if(color){tagname='op:color';args={code:color};}
+if(tagname==org_tagname){editor.dom.remove(targetObj,true);tagList=doc.getElementsByTagName(org_tagname);continue;}}else if(org_tagname=='span'){if(targetObj.style.fontWeight=='bold'){tagname='op:b';}else if(targetObj.style.textDecoration=='underline'){tagname='op:u';}else if(targetObj.style.textDecoration=='line-through'){tagname='op:s';}else if(targetObj.style.fontStyle=='italic'){tagname='op:i';}else if(targetObj.style.color){var color=tinyMCE.activeEditor.dom.toHex(targetObj.style.color);tagname='op:color';args={code:color};}else if(targetObj.style.fontSize=='x-large'){tagname='op:large';}else if(targetObj.style.fontSize=='x-small'){tagname='op:small';}else{editor.dom.remove(targetObj,true);continue;}}else{tagname='op:'+org_tagname;}
 if(tinymce.isIE){tagname=tagname.replace("op:","op");}
 var newObj=editor.dom.create(tagname);editor.dom.setAttribs(newObj,args);if(tinymce.isIE){newObj.innerHTML=targetObj.innerHTML;targetObj.parentNode.replaceChild(newObj,targetObj);}else{editor.dom.replace(newObj,targetObj,true);}

OpenPNE/branches/stable-2.12.x/public_html/js/tiny_mce/plugins/openpne/editor_plugin.js.src

@@ -451 +451 @@
                                 code: color
                             };
+                        }
+
+                        if (tagname == org_tagname) {
+                            editor.dom.remove(targetObj, true);
+                            tagList = doc.getElementsByTagName(org_tagname);
+                            continue;
                         }
                     } else if (org_tagname == 'span') {  // for safari