Changeset 400

Timestamp:

10/06/09 16:36:44 (4 years ago)

Author:

zach

Message:

• Restructured view
• Added ExternalInterface Checks

Location:

trunk/fl5/src/com/longtailvideo/jwplayer

Files:

• controller/PlayerSetup.as (modified) (2 diffs)
• player/JavascriptAPI.as (modified) (4 diffs)
• player/Player.as (modified) (2 diffs)
• player/PlayerV4Emulation.as (modified) (2 diffs)
• utils/Logger.as (modified) (2 diffs)
• utils/Stacker.as (modified) (1 diff)
• view/ComponentButton.as (deleted)
• view/ControlBarComponent.as (deleted)
• view/ControlbarLayoutManager.as (deleted)
• view/CoreComponent.as (deleted)
• view/DefaultSkin.as (deleted)
• view/DisplayComponent.as (deleted)
• view/IControlbarComponent.as (deleted)
• view/IDisplayComponent.as (deleted)
• view/IDockComponent.as (deleted)
• view/IPlaylistComponent.as (deleted)
• view/ISkin.as (deleted)
• view/PNGSkin.as (deleted)
• view/PlayerComponents.as (modified) (2 diffs)
• view/SWFSkin.as (deleted)
• view/SkinBase.as (deleted)
• view/SkinProperties.as (deleted)
• view/Slider.as (deleted)
• view/V4ControlBarComponent.as (deleted)
• view/View.as (modified) (1 diff)
• view/components (added)
• view/components/ComponentButton.as (added)
• view/components/ControlbarComponent.as (added)
• view/components/ControlbarComponentV4.as (added)
• view/components/ControlbarLayoutManager.as (added)
• view/components/CoreComponent.as (added)
• view/components/DisplayComponent.as (added)
• view/components/Slider.as (added)
• view/interfaces (added)
• view/interfaces/IControlbarComponent.as (added)
• view/interfaces/IDisplayComponent.as (added)
• view/interfaces/IDockComponent.as (added)
• view/interfaces/IPlaylistComponent.as (added)
• view/interfaces/ISkin.as (added)
• view/skins (added)
• view/skins/DefaultSkin.as (added)
• view/skins/PNGSkin.as (added)
• view/skins/SWFSkin.as (added)
• view/skins/SkinBase.as (added)
• view/skins/SkinProperties.as (added)

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

@@ -8 +8 @@
         import com.longtailvideo.jwplayer.utils.Configger;
         import com.longtailvideo.jwplayer.utils.Strings;
-        import com.longtailvideo.jwplayer.view.DefaultSkin;
-        import com.longtailvideo.jwplayer.view.ISkin;
-        import com.longtailvideo.jwplayer.view.PNGSkin;
-        import com.longtailvideo.jwplayer.view.SWFSkin;
-        import com.longtailvideo.jwplayer.view.SkinProperties;
+        import com.longtailvideo.jwplayer.view.interfaces.ISkin;
+        import com.longtailvideo.jwplayer.view.skins.DefaultSkin;
+        import com.longtailvideo.jwplayer.view.skins.PNGSkin;
+        import com.longtailvideo.jwplayer.view.skins.SWFSkin;
+        import com.longtailvideo.jwplayer.view.skins.SkinProperties;
         import com.longtailvideo.jwplayer.view.View;
         
@@ -21 +21 @@
         import flash.events.TimerEvent;
         import flash.utils.Timer;
+        import com.longtailvideo.jwplayer.view.interfaces.ISkin;
 
         /**

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

@@ -33 +33 @@
                         
                         var callbacks:String = _player.config.playerready ? _player.config.playerready + "," + "playerReady" : "playerReady";  
-                        
-                        for each (var callback:String in callbacks.replace(/\s/,"").split(",")) {
-                                ExternalInterface.call(callback,{
-                                        id:newEvt.id,
-                                        client:newEvt.client,
-                                        version:newEvt.version
-                                });
-                        }
 
-                        
+                        if (ExternalInterface.available) {
+                                for each (var callback:String in callbacks.replace(/\s/,"").split(",")) {
+                                        ExternalInterface.call(callback,{
+                                                id:newEvt.id,
+                                                client:newEvt.client,
+                                                version:newEvt.version
+                                        });
+                                }
+                        }                       
                 }
                 
                 private function setupListeners():void {
-                        ExternalInterface.addCallback("addControllerListener",addJSControllerListener);
-                        ExternalInterface.addCallback("addModelListener",addJSModelListener);
-                        ExternalInterface.addCallback("addViewListener",addJSViewListener);
-                        ExternalInterface.addCallback("removeControllerListener",removeJSControllerListener);
-                        ExternalInterface.addCallback("removeModelListener",removeJSModelListener);
-                        ExternalInterface.addCallback("removeViewListener",removeJSViewListener);
-                        ExternalInterface.addCallback("getConfig",getConfig);
-                        ExternalInterface.addCallback("getPlaylist",getPlaylist);
-                        ExternalInterface.addCallback("getPluginConfig",getJSPluginConfig);
-                        ExternalInterface.addCallback("loadPlugin",loadPlugin);
-                        ExternalInterface.addCallback("sendEvent",sendEvent);
+                        if (ExternalInterface.available) {
+                                ExternalInterface.addCallback("addControllerListener",addJSControllerListener);
+                                ExternalInterface.addCallback("addModelListener",addJSModelListener);
+                                ExternalInterface.addCallback("addViewListener",addJSViewListener);
+                                ExternalInterface.addCallback("removeControllerListener",removeJSControllerListener);
+                                ExternalInterface.addCallback("removeModelListener",removeJSModelListener);
+                                ExternalInterface.addCallback("removeViewListener",removeJSViewListener);
+                                ExternalInterface.addCallback("getConfig",getConfig);
+                                ExternalInterface.addCallback("getPlaylist",getPlaylist);
+                                ExternalInterface.addCallback("getPluginConfig",getJSPluginConfig);
+                                ExternalInterface.addCallback("loadPlugin",loadPlugin);
+                                ExternalInterface.addCallback("sendEvent",sendEvent);
+                        }
                 }
                 
@@ -151 +153 @@
                         if (controllerCallbacks.hasOwnProperty(evt.type)) {
                                 for each (var callback:String in controllerCallbacks[evt.type]) {
-                                        ExternalInterface.call(callback, evt.data);
+                                        if (ExternalInterface.available) {
+                                                ExternalInterface.call(callback, evt.data);
+                                        }
                                 }
                         }
@@ -159 +163 @@
                         if (modelCallbacks.hasOwnProperty(evt.type)) {
                                 for each (var callback:String in modelCallbacks[evt.type]) {
-                                        ExternalInterface.call(callback, evt.data);
+                                        if (ExternalInterface.available) {
+                                                ExternalInterface.call(callback, evt.data);
+                                        }
                                 }
                         }
@@ -167 +173 @@
                         if (viewCallbacks.hasOwnProperty(evt.type)) {
                                 for each (var callback:String in viewCallbacks[evt.type]) {
-                                        ExternalInterface.call(callback, evt.data);
+                                        if (ExternalInterface.available) {
+                                                ExternalInterface.call(callback, evt.data);
+                                        }
                                 }
                         }

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

@@ -8 +8 @@
         import com.longtailvideo.jwplayer.utils.Logger;
         import com.longtailvideo.jwplayer.utils.RootReference;
-        import com.longtailvideo.jwplayer.view.ISkin;
+        import com.longtailvideo.jwplayer.view.interfaces.ISkin;
         import com.longtailvideo.jwplayer.view.PlayerComponents;
         import com.longtailvideo.jwplayer.view.View;
@@ -14 +14 @@
         import flash.display.Sprite;
         import flash.events.Event;
+        import com.longtailvideo.jwplayer.view.interfaces.ISkin;
         
         

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

@@ -16 +16 @@
         import com.longtailvideo.jwplayer.utils.Logger;
         import com.longtailvideo.jwplayer.utils.TypeChecker;
-        import com.longtailvideo.jwplayer.view.ControlBarComponent;
+        import com.longtailvideo.jwplayer.view.components.ControlbarComponent;
         
         import flash.display.DisplayObject;
         import flash.events.EventDispatcher;
         import flash.utils.describeType;
+        import com.longtailvideo.jwplayer.view.components.ControlbarComponent;
 
         /**
@@ -74 +75 @@
                         
                         var m:Model;
-                        var v:ControlBarComponent;
+                        var v:ControlbarComponent;
                         var c:Controller
                         

trunk/fl5/src/com/longtailvideo/jwplayer/utils/Logger.as

@@ -92 +92 @@
                                         break;
                                 case CONSOLE:
-                                        ExternalInterface.call('console.log', text);
+                                        if (ExternalInterface.available) {
+                                                ExternalInterface.call('console.log', text);
+                                        }
                                         break;
                                 case TRACE:
@@ -100 +102 @@
                                         break;
                                 default:
-                                        ExternalInterface.call(Logger._output, text);
+                                        if (ExternalInterface.available) {
+                                                ExternalInterface.call(Logger._output, text);
+                                        }
                                         break;
                         }

trunk/fl5/src/com/longtailvideo/jwplayer/utils/Stacker.as

@@ -1 @@
-package com.longtailvideo.jwplayer.view {
+package com.longtailvideo.jwplayer.utils {
         import flash.display.DisplayObject;
         import flash.display.MovieClip;

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

@@ -2 +2 @@
         import com.longtailvideo.jwplayer.model.PlayerConfig;
         import com.longtailvideo.jwplayer.player.Player;
+        import com.longtailvideo.jwplayer.view.interfaces.IControlbarComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IDisplayComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IDockComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IPlaylistComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.ISkin;
+        import com.longtailvideo.jwplayer.view.skins.SWFSkin;
+        import com.longtailvideo.jwplayer.view.components.ControlbarComponentV4;
+        import com.longtailvideo.jwplayer.view.components.ControlbarComponent;
+        import com.longtailvideo.jwplayer.view.components.DisplayComponent;
         
         
@@ -15 +24 @@
                 public function PlayerComponents(player:Player) {
                         if (player.skin is SWFSkin) {
-                                _controlbar = new V4ControlBarComponent(player);
+                                _controlbar = new ControlbarComponentV4(player);
                         } else {
-                                _controlbar = new ControlBarComponent(player);
+                                _controlbar = new ControlbarComponent(player);
                         }
                         _display = new DisplayComponent(player);

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

@@ -12 +12 @@
         import com.longtailvideo.jwplayer.utils.RootReference;
         import com.longtailvideo.jwplayer.utils.Stretcher;
-        
+        import com.longtailvideo.jwplayer.view.interfaces.IControlbarComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IDisplayComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IDockComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IPlaylistComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.ISkin;
+                
         import flash.display.DisplayObject;
         import flash.display.Loader;