Changeset 750

Timestamp:

12/14/09 15:20:37 (3 years ago)

Author:

pablo

Message:

• Allows Javascript and Plugins to load arrays ( http://developer.longtailvideo.com/trac/ticket/650)
• "Fullscreen" flashvar is ignored/read-only
• Logo allows positioning in commercial players

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/Controller.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/model/Model.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/Logo.as (modified) (3 diffs)

trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as

@@ -481 +481 @@
                         } else if (item is Number) {
                                 return loadNumber(item as Number);
+                        } else if (item is Array) {
+                                return loadArray(item as Array);
                         } else if (item is Object) {
                                 return loadObject(item as Object);
@@ -528 +530 @@
 
 
+                protected function loadArray(item:Array):Boolean {
+                        if (item.length > 0) {
+                                _model.playlist.load(item);
+                                return true;
+                        }
+                        return false;
+                }
+
                 protected function loadNumber(item:Number):Boolean {
                         if (item >= 0 && item < _model.playlist.length) {

trunk/fl5/src/com/longtailvideo/jwplayer/model/Model.as

@@ -122 +122 @@
                 /** The current fullscreen state of the player **/
                 public function get fullscreen():Boolean {
-                        return _config.fullscreen;
+                        return _fullscreen;
                 }
 
                 public function set fullscreen(b:Boolean):void {
+                        _fullscreen = b;
                         _config.fullscreen = b;
                 }

trunk/fl5/src/com/longtailvideo/jwplayer/player/PlayerVersion.as

@@ -3 +3 @@
         
         public class PlayerVersion {
-                protected static var _version:String = "5.0.749";
+                protected static var _version:String = "5.0.750";
                 
                 public static function get version():String {

trunk/fl5/src/com/longtailvideo/jwplayer/view/Logo.as

@@ -12 +12 @@
         import flash.events.ErrorEvent;
         import flash.events.Event;
-        import flash.events.IOErrorEvent;
         import flash.events.MouseEvent;
         import flash.net.URLRequest;
@@ -30 +29 @@
                         over: 1, 
                         timeout: 3,
-                        hide: 'true'
+                        hide: 'true',
+                        position: 'bottom-left'
                 }
                 /** Reference to the player **/
@@ -139 +139 @@
                         _width = width;
                         _height = height;
-                        if (loader.loadedObject) {
-                                (loader.loadedObject as Bitmap).x = getConfigParam('margin');
-                                (loader.loadedObject as Bitmap).y = _height - (loader.loadedObject as Bitmap).height - getConfigParam('margin');
+                        var image:Bitmap = (loader.loadedObject as Bitmap);
+                        var margin:Number = getConfigParam('margin');
+                        var position:String = (getConfigParam('position') as String).toLowerCase(); 
+                        if (image) {
+                                if (position.indexOf('right') >= 0) {
+                                        image.x = _width - image.width - margin;
+                                } else {
+                                        image.x = margin;
+                                }
+                                
+                                if (position.indexOf('bottom') >= 0) {
+                                        image.y = _height - image.height - margin;
+                                } else {
+                                        image.y = margin;
+                                }
                         }
                 }