fixed OpenPNE's tinyMCE plugin doesn't convert to op:font correctly (…

…fixes #1297)
kawahara · Jul 6, 2010 · debd81c · debd81c
1 parent e64bbd0
commit debd81c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/web/js/tiny_mce/plugins/openpne/editor_plugin.js b/web/js/tiny_mce/plugins/openpne/editor_plugin.js
diff --git a/web/js/tiny_mce/plugins/openpne/editor_plugin.js.src b/web/js/tiny_mce/plugins/openpne/editor_plugin.js.src
@@ -502,13 +502,8 @@
 
                     var newObj = editor.dom.create(tagname);
                     editor.dom.setAttribs(newObj, args);
+                    editor.dom.replace(newObj, targetObj, true);
 
-                    if (tinymce.isIE) {
-                        newObj.innerHTML = targetObj.innerHTML;
-                        targetObj.parentNode.replaceChild(newObj, targetObj);
-                    } else {
-                        editor.dom.replace(newObj, targetObj, true);
-                    }
                     tagList = doc.getElementsByTagName(org_tagname);
                 }
                 s = editorDoc.innerHTML;
@@ -522,7 +517,7 @@
             rep(/<\/?div>/gi,"");  // for Safari
 
             if (Prototype.Browser.IE) {
-                rep(/<(\/?)op(b|u|s|i|font|large|small|color)/gi, '<$1op:$2');
+                rep(/<(\/?):?op(b|u|s|i|font|large|small|color)/gi, '<$1op:$2');
             }
 
             rep(/<br\s?\/?[^>]*>/gi,"\n\n");