Changeset 6231

Timestamp:

Apr 1, 2008, 8:38:34 PM (13 years ago)

Author:

ebihara

Message:

#333:fontタグが入れ子になると正常に独自タグへの置換ができなかったのを修正

File:

• OpenPNE/branches/work/ebihara/prj_deco_diary/public_html/js/tiny_mce/plugins/openpne/editor_plugin.js (modified) (5 diffs)

OpenPNE/branches/work/ebihara/prj_deco_diary/public_html/js/tiny_mce/plugins/openpne/editor_plugin.js

@@ -58 +58 @@
             ed.onPostProcess.add(function(ed, o) {  // To text mode
                 if (o.save) {
-                    o.content = t._previewToText(o.content);
+                    o.content = t._previewToText(o.content, ed);
                 }
             });
@@ -80 +80 @@
         },
 
-        _previewToText : function(s) {
-            var rule = /<(font|b|u|s|i)( size="(2|7)"| color="(#[0-9a-f]{3,6})"|)( color="(#[0-9a-f]{3,6})"| size="(2|7)"|)>(.*?)<\/\1>/;
-            s = tinymce.trim(s);
+        _previewToText : function(s, editor) {
+            var editorDoc = editor.getBody();
 
             function rep(re, str) {
@@ -88 +87 @@
             };
 
-            function convertHtmlTagToDecoTag(matches)
+            s = tinymce.trim(s);
+            editorDoc.innertHTML = s;
+
+            function convertHtmlTagToDecoTag(tagname, doc)
             {
-                var tagname = matches[1];
-                var font_size = matches[3] || matches[7];
-                var font_color = matches[4] || matches[6];
-                var value = matches[8].gsub(rule, convertHtmlTagToDecoTag);
-                var opt = "";
-               
-                // convert font tag 
-                if (tagname == "font") {
-                    if (font_size == "7") {
-                        tagname = "large";
-                    } else if (font_size == "2") {
-                        tagname = "small";
+                var tagList = doc.getElementsByTagName(tagname);
+                var count = tagList.length;
+                var org_tagname = tagname;
+                while (tagList.length) {
+                    targetObj = tagList[0];
+
+                    if (org_tagname == 'font') {
+                        var size = targetObj.getAttribute('size');
+                        var color = targetObj.getAttribute('color');
+
+                        if (size == '7') {
+                            tagname = 'op:large';
+                        } else if (size == '2') {
+                            tagname = 'op:small';
+                        }
+
+                        if (color) {
+                            tagname = 'op:color:' + color.replace('#', '');
+                        }
+                    } else {
+                        tagname = 'op:' + org_tagname;
                     }
 
-                    if (font_size && font_color) {
-                        return "<op:color:" + font_color + "><op:" + tagname + ">" + value + "</op:" + tagname + "></op:color>";
-                    } else if (font_color) {
-                        tagname = "color";
-                        opt = ":" + font_color;
-                    }
+                    var newObj = document.createElement(tagname);
+                    editor.dom.replace(newObj, targetObj, true);
+                    tagList = doc.getElementsByTagName(org_tagname);
+                }
+                s = editorDoc.innerHTML;
+            }
 
-                    if (tagname == "font") {  // can't convert
-                        return value;
-                    }
-                }
-
-                var converted = "<op:" + tagname + opt + ">" + value + "</op:" + tagname + ">";
-                return converted;
-            };
-
-            s = s.gsub(rule, convertHtmlTagToDecoTag);
-            rep(/<br\s?\/?>/gi,"\n\n");
+            var convertList = new Array('b', 'u', 's', 'i', 'font');
+            for (var i = 0; i < convertList.length; i++) {
+                convertHtmlTagToDecoTag(convertList[i], editor.getBody());
+            }
+            rep(/<\/op:color:[0-9a-f]{3,6}>/gi,"</op:color>");
+            rep(/<\/p>/gi,"<br />");
+            rep(/<p>/gi,"");
+            rep(/<br\s?\/?[^>]*>/gi,"\n\n");
             rep(/&nbsp;/gi," ");
             rep(/&quot;/gi,"\"");
@@ -133 +141 @@
         _textToPreview : function(s) {
             s = tinymce.trim(s);
-            var rule = /&lt;op:(b|u|s|i|large|small|color)(:(#[0-9a-f]{3,6})|)&gt;(.*?)&lt;\/op:\1&gt;/;
+            var rule = /&lt;op:(b|u|s|i|large|small|color)(:([0-9a-f]{3,6})|)&gt;(.*?)&lt;\/op:\1&gt;/;
 
             function rep(re, str) {
@@ -148 +156 @@
                 if (tagname == 'color' && color) {
                     tagname = 'font';
-                    opt = ' color="' + color + '"';
+                    opt = ' color="#' + color + '"';
                 }