chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backed out changeset: b3524ad2f2b3

Browse Source
skala
Juan Carlos Raña 14 years ago
parent ed911c317f
commit efcd404657
10 changed files with 100 additions and 222 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      main/inc/lib/fckeditor/editor/dialog/fck_flash/fck_flash.js
  2. 13
      main/inc/lib/fckeditor/editor/dialog/fck_image/fck_image.js
  3. 12
      main/inc/lib/fckeditor/editor/dialog/fck_link/fck_link.js
  4. 23
      main/inc/lib/fckeditor/editor/filemanager/connectors/php/config.php
  5. 7
      main/inc/lib/fckeditor/editor/filemanager/connectors/php/io.php
  6. 15
      main/inc/lib/fckeditor/editor/plugins/ImageManager/images.php
  7. 9
      main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.js
  8. 34
      main/inc/lib/fckeditor/editor/plugins/audio/fck_audio.js
  9. 4
      main/inc/lib/fckeditor/editor/plugins/fckEmbedMovies/fck_embedmovies.js
  10. 138
      main/inc/lib/fckeditor/editor/plugins/flvPlayer/flvPlayer.js

7
main/inc/lib/fckeditor/editor/dialog/fck_flash/fck_flash.js
Unescape View File

@ -233,12 +233,9 @@ function BrowseServer()
function SetUrl( url, width, height ) function SetUrl( url, width, height )
{ {
// Added by Ivan Tcholakov.
//url = FCK.GetSelectedUrl( url ) ;
url = FCK.GetSelectedFlashUrl( url ) ; url = FCK.GetSelectedFlashUrl( url ) ;
// search the URLPrefix like it is the configuration.php file
PrefixeUrl = self.location.href.replace(/\/main\/inc\/lib\/fckeditor\/editor\/dialog\/fck_flash.\html/, "");
PrefixeUrl = PrefixeUrl.replace(/http:\/\/[^\/]+/, "");
url = PrefixeUrl + url ;
//
GetE('txtUrl').value = url ; GetE('txtUrl').value = url ;

13
main/inc/lib/fckeditor/editor/dialog/fck_image/fck_image.js
Unescape View File

@ -77,13 +77,10 @@ var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
var oImageOriginal ; var oImageOriginal ;
function UpdateOriginal( resetSize ) function UpdateOriginal( resetSize ) {
{
if ( !eImgPreview ) if ( !eImgPreview )
return ; return ;
if ( GetE('txtUrl').value.length == 0 ) {
if ( GetE('txtUrl').value.length == 0 )
{
oImageOriginal = null ; oImageOriginal = null ;
return ; return ;
} }
@ -436,12 +433,8 @@ var sActualBrowser ;
function SetUrl( url, width, height, alt ) function SetUrl( url, width, height, alt )
{ {
// Added by Ivan Tcholakov.
url = FCK.GetSelectedUrl ( url ) ; url = FCK.GetSelectedUrl ( url ) ;
// search the URLPrefix like it is the configuration.php file
PrefixeUrl = self.location.href.replace(/\/main\/inc\/lib\/fckeditor\/editor\/dialog\/fck_image.\html/, "");
PrefixeUrl = PrefixeUrl.replace(/http:\/\/[^\/]+/, "");
url = PrefixeUrl + url ;
//
if ( sActualBrowser == 'Link' ) if ( sActualBrowser == 'Link' )
{ {

12
main/inc/lib/fckeditor/editor/dialog/fck_link/fck_link.js
Unescape View File

@ -811,19 +811,7 @@ function BrowseServer()
function SetUrl( url ) function SetUrl( url )
{ {
// url = FCK.GetSelectedUrl ( url ) ;
url = FCK.GetUrl( url, FCK.SEMI_ABSOLUTE_URL ) ;
PrefixeUrl = self.location.href.replace(/\/main\/inc\/lib\/fckeditor\/editor\/dialog\/fck_link\.html/, "");
PrefixeUrl = PrefixeUrl.replace(/http:\/\/[^\/]+/, "")
// if url_append in configuration file != "" (see ticket ref #3933)
if (PrefixeUrl != "") {
url = PrefixeUrl + url;
}
else {
url = FCK.GetSelectedUrl ( url ) ; url = FCK.GetSelectedUrl ( url ) ;
}
GetE('cmbLinkProtocol').value = '' ; GetE('cmbLinkProtocol').value = '' ;
GetE('txtUrl').value = url ; GetE('txtUrl').value = url ;

23
main/inc/lib/fckeditor/editor/filemanager/connectors/php/config.php
Unescape View File

@ -21,6 +21,7 @@
* *
* Configuration file for the File Manager Connector for PHP. * Configuration file for the File Manager Connector for PHP.
*/ */
// Modifications by Ivan Tcholakov, JUN-2009. // Modifications by Ivan Tcholakov, JUN-2009.
// Some language variables are needed. // Some language variables are needed.
@ -46,31 +47,28 @@ if (api_is_in_course()) {
if (!api_is_in_group()) { if (!api_is_in_group()) {
// 1. We are inside a course and not in a group. // 1. We are inside a course and not in a group.
if (api_is_allowed_to_edit()) { if (api_is_allowed_to_edit()) {
// $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/'; $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/';
$Config['UserFilesPath'] = '/'.$_configuration['course_folder'].api_get_course_path().'/document/'; //
} else { } else {
// 1.2. Student // 1.2. Student
$current_session_id = api_get_session_id(); $current_session_id = api_get_session_id();
if($current_session_id==0) { if($current_session_id==0)
// $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/shared_folder/sf_user_'.api_get_user_id().'/'; // {
$Config['UserFilesPath'] = '/'.$_configuration['course_folder'].api_get_course_path().'/document/shared_folder/sf_user_'.api_get_user_id().'/';// $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/shared_folder/sf_user_'.api_get_user_id().'/';
} }
else { else
// $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/'; {
$Config['UserFilesPath'] = '/'.$_configuration['course_folder'].api_get_course_path().'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/'; $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/';
} }
} }
} else { } else {
// 2. Inside a course and inside a group. // 2. Inside a course and inside a group.
global $group_properties; global $group_properties;
// $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/'; // $Config['UserFilesPath'] = api_get_path(REL_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/';
$Config['UserFilesPath'] = '/'.$_configuration['course_folder'].api_get_course_path().'/document'.$group_properties['directory'].'/';//
} }
} else { } else {
if (api_is_platform_admin() && $_SESSION['this_section'] == 'platform_admin') { if (api_is_platform_admin() && $_SESSION['this_section'] == 'platform_admin') {
// 3. Platform administration activities. // 3. Platform administration activities.
// $Config['UserFilesPath'] = api_get_path(REL_PATH).'home/default_platform_document/';// $Config['UserFilesPath'] = api_get_path(REL_PATH).'home/default_platform_document/';
$Config['UserFilesPath'] = '/home/default_platform_document/';//
} else { } else {
// 4. The user is outside courses. // 4. The user is outside courses.
$my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'rel'); $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'rel');
@ -79,7 +77,6 @@ if (api_is_in_course()) {
} }
// Fill the following value it you prefer to specify the absolute path for the // Fill the following value it you prefer to specify the absolute path for the
// user files directory. Useful if you are using a virtual directory, symbolic // user files directory. Useful if you are using a virtual directory, symbolic
// link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. // link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.

7
main/inc/lib/fckeditor/editor/filemanager/connectors/php/io.php
Unescape View File

@ -20,7 +20,6 @@
* == END LICENSE == * == END LICENSE ==
* *
* This is the File Manager Connector for PHP. * This is the File Manager Connector for PHP.
*/ */
function CombinePaths( $sBasePath, $sFolder ) function CombinePaths( $sBasePath, $sFolder )
{ {
@ -127,7 +126,6 @@ function CreateServerFolder( $folderPath, $lastFolder = null )
else else
{ {
$permissions = 0777 ; $permissions = 0777 ;
// $permissions = 0770 ;
if ( isset( $Config['ChmodOnFolderCreate'] ) ) if ( isset( $Config['ChmodOnFolderCreate'] ) )
{ {
$permissions = $Config['ChmodOnFolderCreate'] ; $permissions = $Config['ChmodOnFolderCreate'] ;
@ -151,10 +149,7 @@ function CreateServerFolder( $folderPath, $lastFolder = null )
$to_group_id = $group_properties['id']; $to_group_id = $group_properties['id'];
} }
$folder_path=preg_replace("/^.*".TOOL_DOCUMENT."/", "", $folderPath); // $folder_path = substr($folderPath, strpos($folderPath, $repository_path) + strlen($repository_path) - 1);
$folder_path=preg_replace("/\/$/", "", $folder_path); // should be done in 1 regexp I guess ...
// $folder_path = substr($folderPath, strpos($folderPath, $repository_path) + strlen($repository_path) - 1);
$folder_name = explode('/', $folder_path); $folder_name = explode('/', $folder_path);
$folder_name = $folder_name[count($folder_name) - 1]; $folder_name = $folder_name[count($folder_name) - 1];
$doc_id = add_document($_course, $folder_path, 'folder', 0, $folder_name); $doc_id = add_document($_course, $folder_path, 'folder', 0, $folder_name);

15
main/inc/lib/fckeditor/editor/plugins/ImageManager/images.php
Unescape View File

@ -50,24 +50,11 @@ function drawFiles($list, &$manager)
{ {
global $relative; global $relative;
global $IMConfig; global $IMConfig;
// add filename with course code in it
// here filename is images/gallery/COMES.jpg
// it should be /chamilo1884url/courses/COURSTESTSIMSUURLAPP/document/
global $_configuration; //
//var topDoc = window.top.document;
foreach($list as $entry => $file) foreach($list as $entry => $file)
{ { ?>
$chamiloPath = '/'.$_configuration['url_append'].'/courses/'.api_get_course_path().'/document'.$file['relative']; //
//
?>
<td><table width="100" cellpadding="0" cellspacing="0"><tr><td class="block"> <td><table width="100" cellpadding="0" cellspacing="0"><tr><td class="block">
<!-- change <?php echo $file['relative'];?> with <?php echo $chamiloPath; ?>
<a href="javascript: void(0);" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);"title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"><img src="<?php echo $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"/></a> <a href="javascript: void(0);" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);"title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"><img src="<?php echo $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"/></a>
-->
<a href="javascript: void(0);" onclick="selectImage('<?php echo $chamiloPath; ?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);"title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"><img src="<?php echo $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"/></a>
</td></tr><tr><td class="edit" style="padding-top: 5px;"> </td></tr><tr><td class="edit" style="padding-top: 5px;">
<?php if ($IMConfig['allow_delete']) { ?> <?php if ($IMConfig['allow_delete']) { ?>
<a href="images.php?dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="img/edit_trash.gif" height="15" width="15" alt="Trash"/></a> <a href="images.php?dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="img/edit_trash.gif" height="15" width="15" alt="Trash"/></a>

9
main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.js
Unescape View File

@ -123,6 +123,7 @@ function LoadSelection()
//#### The OK button was hit. //#### The OK button was hit.
function Ok() function Ok()
{ {
if ( GetE('mpUrl').value.length == 0 ) if ( GetE('mpUrl').value.length == 0 )
{ {
window.parent.SetSelectedTab( 'Info' ) ; window.parent.SetSelectedTab( 'Info' ) ;
@ -199,8 +200,7 @@ function updateMovie(e)
} }
var ePreview ; var ePreview ;
function SetPreviewElement( previewEl ) function SetPreviewElement( previewEl ) {
{
ePreview = previewEl ; ePreview = previewEl ;
if ( GetE('mpUrl').value.length > 0 ) if ( GetE('mpUrl').value.length > 0 )
@ -238,11 +238,6 @@ function BrowseServer()
function SetUrl( url ) function SetUrl( url )
{ {
PrefixeUrl = self.location.href.replace(/\/main\/inc\/lib\/fckeditor\/editor\/plugins\/MP3\/fck_mp3.\html/, "");
PrefixeUrl = PrefixeUrl.replace(/http:\/\/[^\/]+/, "");
url = PrefixeUrl + url;
//
document.getElementById('mpUrl').value = url ; document.getElementById('mpUrl').value = url ;
//updatePreview(); //updatePreview();
Ok(); Ok();

34
main/inc/lib/fckeditor/editor/plugins/audio/fck_audio.js
Unescape View File

@ -65,21 +65,18 @@ lib_path = FCK.GetUrl( lib_path, FCK.SEMI_ABSOLUTE_URL ) ;
// This is the semi-absolute URL of the audio player. // This is the semi-absolute URL of the audio player.
var player = lib_path + 'mediaplayer/player.swf' ; var player = lib_path + 'mediaplayer/player.swf' ;
// Get the selected audio (if available). // Get the selected audio (if available).
var oFakeImage = dialog.Selection.GetSelectedElement() ; var oFakeImage = dialog.Selection.GetSelectedElement() ;
var oEmbed ; var oEmbed ;
if ( oFakeImage ) if ( oFakeImage ) {
{
if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckmp3') ) if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckmp3') )
oEmbed = FCK.GetRealElement( oFakeImage ) ; oEmbed = FCK.GetRealElement( oFakeImage ) ;
else else
oFakeImage = null ; oFakeImage = null ;
} }
window.onload = function() window.onload = function() {
{
// Translate the dialog box texts. // Translate the dialog box texts.
oEditor.FCKLanguageManager.TranslatePage(document) ; oEditor.FCKLanguageManager.TranslatePage(document) ;
@ -101,8 +98,7 @@ window.onload = function()
SelectField( 'txtUrl' ) ; SelectField( 'txtUrl' ) ;
} }
function LoadSelection() function LoadSelection() {
{
if ( ! oEmbed ) return ; if ( ! oEmbed ) return ;
var flashvars = GetAttribute( oEmbed, 'flashvars', '' ).toString() ; var flashvars = GetAttribute( oEmbed, 'flashvars', '' ).toString() ;
@ -134,8 +130,8 @@ function LoadSelection()
} }
//#### The OK button was hit. //#### The OK button was hit.
function Ok() function Ok() {
{
if ( GetE('txtUrl').value.length == 0 ) if ( GetE('txtUrl').value.length == 0 )
{ {
dialog.SetSelectedTab( 'Info' ) ; dialog.SetSelectedTab( 'Info' ) ;
@ -181,16 +177,13 @@ function UpdateEmbed( e )
var ePreview ; var ePreview ;
function SetPreviewElement( previewEl ) function SetPreviewElement( previewEl ) {
{
ePreview = previewEl ; ePreview = previewEl ;
if ( GetE( 'txtUrl' ).value.length > 0 ) if ( GetE( 'txtUrl' ).value.length > 0 )
UpdatePreview() ; UpdatePreview() ;
} }
function UpdatePreview() function UpdatePreview() {
{
if ( !ePreview ) if ( !ePreview )
return; return;
@ -228,21 +221,10 @@ function BrowseServer()
OpenFileBrowser( FCKConfig.MP3BrowserURL, FCKConfig.MP3BrowserWindowWidth, FCKConfig.MP3BrowserWindowHeight ) ; OpenFileBrowser( FCKConfig.MP3BrowserURL, FCKConfig.MP3BrowserWindowWidth, FCKConfig.MP3BrowserWindowHeight ) ;
} }
function SetUrl( url ) function SetUrl( url ) {
{
//url = FCK.GetSelectedUrl( url ) ;
url = FCK.GetUrl( url, FCK.SEMI_ABSOLUTE_URL ) ; url = FCK.GetUrl( url, FCK.SEMI_ABSOLUTE_URL ) ;
PrefixeUrl = self.location.href.replace(/\/main\/inc\/lib\/fckeditor\/editor\/plugins\/audio\/fck_audio.\html/, "");
PrefixeUrl = PrefixeUrl.replace(/http:\/\/[^\/]+/, "");
url = PrefixeUrl + url;
//
GetE('txtUrl').value = url ; GetE('txtUrl').value = url ;
UpdatePreview() ; UpdatePreview() ;
dialog.SetSelectedTab( 'Info' ) ; dialog.SetSelectedTab( 'Info' ) ;
} }

4
main/inc/lib/fckeditor/editor/plugins/fckEmbedMovies/fck_embedmovies.js
Unescape View File

@ -280,10 +280,6 @@ function BrowseServer()
function SetUrl( url ) function SetUrl( url )
{ {
url = FCK.GetSelectedUrl( url ) ; url = FCK.GetSelectedUrl( url ) ;
PrefixeUrl = self.location.href.replace(/\/main\/inc\/lib\/fckeditor\/editor\/plugins\/fckEmbedMovies\/fck_embedmovies.\html/, "");
PrefixeUrl = PrefixeUrl.replace(/http:\/\/[^\/]+/, "");
url = PrefixeUrl + url;
//
GetE( 'txtUrl' ).value = url ; GetE( 'txtUrl' ).value = url ;

138
main/inc/lib/fckeditor/editor/plugins/flvPlayer/flvPlayer.js
Unescape View File

@ -365,10 +365,6 @@ var sActualBrowser ;
function SetUrl( url ) { function SetUrl( url ) {
url = FCK.GetUrl( url, FCK.SEMI_ABSOLUTE_URL ) ; url = FCK.GetUrl( url, FCK.SEMI_ABSOLUTE_URL ) ;
PrefixeUrl = self.location.href.replace(/\/main\/inc\/lib\/fckeditor\/editor\/plugins\/flvPlayer\/flvPlayer\.html/, "");
PrefixeUrl = PrefixeUrl.replace(/http:\/\/[^\/]+/, "");
url = PrefixeUrl + url;
//
if ( sActualBrowser == 'flv' ) if ( sActualBrowser == 'flv' )
{ {
@ -452,44 +448,37 @@ Media.prototype.setAttribute = function( attr, val )
} }
} ; } ;
Media.prototype.getInnerHTML = function ( objectId ) Media.prototype.getInnerHTML = function ( objectId ) {
{
var embeddingMethod = FCKConfig[ 'FlashEmbeddingMethod' ];
var embeddingMethod = FCKConfig[ 'FlashEmbeddingMethod' ];
var randomnumber = Math.floor( Math.random() * 1000001 ) ; var randomnumber = Math.floor( Math.random() * 1000001 ) ;
var thisWidth = this.width ; var thisWidth = this.width ;
var thisHeight = this.height ; var thisHeight = this.height ;
var thisMediaType = 'single' ; var thisMediaType = 'single' ;
if ( !GetE( 'rbFileType' ).checked ) if ( !GetE( 'rbFileType' ).checked ) {
{
thisMediaType = 'mpl' ; thisMediaType = 'mpl' ;
} }
// Alignment // Alignment
var cssalign = '' ; var cssalign = '' ;
var cssfloat = '' ; var cssfloat = '' ;
if ( this.align == 'center' ) if ( this.align == 'center') {
{
cssalign = 'margin-left: auto;margin-right: auto;' ; cssalign = 'margin-left: auto;margin-right: auto;' ;
} } else if ( this.align == 'right' ) {
else if ( this.align == 'right' )
{
cssfloat = 'float: right;' ; cssfloat = 'float: right;' ;
} } else if ( this.align == 'left' ) {
else if ( this.align == 'left' )
{
cssfloat = 'float: left;' ; cssfloat = 'float: left;' ;
} }
var s = ''; var s = '';
s += '\n'; s += '\n';
s += '<div id="player' + randomnumber + '-parent" style="text-align: center;' + cssfloat + '">\n'; s += '<div id="player' + randomnumber + '-parent" style="text-align: center;' + cssfloat + '">\n';
s += '<div style="border-style: none; height: ' + thisHeight + 'px; width: ' + thisWidth + 'px; overflow: hidden; background-color: rgb(220, 220, 220); ' + cssalign + '">' ; s += '<div style="border-style: none; height: ' + thisHeight + 'px; width: ' + thisWidth + 'px; overflow: hidden; background-color: rgb(220, 220, 220); ' + cssalign + '">' ;
if (embeddingMethod == 'swfobject') if (embeddingMethod == 'swfobject') {
{
s += '<script src="' + FCKConfig.ScriptSWFObject + '" type="text/javascript"></script>\n' ; s += '<script src="' + FCKConfig.ScriptSWFObject + '" type="text/javascript"></script>\n' ;
} }
@ -497,13 +486,14 @@ Media.prototype.getInnerHTML = function ( objectId )
// A hidden div containing setting, added width, height, overflow for MSIE7 // A hidden div containing setting, added width, height, overflow for MSIE7
s += '<div id="player' + randomnumber + '-config" style="display: none; visibility: hidden; width: 0px; height: 0px; overflow: hidden;">' ; s += '<div id="player' + randomnumber + '-config" style="display: none; visibility: hidden; width: 0px; height: 0px; overflow: hidden;">' ;
// Save settings.
for ( var i in this ) // Save settings
{
//this prints extra params see #4217
for ( var i in this ) {
if ( !i || !this[i] ) continue ; if ( !i || !this[i] ) continue ;
if ( !i.match( /(set|get)/ ) ) if ( !i.match( /(set|get)/ ) ) {
{ //s += i + '=' + this[i] + ' ' ;
s += i + '=' + this[i] + ' ' ;
} }
} }
s += '</div>' ; s += '</div>' ;
@ -511,14 +501,11 @@ Media.prototype.getInnerHTML = function ( objectId )
// The player's area. // The player's area.
s += '<div id="player' + randomnumber + '">' ; s += '<div id="player' + randomnumber + '">' ;
if ( embeddingMethod == 'swfobject' ) if ( embeddingMethod == 'swfobject' ) {
{
s += '<a href="http://www.macromedia.com/go/getflashplayer" target="_blank">Get the Flash Player</a> to see this video.' ; s += '<a href="http://www.macromedia.com/go/getflashplayer" target="_blank">Get the Flash Player</a> to see this video.' ;
} }
if ( embeddingMethod == 'object' || embeddingMethod == 'adobe' ) if (embeddingMethod == 'object' || embeddingMethod == 'adobe' ) {
{
var p = '' ; // Parameters. var p = '' ; // Parameters.
var v = '' ; // Variables. var v = '' ; // Variables.
@ -532,8 +519,7 @@ Media.prototype.getInnerHTML = function ( objectId )
v += 'height=' + thisHeight + '&amp;'; v += 'height=' + thisHeight + '&amp;';
v += 'autostart=' + this.play + '&amp;'; v += 'autostart=' + this.play + '&amp;';
if ( thisMediaType == 'mpl' ) if ( thisMediaType == 'mpl' ) {
{
v += 'file=' + this.purl + '&amp;'; v += 'file=' + this.purl + '&amp;';
v += 'autoscroll=true&amp;'; v += 'autoscroll=true&amp;';
p += 'allowscriptaccess="always" '; p += 'allowscriptaccess="always" ';
@ -543,91 +529,58 @@ Media.prototype.getInnerHTML = function ( objectId )
var dispHeight = thisHeight ; var dispHeight = thisHeight ;
var dispThumbs = false ; var dispThumbs = false ;
if ( this.dispPlaylist != 'none' ) if ( this.dispPlaylist != 'none' ) {
{ if ( this.dispPlaylist == 'right' ) {
if ( this.dispPlaylist == 'right' ) if ( this.playlistDim.length > 0 ) {
{
if ( this.playlistDim.length > 0 )
{
dispWidth = thisWidth - this.playlistDim ; dispWidth = thisWidth - this.playlistDim ;
if ( this.playlistDim < 100 ) if ( this.playlistDim < 100 ) {
{
dispThumbs = false ; dispThumbs = false ;
} } else {
else
{
dispThumbs = true ; dispThumbs = true ;
} }
} } else {
else if ( thisWidth >= 550 ) {
{
if ( thisWidth >= 550 )
{
dispWidth = thisWidth - 200 ; dispWidth = thisWidth - 200 ;
dispThumbs = true ; dispThumbs = true ;
} } else if ( thisWidth >= 450 ) {
else if ( thisWidth >= 450 )
{
dispWidth = thisWidth - 100 ; dispWidth = thisWidth - 100 ;
dispThumbs = false ; dispThumbs = false ;
} } else if ( thisWidth >= 350 ) {
else if ( thisWidth >= 350 )
{
dispWidth = thisWidth - 50 ; dispWidth = thisWidth - 50 ;
dispThumbs = false ; dispThumbs = false ;
} }
} }
v += 'displaywidth=' + dispWidth + '&amp;' ; v += 'displaywidth=' + dispWidth + '&amp;' ;
} } else if ( this.dispPlaylist == 'below' ) {
else if ( this.dispPlaylist == 'below' )
{
dispThumbs = true ; dispThumbs = true ;
if ( this.playlistDim.length > 0 ) {
if ( this.playlistDim.length > 0 )
{
dispHeight = thisWidth - this.playlistDim ; dispHeight = thisWidth - this.playlistDim ;
} } else {
else if ( thisHeight >= 550 ) {
{
if ( thisHeight >= 550 )
{
dispHeight = thisWidth - 200 ; dispHeight = thisWidth - 200 ;
} } else if ( thisHeight >= 450 ) {
else if ( thisHeight >= 450 )
{
dispHeight = thisHeight - 150 ; dispHeight = thisHeight - 150 ;
} } else if ( thisHeight >= 350 ) {
else if ( thisHeight >= 350 )
{
dispHeight = thisHeight - 100 ; dispHeight = thisHeight - 100 ;
} }
} }
v += 'displayheight=' + dispHeight + '&amp;' ; v += 'displayheight=' + dispHeight + '&amp;' ;
} }
if ( this.playlistThumbs == 'false' ) if ( this.playlistThumbs == 'false' ) {
{
dispThumbs = false ; dispThumbs = false ;
} }
v += 'thumbsinplaylist=' + dispThumbs + '&amp;' ; v += 'thumbsinplaylist=' + dispThumbs + '&amp;' ;
} }
v += 'shuffle=false&amp;' ; v += 'shuffle=false&amp;' ;
if (this.loop) if (this.loop) {
{
v += 'repeat=list&amp;' ; v += 'repeat=list&amp;' ;
} } else {
else
{
v += 'repeat=' + this.loop + '&amp;' ; v += 'repeat=' + this.loop + '&amp;' ;
} }
//v += 'transition=bgfade&amp;' ; //v += 'transition=bgfade&amp;' ;
} } else {
else
{
v += 'file=' + this.url + '&amp;' ; v += 'file=' + this.url + '&amp;' ;
v += 'repeat=' + this.loop + '&amp;' ; v += 'repeat=' + this.loop + '&amp;' ;
v += 'image=' + this.iurl + '&amp;' ; v += 'image=' + this.iurl + '&amp;' ;
@ -639,39 +592,34 @@ Media.prototype.getInnerHTML = function ( objectId )
v += 'showdigits=' + this.displayDigits + '&amp;' ; v += 'showdigits=' + this.displayDigits + '&amp;' ;
v += 'shownavigation=' + this.displayNavigation + '&amp;'; v += 'shownavigation=' + this.displayNavigation + '&amp;';
// SET THE COLOR OF THE TOOLBAR // SET THE COLOR OF THE TOOLBAR
var colorChoice1 = this.toolcolor ; var colorChoice1 = this.toolcolor ;
if ( colorChoice1.length > 0 ) if ( colorChoice1.length > 0 ) {
{
colorChoice1 = colorChoice1.replace( '#', '0x' ) ; colorChoice1 = colorChoice1.replace( '#', '0x' ) ;
v += 'backcolor=' + colorChoice1 + '&amp;' ; v += 'backcolor=' + colorChoice1 + '&amp;' ;
} }
// SET THE COLOR OF THE TOOLBARS TEXT AND BUTTONS // SET THE COLOR OF THE TOOLBARS TEXT AND BUTTONS
var colorChoice2 = this.tooltcolor ; var colorChoice2 = this.tooltcolor ;
if ( colorChoice2.length > 0 ) if ( colorChoice2.length > 0 ) {
{
colorChoice2 = colorChoice2.replace( '#', '0x' ) ; colorChoice2 = colorChoice2.replace( '#', '0x' ) ;
v += 'frontcolor=' + colorChoice2 + '&amp;' ; v += 'frontcolor=' + colorChoice2 + '&amp;' ;
} }
// SET COLOR OF ROLLOVER TEXT AND BUTTONS // SET COLOR OF ROLLOVER TEXT AND BUTTONS
var colorChoice3 = this.tooltrcolor ; var colorChoice3 = this.tooltrcolor ;
if ( colorChoice3.length > 0 ) if ( colorChoice3.length > 0 ) {
{
colorChoice3 = colorChoice3.replace( '#', '0x' ) ; colorChoice3 = colorChoice3.replace( '#', '0x' ) ;
v += 'lightcolor=' + colorChoice3 + '&amp;' ; v += 'lightcolor=' + colorChoice3 + '&amp;' ;
} }
// SET COLOR OF BACKGROUND // SET COLOR OF BACKGROUND
var colorChoice4 = this.bgcolor ; var colorChoice4 = this.bgcolor ;
if ( colorChoice4.length > 0 ) if ( colorChoice4.length > 0 ) {
{
colorChoice4 = colorChoice4.replace( '#', '0x' ) ; colorChoice4 = colorChoice4.replace( '#', '0x' ) ;
v += 'screencolor=' + colorChoice4 + '&amp;' ; v += 'screencolor=' + colorChoice4 + '&amp;' ;
} }
v += 'logo=' + this.wmurl + '&amp;' ; v += 'logo=' + this.wmurl + '&amp;' ;
if ( this.rurl.length > 0 ) if ( this.rurl.length > 0 ) {
{
v += 'recommendations=' + this.rurl + '&amp;' ; v += 'recommendations=' + this.rurl + '&amp;' ;
} }

Write Preview
Loading…
Cancel
Save