Changeset 536

Timestamp:

10/27/09 19:54:08 (4 years ago)

Author:

pablo

Message:

Fixing bug: playlist scrolls back to first item after selecting another one.

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/Controller.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/player/Player.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/PlaylistComponent.as (modified) (1 diff)

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

@@ -119 +119 @@
                         dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_READY));
 
-                        _model.playlist.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_LOADED, playlistLoadHandler);
+                        _model.playlist.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_LOADED, playlistLoadHandler, false, 1000);
                         _model.playlist.addEventListener(ErrorEvent.ERROR, errorHandler);
-                        _model.playlist.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_ITEM, playlistItemHandler);
+                        _model.playlist.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_ITEM, playlistItemHandler, false, 1000);
                         
                         // Broadcast playlist loaded (which was swallowed during player setup);

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

@@ -30 +30 @@
          */
         public class Player extends Sprite {
-                private static var playerVersion:String = "5.0.535 alpha";
+                private static var playerVersion:String = "5.0.536 alpha";
                 private static var _commercial:Boolean = Boolean(CONFIG::commercial);
                 

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

@@ -498 +498 @@
                 private function upHandler(evt:MouseEvent):void {
                         var mpl:Number = 0;
+                        var sliderType:String = scrubber.name;
+                        
                         stage.removeEventListener(MouseEvent.MOUSE_UP, upHandler);
                         scrubber.icon.stopDrag();
-                        if (scrubber.name == 'timeSlider' && _player.playlist) {
+                        if (sliderType == 'timeSlider' && _player.playlist) {
                                 mpl = _player.playlist.currentItem.duration;
-                        } else if (scrubber.name == 'volumeSlider') {
+                        } else if (sliderType == 'volumeSlider') {
                                 if (_player.mute) return;
-                                else mpl = 100;
+                                else mpl = 1020;
                         }
                         var pct:Number = (scrubber.icon.x - scrubber.rail.x) / (scrubber.rail.width - scrubber.icon.width) * mpl;
-                        dispatchEvent(new ViewEvent(SLIDERS[scrubber.name], Math.round(pct)));
+                        dispatchEvent(new ViewEvent(SLIDERS[sliderType], Math.round(pct)));
                         scrubber = undefined;
                 }

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

@@ -337 +337 @@
                 /** Switch the currently active item */
                 protected function itemHandler(evt:PlaylistEvent = null):void {
-                        var idx:Number = _player.config.item;
+                        var idx:Number = _player.playlist.currentIndex;
                         clearInterval(scrollInterval);
                         if (proportion > 1.01) {