Changeset 176250

Timestamp:

11/23/2009 06:59:16 PM (16 years ago)

Author:

082net

Message:

 

Location:

advanced-spoiler/trunk

Files:

• advanced-spoiler.php (modified) (5 diffs)
• js/spoiler-admin.js (modified) (2 diffs)
• readme.txt (modified) (1 diff)

advanced-spoiler/trunk/advanced-spoiler.php

@@ -8 +8 @@
 Show or hide contents(text, image etc.) wrapped by spoiler markup tag([spoiler][/spoiler]). Requires WP 2.7 or greater.
 
-Version: 2.01b
+Version: 2.02
 
 Author: Choen, Young-Min
@@ -54 +54 @@
     var $url, $hook, $folder, $admin_page;
     var $sep = "||"; // old plugin support
-    var $version = '2.01a';
+    var $version = '2.02';
     var $effects = array('appear', 'blind', 'apblind', 'phase', 'slide', 'simple');
 //  var $regex = '|\[spoiler\s+([^]]*)\]((?!\[/?spoiler.*?\]).*?)\[/spoiler\]|isme';
@@ -169 +169 @@
             return $this->_spoiler_deep($content);
 
-        $content = preg_replace_callback('/\[spoiler\b(.*?)\](.*?)\[\/spoiler\]/s', array(&$this, '_replace'), $content);
+        $content = preg_replace_callback('/(<(p|div)>)?\[spoiler\b(.*?)\](.*?)\[\/spoiler\](<\/\2>)?/s', array(&$this, '_replace'), $content);
         return $content;
     }
@@ -178 +178 @@
             return $content;
         for ($i=1; $i<=$this->open; $i++) {
-            $regex[] = '/\[spoiler'.$i.'\b(.*?)\](.*?)\[\/spoiler'.$i.'\]/s';
+            $regex[] = '/(<(p|div)>)?\[spoiler'.$i.'\b(.*?)\](.*?)\[\/spoiler'.$i.'\](<\/\2>)?/s';
         }
         $temp_content = preg_replace_callback($regex, array(&$this, '_replace'), $temp_content);
         return $temp_content;
 
-        while(preg_match($this->regex, $content)) {
+/*      while(preg_match($this->regex, $content)) {
             $content = preg_replace($this->regex, '$this->_replace("\1", "\2");', $content);
         }
-        return $content;
+        return $content;*/
     }
 
@@ -208 +208 @@
         global $post, $doing_rss, $comment;
         $this->counts++;
-        $op = stripslashes($m[1]);
-        $text = stripslashes($m[2]);
+        $op = stripslashes($m[3]);
+        $text = stripslashes($m[4]);
 
         $id = "SID".$post->ID."_".$this->counts;

advanced-spoiler/trunk/js/spoiler-admin.js

@@ -69 +69 @@
             if (tinymce.isIE)
                 ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark);
-            text += ed.selection.getRng();
-            text += '[/spoiler]';
-            ed.execCommand('mceInsertContent', false, text);
+            text = '<div>'+text;
+            text += ed.selection.getContent();// getRng() strips all blocks :(
+            text += '[/spoiler]</div>';
+            ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, text);
         } else {
             text += _spoiler.getRng(edCanvas);
@@ -103 +104 @@
 jQuery(document).ready( function() {
     _spoiler.setup();
-})
+});

advanced-spoiler/trunk/readme.txt

@@ -3 +3 @@
 Tags: spoiler, advanced-spoiler, jquery
 Requires at least: 2.7
-Tested up to: 2.8.4
-Stable tag: 2.01b
+Tested up to: 2.8.6
+Stable tag: 2.02
 
 Show or hide contents(text, image etc.) with animated effects wrapped by spoiler markup tag([spoiler][/spoiler]).