Changeset 730

Timestamp:

12/09/09 11:51:49 (3 years ago)

Author:

pablo

Message:

Aliased logo -> logo.file for commercial players.

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/model/PlayerConfig.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/Player.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/utils/Configger.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (1 diff)

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

@@ -58 +58 @@
                         playlist = _playlist;
                         playlistsize = _playlistsize;
+                        logo = _logo;
                 }
                 
@@ -234 +235 @@
 
                 /** Location of an external jpg, png or gif image to show in a corner of the display. With the default skin, this is top-right, but every skin can freely place the logo. **/
-                public function get logo():String { return _logo; }
-                public function set logo(x:String):void { _logo = x; }
+                public function get logo():String { 
+                        if (pluginConfig('logo').hasOwnProperty('file'))
+                                return pluginConfig('logo')['file'];
+                        else return _logo;
+                }
+                public function set logo(x:String):void {
+                        if (x != null) {
+                                setPluginProperty('logo.file', x.toLowerCase());
+                        }
+                }
 
                 /** Position of the playlist. Can be set to bottom, over, right or none. @default none **/

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

@@ -36 +36 @@
                 /** Player constructor **/
                 public function Player() {
-                        new RootReference(this);
                         try {
                                 this.addEventListener(Event.ADDED_TO_STAGE, setupPlayer);
@@ -50 +49 @@
                         } catch (err:Error) {
                         }
+                        new RootReference(this);
                         model = newModel();
                         view = newView(model);

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

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

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

@@ -85 +85 @@
 
                 private function loadCookies():void {
-                        var cookie:SharedObject = SharedObject.getLocal('com.jeroenwijering','/');
-                        writeCookieData(cookie.data);
+                        try {
+                                var cookie:SharedObject = SharedObject.getLocal('com.jeroenwijering','/');
+                                writeCookieData(cookie.data);
+                        } catch (err:Error) {}
                 }
 

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

@@ -177 +177 @@
                         _pluginsLayer = setupLayer("plugins", 4);
                         _plugins = {};
-
+                        
+                        setupLogo();
+                }
+                
+                protected function setupLogo():void {
                         _logoLayer = setupLayer("logo", 5);
                         _logo = new Logo(_player);