Changeset 331

Timestamp:

09/07/09 10:37:21 (4 years ago)

Author:

jeroen

Message:

added the oncomplete flashvar, fixed repositioning of watermark and fixed infobox fullscreen display if it is set to top

Files:

• plugins/infobox/com/jeroenwijering/plugins/InfoBox.as (modified) (1 diff)
• plugins/infobox/infobox.swf (modified) (previous)
• testing/files/watermark.png (added)
• testing/index.html (modified) (1 diff)
• trunk/as3/com/jeroenwijering/player/Controller.as (modified) (2 diffs)
• trunk/as3/com/jeroenwijering/player/Model.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/player/Player.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/plugins/Watermark.as (modified) (2 diffs)
• trunk/as3/player.fla (modified) (previous)
• trunk/as3/player.swf (modified) (previous)

plugins/infobox/com/jeroenwijering/plugins/InfoBox.as

@@ -105 +105 @@
                 back.width = view.config['width'];
                 if(config['width']) {
+                        visible = config['visible'];
                         x = config['x'];
-                        y = config['y'];
+                        y = config['y'] + config['height'] - config['size'];
                         back.width = config['width'];
                         back.height = config['size'];

testing/index.html

@@ -420 +420 @@
                 <label>mute</label>
                 <input type="text" name="mute" />
+                <label>oncomplete</label>
+                <input type="text" name="oncomplete" />
                 <label>repeat</label>
                 <input type="text" name="repeat" />

trunk/as3/com/jeroenwijering/player/Controller.as

@@ -181 +181 @@
 
         /** Jump to the link of a playlistitem. **/
-        private function linkHandler(evt:ViewEvent):void {
+        private function linkHandler(evt:ViewEvent=null):void {
                 var itm:Number = config['item'];
-                if(evt.data.index) { itm = evt.data.index; }
+                if(evt && evt.data.index) { itm = evt.data.index; }
                 var lnk:String = playlist[itm]['link'];
                 if(lnk != null) {
@@ -415 +415 @@
         private function stateHandler(evt:ModelEvent):void {
                 if(evt.data.newstate == ModelStates.COMPLETED) {
+                        if(config['oncomplete'] == 'link') { 
+                                linkHandler();
+                        }
                         switch (config['repeat']) {
                                 case 'single':

trunk/as3/com/jeroenwijering/player/Model.as

@@ -182 +182 @@
                                         sendEvent(ModelEvent.LOADED,{loaded:0,offset:0,total:0});
                                 case ModelStates.COMPLETED:
-                                        thumb.visible = true;
-                                        display.media.visible = false;
-                                        sendEvent(ModelEvent.TIME,{position:item['start'],duration:item['duration']});
+                                        if(config['oncomplete'] != 'none') {
+                                                thumb.visible = true;
+                                                display.media.visible = false;
+                                                sendEvent(ModelEvent.TIME,{position:item['start'],duration:item['duration']});
+                                        }
                                         break;
                                 case ModelStates.PLAYING:

trunk/as3/com/jeroenwijering/player/Player.as

@@ -55 +55 @@
                 logo:undefined,
                 mute:false,
+                oncomplete:'rewind',
                 repeat:'none',
                 resizing:true,

trunk/as3/com/jeroenwijering/plugins/Watermark.as

@@ -19 +19 @@
 
         /** Configuration vars for this plugin. **/
-        private var config:Object = {};
+        public var config:Object = {};
         /** Reference to the skin MC. **/
         public var clip:MovieClip;
@@ -69 +69 @@
 
         private function resizeHandler(evt:ControllerEvent):void {
-                config = view.getPluginConfig(this);
-                x = config['x'] + 10;
-                y = config['height'] - height - 12;
+                clip.x = config['x'] + 10;
+                clip.y = config['y'] + config['height'] - clip.height - 12;
         };