Changeset 5766

Timestamp:

Mar 15, 2008, 5:32:10 PM (12 years ago)

Author:

ebihara

Message:

#333:エディタにスタイルを指定した

Location:

OpenPNE/branches/work/ebihara/prj_deco_diary/public_html/js

Files:

• pne.js (modified) (1 diff)
• tiny_mce/plugins/openpne/editor_plugin.js (modified) (6 diffs)

OpenPNE/branches/work/ebihara/prj_deco_diary/public_html/js/pne.js

@@ -30 +30 @@
         theme_advanced_buttons2 : "",
         theme_advanced_buttons3 : "",
-        valid_elements : "b,u,s,i,font[color|size]"
+        valid_elements : "b/strong,u,s/strike,i,font[color|size],p,br",
+        force_p_newlines : true,
+        force_br_newlines : true
     });
 }

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

@@ -12 +12 @@
             // change the editor setting
             ed.settings.inline_styles = false;
+            ed.settings.content_css = url + "/css/editor.css";
 
             // command
@@ -71 +72 @@
                 }
             });
-            ed.onChange.add(function(ed, l) { // for debug
-                console.debug(l.content);
-            });
         },
 
@@ -98 +96 @@
             function rep(re, str) {
                 s = s.replace(re, str);
-                console.debug(RegExp.lastMatch, str);
             };
 
-console.debug("previewToText Before", s);
             rep(/<font size=\"2\">(.*?)<\/font>/gi,"<op:small>$1</op:small>");
             rep(/<font size=\"7\">(.*?)<\/font>/gi,"<op:large>$1</op:large>");
@@ -111 +107 @@
             rep(/<(b|u|s|i)>/gi,"<op:$1>");
             rep(/<\/(b|u|s|i)>/gi,"</op:$1>");
-            rep(/<br \/>/gi,"\n");
-            rep(/<br\/>/gi,"\n");
-            rep(/<br>/gi,"\n");
             rep(/<p>/gi,"");
             rep(/<\/p>/gi,"\n");
+            rep(/<br\s?\/?>/gi,"\n");
             rep(/&nbsp;/gi," ");
             rep(/&quot;/gi,"\"");
@@ -121 +115 @@
             rep(/&gt;/gi,">");
             rep(/&amp;/gi,"&");
-console.debug("previewToText After", s);
+
             return s; 
         },
@@ -132 +126 @@
             };
 
-console.debug("textToPreview Before", s);
             rep(/</gi,"&lt;");
             rep(/>/gi,"&gt;");
             rep(/\n/gi,"<br />");
             rep(/&lt;op:color:?(.*?)&gt;(.*?)&lt;\/op:color&gt;/gi,"<font color=\"$1;\">$2</font>");
-            rep(/&lt;op:large&gt;(.*?)&lt;\/op:large&gt;/gi,"<font size=\"7\">$1</span>");
-            rep(/&lt;op:small&gt;(.*?)&lt;\/op:small&gt;/gi,"<font size=\"2\">$1</span>");
+            rep(/&lt;op:large&gt;(.*?)&lt;\/op:large&gt;/gi,"<font size=\"7\">$1</font>");
+            rep(/&lt;op:small&gt;(.*?)&lt;\/op:small&gt;/gi,"<font size=\"2\">$1</font>");
             rep(/&lt;op:(b|u|s|i)&gt;/gi,"<$1>");
             rep(/&lt;\/op:(b|u|s|i)&gt;/gi,"</$1>");
-console.debug("textToPreview After", s);
+
             return s; 
         }