Changeset 2255

Timestamp:

07/06/07 01:38:34 (1 year ago)

Author:

malsup

Message:

Improve support for mediabox on mac/ff platform.

Files:

• trunk/plugins/media/jquery.media.js (modified) (10 diffs)

trunk/plugins/media/jquery.media.js

@@ -9 +9 @@
  *
  * @author: M. Alsup
- * @version: 0.66 (6/08/2007)
+ * @version: 0.70 (7/05/2007)
  * @requires jQuery v1.1.2 or later
  *
@@ -26 +26 @@
  *     Other: bmp, html, pdf, psd, qif, qtif, qti, tif, tiff, xaml
  *
- * Thanks to Mark Hicken for helping me debug this on Safari!
+ * Thanks to Mark Hicken and Brent Pedersen for helping me debug this on the Mac!
  */
 (function($) {
@@ -70 +70 @@
             
             // post-conversion callback, passes original element, new div element and fully populated options
-            if (typeof f2 == 'function') f2(this, $div[0], o);
+            if (typeof f2 == 'function') f2(this, $div[0], o, player.name);
             break;
         }
@@ -87 +87 @@
 $.fn.mediabox = function(options, css) {
     return this.click(function() {
-        if (typeof $.blockUI == 'undefined' || typeof $.fn.displayBox == 'undefined') {
+        if (typeof $.blockUI == 'undefined' || typeof $.blockUI.version == 'undefined' || $.blockUI.version < 1.26) {
             if (typeof $.fn.mediabox.warning != 'undefined') return this; // one warning is enough
             $.fn.mediabox.warning = 1;
-            alert('The mediabox method requires blockUI v1.20 or later.');
+            alert('The mediabox method requires blockUI v1.26 or later.');
             return false;
         }
-        var o, div=0, $e = $(this).clone();
+        var o, p, div=0, $e = $(this).clone();
         $e.appendTo('body').hide().css({margin: 0});
         options = $.extend({}, options, { autoplay: 1 }); // force autoplay in box mode
-        $e.media(options, function(){}, function(origEl, newEl, opts) {
+        $e.media(options, function(){}, function(origEl, newEl, opts, player) {
             div = newEl;
             o = opts;
+            p = player;
         });
         if (!div) return false;
@@ -117 +118 @@
         $div.displayBox( { width: o.width, height: o.height }, function(el) {
             // quirkiness; sometimes media doesn't stop when removed from the DOM (especially in IE)
-            $(el).find('object,embed').each(function() {
+            $('object,embed', el).each(function() {
                 try { this.Stop();   } catch(e) {}  // quicktime
                 try { this.DoStop(); } catch(e) {}  // real
                 try { this.controls.stop(); } catch(e) {} // windows media player
             });
-        });
+        }, p == 'flash'); // <-- mac/ff workaround
         return false;
     });
@@ -178 +179 @@
 $.fn.media.defaults.players = {
     flash: {
+        name:         'flash',
         types:        'flv,mp3,swf',
         oAttrs:   {
@@ -190 +192 @@
     },
     quicktime: {
+        name:         'quicktime',
         types:        'aif,aiff,aac,au,bmp,gsm,mov,mid,midi,mpg,mpeg,mp4,m4a,psd,qt,qtif,qif,qti,snd,tif,tiff,wav,3g2,3gp',
         oAttrs:   {
@@ -200 +203 @@
     },
     realplayer: {
+        name:         'real',
         types:        'ra,ram,rm,rpm,rv,smi,smil',
         autoplayAttr: 'autostart',
@@ -211 +215 @@
     },
     winmedia: {
+        name:         'winmedia',
         types:        'asf,avi,wma,wmv',
         autoplayAttr: 'autostart',
@@ -225 +230 @@
     // special cases
     iframe: {
+        name:  'iframe',
         types: 'html,pdf'
     },
     silverlight: {
+        name:  'silverlight',
         types: 'xaml'
     }