Changeset 5395

Timestamp:

02/25/08 03:29:46 (9 months ago)

Author:

inureyes

Message:

#806

• formatter를 변환할 때 에디터 전체를 초기화하도록 함.
  
• modern editor 초기화시 markdown, textile 에디터의 경우 raw 편집모드를 기본으로 함.
  

Location:

trunk

Files:

• interface/login/index.php (modified) (1 diff)
• lib/view/ownerView.php (modified) (3 diffs)
• plugins/FM_Modern/editor.js (modified) (2 diffs)
• plugins/FM_Modern/index.php (modified) (1 diff)
• skin/coolant/skin.html (modified) (1 diff)

trunk/interface/login/index.php

@@ -48 +48 @@
     if (!$isLogin) {
         $message = _text('아이디 또는 비밀번호가 틀렸습니다.');
-        if (!doesHaveMembership() && isLoginId($blogid, $_POST['loginid']))
+        if (!doesHaveMembership() && isLoginId(getBlogId(), $_POST['loginid'])){
             $showPasswordReset = true;
+        }
     }
     else if($isLogin == 2) {

trunk/lib/view/ownerView.php

@@ -43 +43 @@
             }
         }
-        if (correct && !editormap[editorselect.value] && firsteditor >= 0) {
+        //if (correct && !editormap[editorselect.value] && firsteditor >= 0) {
+        if (correct && firsteditor >= 0) {
             editorselect.selectedIndex = firsteditor;
-            if (typeof correct == 'function') correct(editorselect.value);
+            if (typeof correct == 'function') correct(editorselect.value, key);
         }
         return true;
@@ -142 +143 @@
 
     var editor = null;
-    function setCurrentEditor(key) {
+    function setCurrentEditor(key,formatter) {
         var neweditor = getEditor(key);
         if (neweditor == null) {
@@ -158 +159 @@
         }
         editor = neweditor;
+        editor.formatter = formatter;
         editor.initialize(document.getElementById("editWindow"));
         return true;

trunk/plugins/FM_Modern/editor.js

@@ -86 +86 @@
     if(typeof(document.execCommand) == "undefined" || !(STD.isIE || STD.isFirefox || STD.isSafari3))
         return;
-
+    // Set editor mode for formatters.
+    if(this.formatter == 'textile' || this.formatter == 'markdown') this.editMode = 'TEXTAREA';
     for (var x in TTModernEditor.editors) return x; // ignore if there is any other instance
     var seed = (textarea.id || 'unknown').replace(new RegExp('[^a-z0-9_]', 'gi'), '');
@@ -230 +231 @@
     if(this.editMode == "TEXTAREA")
         this.iframe.style.display = "none";
-
     // 가끔씩 Firefox에서 커서가 움직이지 않는 문제 수정
     if(!STD.isIE) setTimeout(function() { try { _this.contentDocument.designMode='on'; } catch (e) {} }, 100);

trunk/plugins/FM_Modern/index.php

@@ -2 +2 @@
 function FM_Modern_handleconfig($configVal) {
     requireComponent('Textcube.Function.misc');
+    requireComponent('Textcube.Function.Setting');
     $config = setting::fetchConfigVal($configVal);
     if (isset($config['defaultmode']) && $config['defaultmode'] != 'WYSIWYG' && $config['defaultmode'] != 'TEXTAREA') return false;

trunk/skin/coolant/skin.html

@@ -482 +482 @@
                         <a href="[##_archive_rep_link_##]">[##_archive_rep_date_##] </a>
                         <span class="cnt">([##_archive_rep_count_##])</span>
-                        </li>
+                    </li>
                 </s_archive_rep>
                 </ul>