/[drupal]/contributions/modules/jquery_media/jquery_media.jq.inc
ViewVC logotype

Diff of /contributions/modules/jquery_media/jquery_media.jq.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.4.2.1, Mon Jun 30 14:26:55 2008 UTC revision 1.4.2.2, Mon Mar 23 13:44:06 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id$  // $Id: jquery_media.jq.inc,v 1.4.2.1 2008/06/30 14:26:55 aaron Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 84  function _jquery_media_add($options = ar Line 84  function _jquery_media_add($options = ar
84        $defaults['flvplayer'] = $options['flvplayer'] ? url($options['flvplayer']) : url(variable_get('jquery_media_flvplayer', JQUERY_MEDIA_FLVPLAYER_DEFAULT));        $defaults['flvplayer'] = $options['flvplayer'] ? url($options['flvplayer']) : url(variable_get('jquery_media_flvplayer', JQUERY_MEDIA_FLVPLAYER_DEFAULT));
85        $js .= "    $.fn.media.defaults.flvPlayer = '{$defaults['flvplayer']}';\n";        $js .= "    $.fn.media.defaults.flvPlayer = '{$defaults['flvplayer']}';\n";
86      }      }
87        if (!($default_js_loaded || isset($defaults['mp4 flash'])) || $options['mp4 flash']) {
88          $defaults['mp4 flash'] = $options['mp4 flash'] ? $options['mp4 flash'] : variable_get('jquery_media_mp4_flash', JQUERY_MEDIA_MP4_FLASH_DEFAULT);
89          if ($defaults['mp4 flash']) {
90            $js .= "    $.fn.media.mp4 = $.fn.media.flv;\n";
91          }
92        }
93      if (!($default_js_loaded || isset($defaults['mp3player'])) || $options['mp3player']) {      if (!($default_js_loaded || isset($defaults['mp3player'])) || $options['mp3player']) {
94        $defaults['mp3player'] = $options['mp3player'] ? url($options['mp3player']) : url(variable_get('jquery_media_mp3player', JQUERY_MEDIA_MP3PLAYER_DEFAULT));        $defaults['mp3player'] = $options['mp3player'] ? url($options['mp3player']) : url(variable_get('jquery_media_mp3player', JQUERY_MEDIA_MP3PLAYER_DEFAULT));
95        $js .= "    $.fn.media.defaults.mp3Player = '{$defaults['mp3player']}';\n";        $js .= "    $.fn.media.defaults.mp3Player = '{$defaults['mp3player']}';\n";
Legend:
Removed from v.1.4.2.1  
changed lines
  Added in v.1.4.2.2
  ViewVC Help
Powered by ViewVC 1.1.2