various fixes

mstandio · Jun 9, 2013 · 102eb46 · 102eb46
1 parent a9e4bd7
commit 102eb46
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/com/panozona/modules/imagegallery/controller/CloseController.as b/src/com/panozona/modules/imagegallery/controller/CloseController.as
@@ -18,6 +18,7 @@ along with SaladoPlayer. If not, see <http://www.gnu.org/licenses/>.
 */
 package com.panozona.modules.imagegallery.controller {
 
+	import com.panozona.modules.imagegallery.events.WindowEvent;
 	import com.panozona.modules.imagegallery.view.CloseView;
 	import com.panozona.player.module.data.property.Align;
 	import com.panozona.player.module.Module;
@@ -26,7 +27,6 @@ package com.panozona.modules.imagegallery.controller {
 	import flash.events.IOErrorEvent;
 	import flash.events.MouseEvent;
 	import flash.net.URLRequest;
-	import flash.system.ApplicationDomain;
 
 	public class CloseController {
 
@@ -39,14 +39,12 @@ package com.panozona.modules.imagegallery.controller {
 
 			if (_closeView.imageGalleryData.close.path == null) return;
 
-			var viewEventClass:Class = ApplicationDomain.currentDomain.getDefinition("com.panosalado.events.ViewEvent") as Class;
-			_module.saladoPlayer.manager.addEventListener(viewEventClass.BOUNDS_CHANGED, handleResize, false, 0, true);
-			handleResize();
-
 			var imageLoader:Loader = new Loader();
 			imageLoader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, imageLost, false, 0, true);
 			imageLoader.contentLoaderInfo.addEventListener(Event.COMPLETE, imageLoaded, false, 0, true);
 			imageLoader.load(new URLRequest(_closeView.imageGalleryData.close.path));
+
+			_closeView.imageGalleryData.windowData.addEventListener(WindowEvent.CHANGED_CURRENT_SIZE, handleResize, false, 0, true);
 		}
 
 		private function imageLost(error:IOErrorEvent):void {

diff --git a/src/com/panozona/modules/imagemap/controller/CloseController.as b/src/com/panozona/modules/imagemap/controller/CloseController.as
@@ -43,6 +43,8 @@ package com.panozona.modules.imagemap.controller {
 			imageLoader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, imageLost, false, 0, true);
 			imageLoader.contentLoaderInfo.addEventListener(Event.COMPLETE, imageLoaded, false, 0, true);
 			imageLoader.load(new URLRequest(_closeView.imageMapData.close.path));
+
+			_closeView.imageMapData.windowData.addEventListener(WindowEvent.CHANGED_CURRENT_SIZE, handleResize, false, 0, true);
 		}
 
 		private function imageLost(error:IOErrorEvent):void {
@@ -56,10 +58,10 @@ package com.panozona.modules.imagemap.controller {
 			e.target.removeEventListener(Event.COMPLETE, imageLoaded);
 			_closeView.addChild(e.target.content)
 			_closeView.addEventListener(MouseEvent.CLICK, handleMouseClick, false, 0, true);
-			placeonWindow();
+			handleResize();
 		}
 
-		private function placeonWindow(e:Event = null):void {
+		private function handleResize(e:Event = null):void {
 			if (_closeView.imageMapData.close.align.horizontal == Align.LEFT) {
 				_closeView.x = 0;
 			}else if (_closeView.imageMapData.close.align.horizontal == Align.RIGHT) {

diff --git a/src/com/panozona/modules/infobox/controller/CloseController.as b/src/com/panozona/modules/infobox/controller/CloseController.as
@@ -43,6 +43,8 @@ package com.panozona.modules.infobox.controller {
 			imageLoader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, imageLost, false, 0, true);
 			imageLoader.contentLoaderInfo.addEventListener(Event.COMPLETE, imageLoaded, false, 0, true);
 			imageLoader.load(new URLRequest(_closeView.infoBoxData.close.path));
+
+			_closeView.infoBoxData.windowData.addEventListener(WindowEvent.CHANGED_CURRENT_SIZE, handleResize, false, 0, true);
 		}
 
 		private function imageLost(error:IOErrorEvent):void {
@@ -56,10 +58,10 @@ package com.panozona.modules.infobox.controller {
 			e.target.removeEventListener(Event.COMPLETE, imageLoaded);
 			_closeView.addChild(e.target.content)
 			_closeView.addEventListener(MouseEvent.CLICK, handleMouseClick, false, 0, true);
-			placeonWindow();
+			handleResize();
 		}
 
-		private function placeonWindow(e:Event = null):void {
+		private function handleResize(e:Event = null):void {
 			if (_closeView.infoBoxData.close.align.horizontal == Align.LEFT) {
 				_closeView.x = 0;
 			}else if (_closeView.infoBoxData.close.align.horizontal == Align.RIGHT) {

diff --git a/src/com/panozona/modules/mousecursor/data/Style.as b/src/com/panozona/modules/mousecursor/data/Style.as
@@ -20,8 +20,8 @@ package com.panozona.modules.mousecursor.data {
 
 	public class Style {
 
-		public var lineColorInner:Number = 0x000000;
-		public var lineColorOuter:Number = 0xffffff;
+		public var lineColorInner:Number = 0xffffff;
+		public var lineColorOuter:Number = 0x000000;
 		public var lineSize:Number = 5;
 	}
 }