Changeset 1390

Timestamp:

09/14/06 14:34:26 (2 years ago)

Author:

crizin

Message:

에디터 설정 옵션에서 XHTML 준수 옵션 제거

Location:

trunk

Files:

• blog/owner/setting/blog/editor/index.php (modified) (1 diff)
• blog/owner/setting/blog/index.php (modified) (2 diffs)
• lib/model/blogSetting.php (modified) (1 diff)
• lib/view/ownerView.php (modified) (1 diff)
• script/editor.js (modified) (1 diff)

trunk/blog/owner/setting/blog/editor/index.php

@@ -2 +2 @@
 define('ROOT', '../../../../..');
 require ROOT . '/lib/includeForOwner.php';
-if (setEditor($owner, $_GET['editorMode'], $_GET['strictXHTML'])) {
+if (setEditor($owner, $_GET['editorMode'])) {
     respondResultPage(0);
 }

trunk/blog/owner/setting/blog/index.php

@@ -309 +309 @@
 
     var editorMode = "<?=getUserSetting('editorMode', 1)?>";
-    var strictXHTML = "<?=getUserSetting('strictXHTML', 0)?>";
     function setEditor() {
-        if (document.forms[0].editorMode.value != editorMode || document.forms[0].strictXHTML.value != strictXHTML) {
-            var request = new HTTPRequest("GET", "<?=$blogURL?>/owner/setting/blog/editor/?editorMode=" + document.forms[0].editorMode.value + "&strictXHTML=" + document.forms[0].strictXHTML.value);
+        if (document.forms[0].editorMode.value != editorMode) {
+            var request = new HTTPRequest("GET", "<?=$blogURL?>/owner/setting/blog/editor/?editorMode=" + document.forms[0].editorMode.value);
             request.onSuccess = function() {
                 editorMode = document.forms[0].editorMode.value;
-                strictXHTML = document.forms[0].strictXHTML.value;
                 PM.showMessage("<?=_t('저장되었습니다')?>", "center", "bottom");
             }
@@ -719 +717 @@
                     </tr>
                   </table>
-                  <table cellspacing="0">
-                    <tr>
-                      <td class="entryEditTableLeftCell"><?=_t('XHTML 준수')?> |</td>
-                      <td>
-                        <?
-                            $strictXHTML = getUserSetting('strictXHTML', 0);
-                        ?>
-                        <select name="strictXHTML">
-                            <option value="0"<?=$strictXHTML==0?' selected':''?>><?=_t('처리하지 않음')?></option>
-                            <option value="1"<?=$strictXHTML==1?' selected':''?>><?=_t('올바른 XHTML 코드로 다듬어 출력')?></option>
-                        </select>
-                      </td>
-                    </tr>
-                  </table>
                   <div style="padding-left:132px">
                     <table class="buttonTop" cellspacing="0" onclick="setEditor()">

trunk/lib/model/blogSetting.php

@@ -344 +344 @@
 }
 
-function setEditor($owner, $editorMode, $strictXHTML) {
+function setEditor($owner, $editorMode) {
     if(!setUserSetting('editorMode', $editorMode))
         return false;
-    if(!setUserSetting('strictXHTML', $strictXHTML))
-        return false;
     return true;
 }

trunk/lib/view/ownerView.php

@@ -18 +18 @@
 //<![CDATA[
     var entryId = <?=$entryId ? $entryId : 0?>; 
-    var strictXHTML = <?=getUserSetting('strictXHTML', 0)==1 ? 'true' : 'false'?>;
     var skinContentWidth = <?=$contentWidth?>;
     var s_enterURL = "<?=_t('URL을 입력하세요')?>";

trunk/script/editor.js

@@ -432 +432 @@
         var body = result[0];
         str = str.replaceAll(body, '<embed loop="true" menu="false" quality="high" ' + this.parseImageSize(body, "string") + ' type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" src="' + this.parseAttribute(body, "longdesc") + '"></embed>');
-    }
-
-    if(!strictXHTML)
-        return str;
-
-    // <b> -> <strong>, <i> -> <em>, <u> -> <ins>, <strike> -> <del>
-    str = str.replace(new RegExp("<b([^>]*?)>(.*?)</b>", "gi"), "<strong$1>$2</strong>");
-    str = str.replace(new RegExp("<i([^>]*?)>(.*?)</i>", "gi"), "<em$1>$2</em>");
-    str = str.replace(new RegExp("<u([^>]*?)>(.*?)</u>", "gi"), "<ins$1>$2</ins>");
-    str = str.replace(new RegExp("<strike([^>]*?)>(.*?)</strike>", "gi"), "<del$1>$2</del>");
-
-    var regTag = new RegExp("<([^\\s>]+)\\s*([^>]*)(/?)>", "g");
-    while(result = regTag.exec(str)) {
-        var tagBody = result[0];
-        var tagStart = "<" + result[1];
-        var tagFinish = result[3] + ">";
-
-        if(tagStart.indexOf("<!--") == 0)
-            continue;
-
-        var attributeString = result[2];
-
-        var regAttribute = new RegExp("(\\s*[^=]*)=((?:\"[^\"]+\")|(?:'[^']+')|(?:[^\\s]+))", "g");
-
-        var attributes = new Array();
-
-        while(result = regAttribute.exec(attributeString))
-            attributes.push(new Array(result[1].trim(), result[2].replace(new RegExp("['\"](.*)['\"]", "g"), "$1").trim()));
-
-        var sb = new StringBuffer();
-
-        for(var i in attributes) {
-            if(trim(attributes[i][0].toLowerCase()) == "style") {
-                var regStyle = new RegExp("([\\w-]+): ([^;]*)", "gi");
-                var sbStyle = new StringBuffer();
-
-                while(result = regStyle.exec(attributes[i][1]))
-                    sbStyle.append(result[1].toLowerCase() + ": " + result[2] + "; ");
-
-                sb.append(" style=\"" + sbStyle.toString().replace(new RegExp("(.*); $", "g"), "$1") + "\"");
-            }
-            else
-                sb.append(" " + attributes[i][0].toLowerCase() + "=\"" + attributes[i][1] + "\"");
-        }
-
-        var tagAttributes = sb.toString();
-
-        switch(tagStart.toLowerCase()) {
-            case "<img":
-            case "<br":
-            case "<hr":
-                tagFinish = (tagFinish == ">") ? "/>" : tagFinish;
-        }
-
-        if(tagStart.toLowerCase() == "<img" && tagAttributes.indexOf("alt=") == -1)
-            tagFinish = ' alt=""' + tagFinish;
-
-        str = str.replaceAll(tagBody, tagStart.toLowerCase() + tagAttributes + tagFinish);
     }