/[drupal]/contributions/modules/jquery_media/js/jquery.media.js
ViewVC logotype

Diff of /contributions/modules/jquery_media/js/jquery.media.js

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

revision 1.1.4.1, Mon Jun 30 14:26:55 2008 UTC revision 1.1.4.2, Wed Dec 17 14:45:40 2008 UTC
# Line 8  Line 8 
8   * http://www.gnu.org/licenses/gpl.html   * http://www.gnu.org/licenses/gpl.html
9   *   *
10   * @author: M. Alsup   * @author: M. Alsup
11   * @version: 0.81 (06/05/2008)   * @version: 0.84 (12/01/2008)
12   * @requires jQuery v1.1.2 or later   * @requires jQuery v1.1.2 or later
13   * $Id: jquery.media.js 2460 2007-07-23 02:53:15Z malsup $   * $Id: jquery.media.js 2460 2007-07-23 02:53:15Z malsup $
14   *   *
# Line 96  $.fn.media.defaults = { Line 96  $.fn.media.defaults = {
96      bgColor:       '#ffffff', // background color      bgColor:       '#ffffff', // background color
97      params:        { wmode: 'transparent'},  // added to object element as param elements; added to embed element as attrs      params:        { wmode: 'transparent'},  // added to object element as param elements; added to embed element as attrs
98      attrs:         {},        // added to object and embed elements as attrs      attrs:         {},        // added to object and embed elements as attrs
99        flvKeyName:    'file',    // key used for object src param (thanks to Andrea Ercolino)
100      flashvars:     {},        // added to flash content as flashvars param/attr      flashvars:     {},        // added to flash content as flashvars param/attr
101      flashVersion:  '7',       // required flash version      flashVersion:  '7',       // required flash version
102      expressInstaller: null,   // src for express installer      expressInstaller: null,   // src for express installer
# Line 214  function getTypesRegExp() { Line 215  function getTypesRegExp() {
215          if (types.length) types += ',';          if (types.length) types += ',';
216          types += $.fn.media.defaults.players[player].types;          types += $.fn.media.defaults.players[player].types;
217      };      };
218      return new RegExp('\\.(' + types.replace(/,/g,'|') + ')\\b');      return new RegExp('\\.(' + types.replace(/,/g,'|') + ')$\\b');
219  };  };
220    
221  function getGenerator(player) {  function getGenerator(player) {
# Line 237  function getSettings(el, options) { Line 238  function getSettings(el, options) {
238      meta = meta || {};      meta = meta || {};
239      var w = meta.width  || parseInt(((cls.match(/w:(\d+)/)||[])[1]||0));      var w = meta.width  || parseInt(((cls.match(/w:(\d+)/)||[])[1]||0));
240      var h = meta.height || parseInt(((cls.match(/h:(\d+)/)||[])[1]||0));      var h = meta.height || parseInt(((cls.match(/h:(\d+)/)||[])[1]||0));
241    
242      if (w) meta.width  = w;      if (w) meta.width  = w;
243      if (h) meta.height = h;      if (h) meta.height = h;
244      if (cls) meta.cls = cls;      if (cls) meta.cls = cls;
# Line 311  $.fn.media.swf = function(el, opts) { Line 312  $.fn.media.swf = function(el, opts) {
312  $.fn.media.flv = $.fn.media.mp3 = function(el, opts) {  $.fn.media.flv = $.fn.media.mp3 = function(el, opts) {
313      var src = opts.src;      var src = opts.src;
314      var player = /\.mp3\b/i.test(src) ? $.fn.media.defaults.mp3Player : $.fn.media.defaults.flvPlayer;      var player = /\.mp3\b/i.test(src) ? $.fn.media.defaults.mp3Player : $.fn.media.defaults.flvPlayer;
315        var key = opts.flvKeyName;
316        src = encodeURIComponent(src);
317      opts.src = player;      opts.src = player;
318      opts.src = opts.src + '?file=' + src;      opts.src = opts.src + '?'+key+'=' + (src);
319      opts.flashvars = $.extend({}, { file: src }, opts.flashvars );      var srcObj = {};
320        srcObj[key] = src;
321        opts.flashvars = $.extend({}, srcObj, opts.flashvars );
322      return $.fn.media.swf(el, opts);      return $.fn.media.swf(el, opts);
323  };  };
324    
# Line 379  function generate(el, opts, player) { Line 384  function generate(el, opts, player) {
384          var a = ['<object width="' + opts.width + '" height="' + opts.height + '" '];          var a = ['<object width="' + opts.width + '" height="' + opts.height + '" '];
385          for (var key in opts.attrs)          for (var key in opts.attrs)
386              a.push(key + '="'+opts.attrs[key]+'" ');              a.push(key + '="'+opts.attrs[key]+'" ');
387          for (var key in o.oAttrs || {})          for (var key in o.oAttrs || {}) {
388              a.push(key + '="'+o.oAttrs[key]+'" ');              var v = o.oAttrs[key];
389                if (key == 'codebase' && window.location.protocol == 'https')
390                    v = v.replace('http','https');
391                a.push(key + '="'+v+'" ');
392            }
393          a.push('></ob'+'ject'+'>');          a.push('></ob'+'ject'+'>');
394          var p = ['<param name="' + (o.oUrl || 'src') +'" value="' + opts.src + '">'];          var p = ['<param name="' + (o.oUrl || 'src') +'" value="' + opts.src + '">'];
395          for (var key in opts.params)          for (var key in opts.params)
# Line 397  function generate(el, opts, player) { Line 406  function generate(el, opts, player) {
406          for (var key in o.eAttrs || {})          for (var key in o.eAttrs || {})
407              a.push(key + '="'+o.eAttrs[key]+'" ');              a.push(key + '="'+o.eAttrs[key]+'" ');
408          for (var key in opts.params)          for (var key in opts.params)
409              a.push(key + '="'+opts.params[key]+'" ');              if (key != 'wmode') // FF3/Quicktime borks on wmode
410                    a.push(key + '="'+opts.params[key]+'" ');
411          a.push('></em'+'bed'+'>');          a.push('></em'+'bed'+'>');
412      }      }
413      // convert element to div      // convert element to div
Legend:
Removed from v.1.1.4.1  
changed lines
  Added in v.1.1.4.2
  ViewVC Help
Powered by ViewVC 1.1.2