[pLog-svn] r6824 - in plog/branches/lifetype-1.2/js/tinymce: . plugins/insertaudio plugins/insertresource

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2009-02-21 16:02:53 -0500 (Sat, 21 Feb 2009)
New Revision: 6824

Modified:
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/audioinput.html
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertresource/editor_plugin.js
   plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js
Log:
turns out, there was a space bug in the resources too, so moved the replacement code to a more general spot

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/audioinput.html
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/audioinput.html	2009-02-21 20:29:20 UTC (rev 6823)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/audioinput.html	2009-02-21 21:02:53 UTC (rev 6824)
@@ -26,7 +26,7 @@
 		<div class="mceActionPanel">
 		  <div style="float:left">		
 			<input type="button" name="insert" value="{$lang_insert}" 
-                   onClick="insertMediaPlayer(document.audio.url.value.replace(/ /g, '%20'),
+                   onClick="insertMediaPlayer(document.audio.url.value),
                             true,'20','300')" id="insert" />
 		  </div>
 		  <div style="float:right">

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertresource/editor_plugin.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertresource/editor_plugin.js	2009-02-21 20:29:20 UTC (rev 6823)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertresource/editor_plugin.js	2009-02-21 21:02:53 UTC (rev 6824)
@@ -146,7 +146,7 @@
 					}
 					
 					// find the value in "file=XXX"
-					var regexp = /.*file=([a-zA-Z0-9\-\/:._]*)/i;
+					var regexp = /.*file=([a-zA-Z0-9\-\/:._%]*)/i;
 					result = regexp.exec( attribs["value"] );
 					var fileUrl = "";
 					if( result ) {
@@ -259,4 +259,4 @@
 	}
 };
 
-tinyMCE.addPlugin("insertresource", TinyMCE_insertresourcePlugin);
\ No newline at end of file
+tinyMCE.addPlugin("insertresource", TinyMCE_insertresourcePlugin);

Modified: plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js	2009-02-21 20:29:20 UTC (rev 6823)
+++ plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js	2009-02-21 21:02:53 UTC (rev 6824)
@@ -86,6 +86,7 @@
  */
 function insertMediaPlayer( url, tinyMCEEnabled, height, width )
 {
+    url = url.replace(/ /g, '%20');
 	if( tinyMCEEnabled ) {
 		var htmlCode = '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" mce_src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ' + 'width="' + width + '" height="' + height + '" ' + 'border="0" alt="' + url + '" title="' + url + '" class="ltFlashPlayer" />';
 
@@ -98,4 +99,4 @@
 	else {
 		addText( parent.opener.document.newPost.postText, getFlashPlayerHTML( url, height, width ));
 	}
-}
\ No newline at end of file
+}