[pLog-svn] r5575 - in plog/branches/lifetype-1.2: js/tinymce/plugins/insertresource templates/admin/chooser

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-06-23 16:43:20 -0400 (Sat, 23 Jun 2007)
New Revision: 5575

Modified:
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertresource/editor_plugin.js
   plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template
Log:
Now that files with the "'" character in their file name can be loaded, we also need to modify the resource selector so that they can be properly inserted in posts.


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	2007-06-23 16:32:02 UTC (rev 5574)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertresource/editor_plugin.js	2007-06-23 20:43:20 UTC (rev 5575)
@@ -182,9 +182,9 @@
 					var endPos = content.indexOf('/>', startPos);
 					var attribs = TinyMCE_insertresourcePlugin._parseAttributes(content.substring(startPos + 4, endPos));
 
-					// Is not flash, skip it
+					// If not flash, skip it
 					if (attribs['class'] != "ltFlashPlayer" )
-						continue;
+						continue;					
 
 					type = attribs['class'];
 
@@ -195,7 +195,8 @@
 					if( attribs["height"] == undefined )
 						attribs["height"] = 20;
 					if( attribs["width"] == undefined )
-						attribs["width"] = 320;					
+						attribs["width"] = 320;			
+						
 					embedHTML = getFlashPlayerHTML( attribs["alt"], attribs["height"], attribs["width"] );
 
 					// Insert embed/object chunk
@@ -228,9 +229,9 @@
 		for (var i=0; i<attribute_string.length; i++) {
 			var chr = attribute_string.charAt(i);
 
-			if ((chr == '"' || chr == "'") && !withInValue)
+			if ((chr == '"' ) && !withInValue)
 				withInValue = true;
-			else if ((chr == '"' || chr == "'") && withInValue) {
+			else if ((chr == '"' ) && withInValue) {
 				withInValue = false;
 
 				var pos = attributeName.lastIndexOf(' ');

Modified: plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template	2007-06-23 16:32:02 UTC (rev 5574)
+++ plog/branches/lifetype-1.2/templates/admin/chooser/resourcelist.template	2007-06-23 20:43:20 UTC (rev 5575)
@@ -129,26 +129,26 @@
   {assign var=resourceType value=$resource->getResourceType()}
   {assign var=resourceMimeType value=$resource->getMimeType()}
   {if $htmlarea}
-    <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourceDownloadLink}','','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource")}</a><br/> 
+    <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourceDownloadLink|escape:"javascript"}','','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource")}</a><br/> 
   {else}
-    <a href="javascript:addResourceLink('{$resourceId}','{$resourceDownloadLink}','','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource")}</a><br/>
+    <a href="javascript:addResourceLink('{$resourceId}','{$resourceDownloadLink|escape:"javascript"}','','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource")}</a><br/>
   {/if}
   {if $resource->hasPreview()}
     {if $htmlarea}
-      <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourcePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_preview")}</a><br/>
-      <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourceMediumSizePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_medium")}</a><br/>
+      <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourcePreviewLink|escape:"javascript"}','{$resourceDownloadLink|escape:"javascript"}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_preview")}</a><br/>
+      <a href="javascript:addHtmlareaLink('{$resourceId}','{$resourceMediumSizePreviewLink|escape:"javascript"}','{$resourceDownloadLink|escape:"javascript"}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_medium")}</a><br/>
     {else}
-      <a href="javascript:addResourceLink('{$resourceId}','{$resourcePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_preview")}</a><br/>
-      <a href="javascript:addResourceLink('{$resourceId}','{$resourceMediumSizePreviewLink}','{$resourceDownloadLink}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_medium")}</a><br/>
+      <a href="javascript:addResourceLink('{$resourceId}','{$resourcePreviewLink|escape:"javascript"}','{$resourceDownloadLink|escape:"javascript"}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_preview")}</a><br/>
+      <a href="javascript:addResourceLink('{$resourceId}','{$resourceMediumSizePreviewLink|escape:"javascript"}','{$resourceDownloadLink|escape:"javascript"}','{$resourceName|escape:"javascript"}','{$resourceDesc|escape:"javascript"}','{$resourceType}','{$resourceMimeType}');">{$locale->tr("add_resource_medium")}</a><br/>
     {/if}
   {/if}
   {if $resource->isSound()}
-      <a href="javascript:insertMediaPlayer('{$resourceDownloadLink}','{$htmlarea}','20','300')">{$locale->tr("insert_player")}</a>
+      <a href="javascript:insertMediaPlayer('{$resourceDownloadLink|escape:"javascript"}','{$htmlarea}','20','300')">{$locale->tr("insert_player")}</a>
   {elseif $resource->isVideo() && $resource->getFileExtension(true) == "flv"}
       {assign var=metadata value=$resource->getMetadataReader()}
       {assign var=height value=$metadata->getHeight()}
       {assign var=width value=$metadata->getWidth()}
-      <a href="javascript:insertMediaPlayer('{$resourceDownloadLink}','{$htmlarea}','{$height}','{$width}')">{$locale->tr("insert_player")}</a>
+      <a href="javascript:insertMediaPlayer('{$resourceDownloadLink|escape:"javascript"}','{$htmlarea}','{$height}','{$width}')">{$locale->tr("insert_player")}</a>
   {/if}
  </td>
 {/foreach}