Changeset 745

Timestamp:

12/11/09 14:43:54 (3 years ago)

Author:

pablo

Message:

SWF Skin controlbar positioning fix (ticket #646

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/MediaProviderLoader.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as (modified) (2 diffs)

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

@@ -48 +48 @@
                         try {
                                 loadedSource = loader.loadedObject as MediaProvider;
-                                dispatchEvent(new Event(Event.COMPLETE));
+                                if (loadedSource) {
+                                        dispatchEvent(new Event(Event.COMPLETE));
+                                } else {
+                                        dispatchEvent(new ErrorEvent(ErrorEvent.ERROR, false, false, "Loaded file is not a valid media provider."));
+                                }
                         } catch (e:Error) {
                                 dispatchEvent(new ErrorEvent(ErrorEvent.ERROR, false, false, e.message));

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

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

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as

@@ -24 +24 @@
         import flash.geom.Rectangle;
         import flash.text.TextField;
-        import flash.text.TextFormat;
         import flash.ui.Mouse;
         import flash.utils.clearTimeout;
@@ -157 +156 @@
 
                         var wid:Number = width;
+                        var margin:Number = controlbarConfig['margin'];
+
                         if (controlbarConfig['position'] == 'over' || _player.fullscreen == true) {
-                                skin.x = controlbarConfig['margin'];
-                                skin.y = height - skin.height - controlbarConfig['margin'];
-                                wid = width - 2 * controlbarConfig['margin'];
-                        } else {
-                                skin.x = 0;
-                                skin.y = 0;
-                        }
+                                x = margin;
+                                y = height - skin.height - margin;
+                                wid = width - 2 * margin;
+                        }
+
                         try {
                                 getSkinComponent('fullscreenButton').visible = false;