Changeset 4000

Timestamp:

12/03/07 02:58:15 (1 year ago)

Author:

malsup

Message:

- Add support for metadata plugin v2

Files:

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

trunk/plugins/media/jquery.media.js

@@ -9 +9 @@
  *
  * @author: M. Alsup
- * @version: 0.70 (7/05/2007)
+ * @version: 0.71 (12/02/2007)
  * @requires jQuery v1.1.2 or later
  * $Id$
@@ -123 +123 @@
                 try { this.DoStop(); } catch(e) {}  // real
                 try { this.controls.stop(); } catch(e) {} // windows media player
+                $(this).remove();
             });
         }, p == 'flash'); // <-- mac/ff workaround
@@ -141 +142 @@
     if (isDigit(format[0])) format = 'fn' + format;
     $.fn.media[format] = $.fn.media[player];
-};
-
+    $.fn.media[format+'_player'] = $.fn.media.defaults.players[player];
+};
 
 // global defautls; override as needed
@@ -279 +280 @@
     options = options || {};
     var $el = $(el);
-    
     var cls = el.className || '';
-    var meta = $.meta ? $el.data() : {};
+    // support metadata plugin (v1.0 and v2.0)
+    var meta = $.metadata ? $el.metadata() : $.meta ? $el.data() : {})
     var w = meta.width  || parseInt(((cls.match(/w:(\d+)/)||[])[1]||0));
     var h = meta.height || parseInt(((cls.match(/h:(\d+)/)||[])[1]||0));