Changeset 836

Timestamp:

02/17/10 11:35:14 (3 years ago)

Author:

pablo

Message:

• Prevent javascript playlist crashes by suppressing PlaylistItem keys with the "." character ( http://developer.longtailvideo.com/trac/ticket/738)
• PNG Skin only sends one ERROR event
• TaskQueue only sends one COMPLETE event

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/PlayerSetup.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/controller/TaskQueue.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerV4Emulation.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/skins/PNGSkin.as (modified) (1 diff)
• test/tests/skins/PNGSkinTest.as (modified) (1 diff)

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

@@ -143 +143 @@
                                 skin.addEventListener(ErrorEvent.ERROR, loadSkin);
                         } else {
-                                if (evt) Logger.log("Error loading skin: " + evt.text); 
+                                if (evt) { 
+                                        Logger.log("Error loading skin: " + evt.text);
+                                        (evt.target as EventDispatcher).removeEventListener(ErrorEvent.ERROR, loadSkin);
+                                }
                                 skin = new DefaultSkin();
                                 skin.addEventListener(ErrorEvent.ERROR, tasker.failure);

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

@@ -37 +37 @@
                 private var continueOnFailure:Boolean;
                 private var failureState:Boolean = false;
+                private var completed:Boolean = false;
                 
                 public function TaskQueue(cont:Boolean=false) {
@@ -98 +99 @@
                                 taskIndex++;
                                 activeTask();
-                        } else {
+                        } else if (!completed) {
+                                completed = true;
                                 dispatchEvent(new Event(Event.COMPLETE));
                         }

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

@@ -386 +386 @@
                         
                         for (var i:String in item) {
-                                obj[i] = item[i];
+                                if (i.indexOf(".") < 0) {
+                                        obj[i] = item[i];
+                                }
                         }
                         

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

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

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

@@ -155 +155 @@
                         if (!isError) {
                                 _root.visible = true;
-                                RootReference.stage.removeChild(loaderScreen);
+                                loaderScreen.parent.removeChild(loaderScreen);
                         } else {
                                 loaderScreen.removeChild(loaderAnim);

trunk/fl5/src/com/longtailvideo/jwplayer/view/skins/PNGSkin.as

@@ -125 +125 @@
                                 delete _loaders[evt.target];
                                 checkComplete();
-                        } else {
+                        } else if (!_errorState) {
                                 _errorState = true;
                                 sendError(evt.text);

trunk/fl5/test/tests/skins/PNGSkinTest.as

@@ -19 +19 @@
                 public override function testLoad():void {
                         Async.handleEvent(this, skin, Event.COMPLETE, skinLoaded, 10000);
-//                      Async.failOnEvent(this, skin, ErrorEvent.ERROR, 10000);
-                        skin.load("../../../JWPlayer/skins/beelden/beelden.xml");
+                        Async.failOnEvent(this, skin, ErrorEvent.ERROR, 10000);
+                        skin.load("assets/skin/png/skin.xml");
                 }