Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as,v
diff -u -r1.11 -r1.12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	16 Jan 2008 06:34:21 -0000	1.11
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	17 Jan 2008 06:30:29 -0000	1.12
@@ -68,8 +68,10 @@
 		else
 			draw();
 		
-		if(branch.direction != DIR_TO_END)
-			createBranchLabel();
+		Debugger.log("is open: " + model.activeView.isOpen, Debugger.CRITICAL, "init", "BranchConnector");
+		if(branch.direction != DIR_TO_END && model.activeView.isOpen)
+			createBranchLabel();
+		
 	}
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as,v
diff -u -r1.57 -r1.58
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	16 Jan 2008 06:34:21 -0000	1.57
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	17 Jan 2008 06:30:29 -0000	1.58
@@ -39,6 +39,7 @@
 import mx.controls.*;
 import mx.containers.*;
 import mx.managers.*;
+import mx.transitions.TransitionManager;
 import mx.utils.*;
 
 /**
@@ -88,6 +89,7 @@
 	private var _labelContainer_mc:MovieClip;
 	
 	private var _open:Boolean;
+	private var _isOpen:Boolean;
 	private var _isBranchChild:Boolean;
 	private var _eventsEnabled:Boolean;
 	
@@ -137,6 +139,7 @@
 		//if(_mm != null) _mm.addEventListener('viewUpdate', Proxy.create(this, viewUpdate));
 		
 		_isBranchChild = (_cm.activeView instanceof CanvasBranchView);
+		_isOpen = false;
 		
 		MovieClipUtils.doLater(Proxy.create(this, draw)); 
     }   
@@ -262,12 +265,12 @@
 		gridLayer = content.createEmptyMovieClip("_gridLayer_mc", content.getNextHighestDepth());
 		transitionLayer = content.createEmptyMovieClip("_transitionLayer_mc", content.getNextHighestDepth());
 		branchLayer = content.createEmptyMovieClip("_branchLayer_mc", content.getNextHighestDepth());
+		_labelContainer_mc = content.createEmptyMovieClip("_labelContainer_mc", content.getNextHighestDepth());
 		
 		activityComplexLayer = content.createEmptyMovieClip("_activityComplexLayer_mc", content.getNextHighestDepth());
 		activityLayer = content.createEmptyMovieClip("_activityLayer_mc", content.getNextHighestDepth());
 		
 		_learnerContainer_mc = content.createEmptyMovieClip("_learnerContainer_mc", content.getNextHighestDepth());
-		_labelContainer_mc = content.createEmptyMovieClip("_labelContainer_mc", content.getNextHighestDepth());
 		
 		transparentCover = content.createClassObject(Panel, "_transparentCover_mc", content.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50});
 		transparentCover.onPress = null;
@@ -367,22 +370,55 @@
 		close();
 	}
 	
-	private function open():Void {
+	public function open():Void {
 		Debugger.log("calling open: " + _open, Debugger.CRITICAL, "open", " CanvasBranchView");
 		if(model instanceof CanvasModel) model.getCanvas().addBin(this.activityLayer);
 			
 		setSize(model);
 		
-		mx.transitions.TransitionManager.start(this,
-					{type:mx.transitions.Zoom, 
+		var tm:TransitionManager = new TransitionManager(this);
+		tm.startTransition({type:mx.transitions.Zoom, 
 						direction:0, duration:1, easing:mx.transitions.easing.Bounce.easeOut});
-						
+		tm.addEventListener("allTransitionsInDone", finishedOpen);
+		
+
 	}
 	
+	public function finishedOpen(evt:Object):Void {
+		Debugger.log("evt target: " + evt.target, Debugger.CRITICAL, "finishedOpen", "CanvasBranchView");
+		Debugger.log("evt content: " + evt.target.content, Debugger.CRITICAL, "finishedOpen", "CanvasBranchView");
+		evt.target.content.isOpen = true;
+		evt.target.content.loadLabels();
+	}
+	
+	public function loadLabels():Void {
+		var bkeys:Array = model.branchesDisplayed.keys();
+		
+		for(var i=0; i<bkeys.length; i++) {
+			var bc = model.branchesDisplayed.get(bkeys[i]);
+			if(bc.branch.sequenceActivity.parentUIID == this.activity.activityUIID) {
+				if(bc.branch.direction != BranchConnector.DIR_TO_END)
+					bc.createBranchLabel();
+			}
+			
+		}
+	}
+	
 	private function close():Void {
 		if(model instanceof CanvasModel) model.getCanvas().hideBin();
 		model.selectedItem = null;
 		
+		var bkeys:Array = model.branchesDisplayed.keys();
+		
+		for(var i=0; i<bkeys.length; i++) {
+			var bc = model.branchesDisplayed.get(bkeys[i]);
+			if(bc.branch.sequenceActivity.parentUIID == this.activity.activityUIID) {
+				if(bc.branchLabel != null)
+					bc.branchLabel.removeMovieClip();
+			}
+			
+		}
+		
 		mx.transitions.TransitionManager.start(this,
 					{type:mx.transitions.Zoom, 
 					 direction:1, duration:0.5, easing:mx.transitions.easing.Strong.easeIn});
@@ -399,7 +435,7 @@
 			else model.getCanvas().addBin(model.activeView);
 		
 		model.broadcastViewUpdate("SIZE");
-
+		_isOpen = false;
 	}
 	
 	public function localOnReleaseOutside():Void{
@@ -895,5 +931,13 @@
 	public function hideToolTip():Void{
 		_tip.CloseToolTip();
 	}
+	
+	public function get isOpen():Boolean {
+		return _isOpen;
+	}
+	
+	public function set isOpen(a:Boolean):Void {
+		_isOpen = a;
+	}
 
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as,v
diff -u -r1.14 -r1.15
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	9 Jan 2008 01:17:08 -0000	1.14
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	17 Jan 2008 06:30:31 -0000	1.15
@@ -542,7 +542,6 @@
 		var _branchView_mc:MovieClip = target.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible});	
 		var branchView:CanvasBranchView = CanvasBranchView(_branchView_mc);
 		
-		//canvasModel.addToBranchingQueue(branchView);
 		branchView.init(canvasModel, undefined);
 		
 		//Add listener to view so that we know when it's loaded