[pLog-svn] r4232 - in plog/branches/lifetype-1.1.2/js/tinymce: . plugins/insertvideo

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-11-04 11:27:23 +0000 (Sat, 04 Nov 2006)
New Revision: 4232

Modified:
   plog/branches/lifetype-1.1.2/js/tinymce/plugins/insertvideo/editor_plugin.js
   plog/branches/lifetype-1.1.2/js/tinymce/tiny_mce-plog.js
Log:
fixed issue #1111 (http://bugs.lifetype.net/view.php?id=1111), TinyMCE stripping out some attributes from <object> tags. It also required a fix for our custom 'insertvideo' plugin so that it would not think that other flash movies are google video or youtube videos.


Modified: plog/branches/lifetype-1.1.2/js/tinymce/plugins/insertvideo/editor_plugin.js
===================================================================
--- plog/branches/lifetype-1.1.2/js/tinymce/plugins/insertvideo/editor_plugin.js	2006-11-02 20:35:39 UTC (rev 4231)
+++ plog/branches/lifetype-1.1.2/js/tinymce/plugins/insertvideo/editor_plugin.js	2006-11-04 11:27:23 UTC (rev 4232)
@@ -123,10 +123,18 @@
 						continue;
 					}
 					else {
-						if( getVideoType( attribs["data"] ) == 1 )
+						var videoType = getVideoType( attribs["data"] );
+						if( videoType == 1 ) {
 							cssClass = "ltVideoGoogleVideo";
-						else
+						}
+						else if( videoType == 2 ) {
 							cssClass = "ltVideoYouTube";
+						}
+						else {
+							// ignore it, it's not a youtube or googlevideo video
+							startPos++;
+							continue;
+						}
 					}
 					
 

Modified: plog/branches/lifetype-1.1.2/js/tinymce/tiny_mce-plog.js
===================================================================
--- plog/branches/lifetype-1.1.2/js/tinymce/tiny_mce-plog.js	2006-11-02 20:35:39 UTC (rev 4231)
+++ plog/branches/lifetype-1.1.2/js/tinymce/tiny_mce-plog.js	2006-11-04 11:27:23 UTC (rev 4232)
@@ -184,7 +184,7 @@
 	  +"|codebase|codetype|data|declare|dir<ltr?rtl|height|hspace|id|lang|name"
 	  +"|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove"
 	  +"|onmouseout|onmouseover|onmouseup|standby|style|tabindex|title|type|usemap"
-	  +"|vspace|width],"
+	  +"|vspace|width|flashvars|data],"
 	+"ol[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown"
 	  +"|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover"
 	  +"|onmouseup|start|style|title|type],"