Index: lams_flex/LamsAuthor/LearningLibrary2.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/LearningLibrary2.mxml (.../LearningLibrary2.mxml) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/LearningLibrary2.mxml (.../LearningLibrary2.mxml) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,112 +1,116 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml (.../LamsAuthor.mxml) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml (.../LamsAuthor.mxml) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,76 +1,80 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml (.../CanvasArea.mxml) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml (.../CanvasArea.mxml) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,137 +1,134 @@
-
-
-
-
- ";
- }
- }
-
- // The dragEnter event handler for the Canvas container
- // enables dropping.
- private function dragEnterHandler(event:DragEvent):void {
- if (event.dragSource.hasFormat("img"))
- {
- DragManager.acceptDragDrop(Canvas(event.currentTarget));
- }
- }
-
- // The dragDrop event handler for the Canvas container
- // sets the Image control's position by
- // "dropping" it in its new location.
- private function dragDropHandler(event:DragEvent):void {
-
- var image:Image;
-
- if (event.dragInitiator is ActivityComponent) {
- var activityComponent:ActivityComponent;
- activityComponent = event.dragInitiator as ActivityComponent;
- activityComponent.x = UIComponent(event.currentTarget).mouseX - 10;
- activityComponent.y = UIComponent(event.currentTarget).mouseY - 10;
- } else {
- var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent;
-
- if (learningLibraryComponent.learningLibraryEntry.isCombined) {
- var combinedActivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
- combinedActivityComponent.learningLibraryEntry = learningLibraryComponent.learningLibraryEntry;
- combinedActivityComponent.load()
- combinedActivityComponent.x = UIComponent(event.currentTarget).mouseX;
- combinedActivityComponent.y = UIComponent(event.currentTarget).mouseY;
- canvasBox.addChild(combinedActivityComponent);
- } else {
- var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
- toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0];
- toolActivityComponent.load()
- toolActivityComponent.x = UIComponent(event.currentTarget).mouseX;
- toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
- canvasBox.addChild(toolActivityComponent);
- }
- }
- }
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ ";
+ }
+ }
+
+ // The dragEnter event handler for the Canvas container
+ // enables dropping.
+ private function dragEnterHandler(event:DragEvent):void {
+ if (event.dragSource.hasFormat("img"))
+ {
+ DragManager.acceptDragDrop(Canvas(event.currentTarget));
+ }
+ }
+
+ // The dragDrop event handler for the Canvas container
+ // sets the Image control's position by
+ // "dropping" it in its new location.
+ private function dragDropHandler(event:DragEvent):void {
+
+ var image:Image;
+
+ if (event.dragInitiator is ActivityComponent) {
+ var activityComponent:ActivityComponent;
+ activityComponent = event.dragInitiator as ActivityComponent;
+ activityComponent.x = UIComponent(event.currentTarget).mouseX - 10;
+ activityComponent.y = UIComponent(event.currentTarget).mouseY - 10;
+ } else {
+ var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent;
+
+ if (learningLibraryComponent.learningLibraryEntry.isCombined) {
+ var combinedActivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
+ combinedActivityComponent.learningLibraryEntry = learningLibraryComponent.learningLibraryEntry;
+ combinedActivityComponent.load()
+ combinedActivityComponent.x = UIComponent(event.currentTarget).mouseX;
+ combinedActivityComponent.y = UIComponent(event.currentTarget).mouseY;
+ canvasBox.addChild(combinedActivityComponent);
+ } else {
+ var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
+ toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0];
+ toolActivityComponent.load()
+ toolActivityComponent.x = UIComponent(event.currentTarget).mouseX;
+ toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
+ canvasBox.addChild(toolActivityComponent);
+ }
+ }
+ }
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml (revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml (.../LearningLibrary2.mxml) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml (.../LearningLibrary2.mxml) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,123 +1,129 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.as
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.as (.../ActivityComponent.as) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.as (.../ActivityComponent.as) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,39 +1,187 @@
-package org.lamsfoundation.lams.author.components.activity
-{
- import flash.events.MouseEvent;
-
- import mx.containers.VBox;
- import mx.controls.Label;
- import mx.core.DragSource;
- import mx.managers.DragManager;
-
- public class ActivityComponent extends VBox
- {
- public var xpos:int;
- public var ypos:int;
- public var title:Label;
-
- public function ActivityComponent() {
-
- }
-
- // The mouseMove event handler for the Image control
- // initiates the drag-and-drop operation.
- public function mouseMoveHandler(event:MouseEvent):void
- {
- var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
- var ds:DragSource = new DragSource();
- ds.addData(activityComponent, "img");
-
- DragManager.doDrag(activityComponent, ds, event);
-
- }
-
- public function load():void {
-
- }
-
- }
-
-
+package org.lamsfoundation.lams.author.components.activity
+{
+ import flash.events.Event;
+ import flash.events.MouseEvent;
+ import flash.geom.Point;
+
+ import mx.containers.VBox;
+ import mx.controls.Label;
+ import mx.core.Application;
+ import mx.core.DragSource;
+ import mx.managers.DragManager;
+
+ import org.lamsfoundation.lams.author.components.transition.Transition;
+ import org.lamsfoundation.lams.author.events.TransitionEvent;
+ import org.lamsfoundation.lams.author.util.Constants;
+
+ public class ActivityComponent extends VBox
+ {
+ public var xpos:int;
+ public var ypos:int;
+ public var title:Label;
+
+ public var centerX:int;
+ public var centerY:int;
+
+
+ private var transitionIn:Transition;
+ private var transitionOut:Transition;
+
+ // The mouseMove event handler for the Image control
+ // initiates the drag-and-drop operation.
+ public function mouseMoveHandler(event:MouseEvent):void
+ {
+ switch (Application.application.cursorState) {
+ case Constants.CURSOR_STATE_NORMAL:
+ var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
+ var ds:DragSource = new DragSource();
+ ds.addData(activityComponent, "img");
+ DragManager.doDrag(activityComponent, ds, event);
+ setCenter();
+
+ if (transitionOut != null)
+ {
+ transitionOut.startX = centerX;
+ transitionOut.startY = centerY;
+ transitionOut.invalidateDisplayList();
+ }
+
+
+ if (transitionIn != null) {
+ transitionIn.endX = centerX;
+ transitionIn.endY = centerY;
+ transitionIn.invalidateDisplayList();
+ }
+
+ break;
+ }
+ }
+
+ public function load():void {
+
+ }
+
+
+ public function mouseDown(event:MouseEvent):void {
+
+ switch (Application.application.cursorState) {
+ case Constants.CURSOR_STATE_TRANSITION:
+ var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_EVENT);
+ transitionEvent.sourceAcivityComponent = this;
+ transitionEvent.localX = event.localX;
+ transitionEvent.localY = event.localY;
+ //Application.application.dispatchEvent(transitionEvent);
+ startDragging(transitionEvent)
+ break;
+ }
+
+ }
+
+ public function setCenter():void {
+ centerX = x + height/2;
+ centerY = y + height/2 -10;
+ }
+
+
+
+ private function startDragging(event:TransitionEvent):void {
+
+ if (transitionOut != null) {
+ parent.removeChild(transitionOut);
+ }
+
+ setCenter();
+ transitionOut = new Transition();
+ transitionOut.startX = event.sourceAcivityComponent.centerX;
+ transitionOut.startY = event.sourceAcivityComponent.centerY;
+ transitionOut.endX = event.sourceAcivityComponent.centerX;
+ transitionOut.endY = event.sourceAcivityComponent.centerY;
+ transitionOut.invalidateProperties();
+
+ parent.addChild(transitionOut);
+
+ systemManager.addEventListener(MouseEvent.MOUSE_MOVE, systemManager_mouseMoveHandler, true);
+ systemManager.addEventListener(MouseEvent.MOUSE_UP, systemManager_mouseUpHandler, true);
+ systemManager.stage.addEventListener(Event.MOUSE_LEAVE, stage_mouseLeaveHandler);
+
+ }
+
+ protected function stopDragging():void
+ {
+ systemManager.removeEventListener(MouseEvent.MOUSE_MOVE, systemManager_mouseMoveHandler, true);
+ systemManager.removeEventListener(MouseEvent.MOUSE_UP, systemManager_mouseUpHandler, true);
+ systemManager.stage.removeEventListener(Event.MOUSE_LEAVE, stage_mouseLeaveHandler);
+ }
+
+ private function systemManager_mouseMoveHandler(event:MouseEvent):void
+ {
+ var pt:Point = new Point(event.stageX,event.stageY);
+ pt = parent.globalToLocal(pt);
+
+ transitionOut.endX = pt.x;
+ transitionOut.endY = pt.y;
+
+ transitionOut.invalidateDisplayList();
+ }
+
+ private function systemManager_mouseUpHandler(event:MouseEvent):void
+ {
+ stopDragging();
+
+ var validTransition:Boolean = false;
+ for (var i:int = 0; i < parent.numChildren; i++) {
+
+ if (parent.getChildAt(i) is ActivityComponent) {
+ var activityComponent:ActivityComponent = parent.getChildAt(i) as ActivityComponent;
+
+ var boundPoint:Point = activityComponent.contentToGlobal(new Point(activityComponent.x,activityComponent.y));
+ var eventPoint:Point = contentToGlobal(new Point(event.stageX,event.stageY));
+
+
+ var maxx:int = boundPoint.x + activityComponent.width;
+ var maxy:int = boundPoint.y + activityComponent.height;
+
+ if (eventPoint.x > boundPoint.x &&
+ eventPoint.x < maxx &&
+ eventPoint.y > boundPoint.y &&
+ eventPoint.y < maxy) {
+ // We are within the bounds of an activity
+
+ activityComponent.transitionIn = transitionOut;
+ validTransition = true;
+ }
+ }
+ }
+
+ if (!validTransition) {
+ parent.removeChild(transitionOut);
+ transitionOut = null;
+ }
+
+ }
+
+ private function stage_mouseLeaveHandler(event:MouseEvent):void
+ {
+ stopDragging();
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml (.../CombinedActivityComponent.mxml) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml (.../CombinedActivityComponent.mxml) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,69 +1,69 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml (.../ToolActivityComponent.mxml) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml (.../ToolActivityComponent.mxml) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,66 +1,67 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingTool.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingTool.as (revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingTool.as (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -0,0 +1,13 @@
+package org.lamsfoundation.lams.author.components.transition
+{
+ import mx.core.UIComponent;
+
+ public class DrawingTool extends UIComponent
+ {
+ public var startX:Number;
+ public var startY:Number;
+
+ public var endX:Number;
+ public var endY:Number;
+ }
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingToolManager.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingToolManager.as (revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/DrawingToolManager.as (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -0,0 +1,33 @@
+package org.lamsfoundation.lams.author.components.transition
+{
+ import flash.events.MouseEvent;
+
+ public class DrawingToolManager
+ {
+ public function DrawingToolManager()
+ {
+ }
+
+ public static function createTool(className:Class, event:MouseEvent):DrawingTool{
+
+ /*
+ if( className != DrawingTool ){
+ throw new Error('className must extend the DrawingTool class, please check axel.cfwebtools.com and search for "Drawing"');
+ return;
+ }
+ */
+
+ var newClass:DrawingTool = new className();
+
+ newClass.startX = event.localX;
+ newClass.startY = event.localY;
+ newClass.endX = event.localX;
+ newClass.endY = event.localY;
+
+ newClass.invalidateDisplayList();
+
+ return newClass;
+ }
+
+ }
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/Transition.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/Transition.as (revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/Transition.as (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -0,0 +1,25 @@
+package org.lamsfoundation.lams.author.components.transition
+{
+ public class Transition extends DrawingTool
+ {
+ public function Transition()
+ {
+ }
+
+ override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void {
+
+ graphics.clear();
+ graphics.lineStyle(3, 0x999999, 1);
+ //graphics.beginFill(0x999999);
+ graphics.moveTo(startX,startY);
+ graphics.lineTo(endX,endY);
+ //graphics.lineTo(endX-10, endY+5);
+ //graphics.lineTo(endX+10, endY+5);
+ //graphics.lineTo(endX, endY-20);
+
+ parent.setChildIndex(this, 0);
+
+ }
+
+ }
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as (.../AuthorController.as) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as (.../AuthorController.as) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,37 +1,44 @@
-package org.lamsfoundation.lams.author.controller
-{
- import flash.utils.Dictionary;
- import mx.collections.ArrayCollection;
- import mx.core.Application;
-
- import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
-
- public class AuthorController
- {
-
- public function AuthorController()
- {
- }
-
-
- public function setLearningLibrary(learningLibraryIn:ArrayCollection):void {
-
- var learningLibrary:Dictionary = new Dictionary();
-
- for each(var learningLibraryEntryObj:Object in learningLibraryIn) {
- var learningLibraryEntry:LearningLibraryEntry = new LearningLibraryEntry(learningLibraryEntryObj);
- learningLibrary[learningLibraryEntry.learningLibraryID] = learningLibraryEntry;
-
- }
-
-
- // Set the application learning library
- Application.application.learningLibrary = learningLibrary;
- Application.application.canvasArea.compLearningLibrary.loadLearningLibrary();
- Application.application.canvasArea.compLearningLibrary2.loadLearningLibrary();
-
- }
-
-
- }
+package org.lamsfoundation.lams.author.controller
+{
+ import flash.utils.Dictionary;
+
+ import mx.collections.ArrayCollection;
+ import mx.core.Application;
+
+ import org.lamsfoundation.lams.author.events.TransitionEvent;
+ import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
+
+ public class AuthorController
+ {
+
+ public function AuthorController()
+ {
+ }
+
+
+ public function setLearningLibrary(learningLibraryIn:ArrayCollection):void {
+
+ var learningLibrary:Dictionary = new Dictionary();
+
+ for each(var learningLibraryEntryObj:Object in learningLibraryIn) {
+ var learningLibraryEntry:LearningLibraryEntry = new LearningLibraryEntry(learningLibraryEntryObj);
+ learningLibrary[learningLibraryEntry.learningLibraryID] = learningLibraryEntry;
+
+ }
+
+
+ // Set the application learning library
+ Application.application.learningLibrary = learningLibrary;
+ Application.application.canvasArea.compLearningLibrary.loadLearningLibrary();
+ Application.application.canvasArea.compLearningLibrary2.loadLearningLibrary();
+
+ }
+
+ public function startTransitionDraw(event:TransitionEvent):void {
+ var x:int = 0;
+ var y:int = 1;
+ }
+
+
+ }
}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/AuthorEvent.as
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/AuthorEvent.as (.../AuthorEvent.as) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/AuthorEvent.as (.../AuthorEvent.as) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,15 +1,13 @@
-package org.lamsfoundation.lams.author.events
-{
- import flash.events.Event;
-
- public class AuthorEvent extends Event
- {
- public static const INIT_DATA_EVENT:String = "initDataEvent";
-
- public function AuthorEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false)
- {
- super(type, bubbles, cancelable);
- }
-
- }
+package org.lamsfoundation.lams.author.events
+{
+ import flash.events.Event;
+
+ public class AuthorEvent extends Event
+ {
+ public function AuthorEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+ {
+ super(type, bubbles, cancelable);
+ }
+
+ }
}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as (revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -0,0 +1,12 @@
+package org.lamsfoundation.lams.author.events
+{
+ public class DropEvent extends DragEvent
+ {
+ public static const DROP_EVENT:String = "dropEvent";
+
+ public function DropEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false)
+ {
+ super(type, bubbles, cancelable);
+ }
+ }
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as (revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -0,0 +1,19 @@
+package org.lamsfoundation.lams.author.events
+{
+ import org.lamsfoundation.lams.author.components.activity.ActivityComponent;
+
+
+ public class TransitionEvent extends AuthorEvent
+ {
+ public static const TRANSITION_EVENT:String = "transitionEvent";
+ public var sourceAcivityComponent:ActivityComponent;
+ public var localY:int;
+ public var localX:int;
+
+ public function TransitionEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+ {
+ super(type, bubbles, cancelable);
+ }
+
+ }
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml (.../MainEventMap.mxml) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml (.../MainEventMap.mxml) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -3,7 +3,7 @@
@@ -73,6 +70,11 @@
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as (.../Constants.as) (revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as (.../Constants.as) (revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
@@ -1,17 +1,21 @@
-package org.lamsfoundation.lams.author.util
-{
- public class Constants
- {
-
- public function Constants(){}
-
- public static const TOOL_CATEGORY_SYSTEM:int = 1;
- public static const TOOL_CATEGORY_COLLABORATIVE:int = 2;
- public static const TOOL_CATEGORY_ASSESSMENT:int = 3;
- public static const TOOL_CATEGORY_INFORMATIVE:int = 4;
- public static const TOOL_CATEGORY_SPLIT:int = 5;
- public static const TOOL_CATEGORY_REFLECTIVE:int = 6;
-
-
- }
+package org.lamsfoundation.lams.author.util
+{
+ public class Constants
+ {
+
+ public function Constants(){}
+
+ public static const TOOL_CATEGORY_SYSTEM:int = 1;
+ public static const TOOL_CATEGORY_COLLABORATIVE:int = 2;
+ public static const TOOL_CATEGORY_ASSESSMENT:int = 3;
+ public static const TOOL_CATEGORY_INFORMATIVE:int = 4;
+ public static const TOOL_CATEGORY_SPLIT:int = 5;
+ public static const TOOL_CATEGORY_REFLECTIVE:int = 6;
+
+
+ public static const CURSOR_STATE_NORMAL:int = 1;
+ public static const CURSOR_STATE_TRANSITION:int = 2;
+ public static const CURSOR_STATE_DATAFLOW:int = 3;
+ public static const CURSOR_STATE_HELP:int = 4;
+ }
}
\ No newline at end of file