Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r24a933e2927a758498ae27341b19baeb90ca0db3 -r9cff9ef484b8a878642260d5417f1bb407c7f281 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r24a933e2927a758498ae27341b19baeb90ca0db3 -r9cff9ef484b8a878642260d5417f1bb407c7f281 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -r9cff9ef484b8a878642260d5417f1bb407c7f281 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 9cff9ef484b8a878642260d5417f1bb407c7f281) @@ -76,6 +76,8 @@ private var _defaultSequenceActivity:SequenceActivity; private var _fingerprint:MovieClip; + private var _open:Boolean; + /** * Constructor */ @@ -215,10 +217,12 @@ setStyles(); setSize(_cm); - this._visible = true; + if(_open) { + this._visible = true; - //Dispatch load event - dispatchEvent({type:'load',target:this}); + //Dispatch load event + dispatchEvent({type:'load',target:this}); + } } private function setupConnectorHubs() { @@ -260,13 +264,14 @@ } private function open():Void { + Debugger.log("calling open: " + _open, Debugger.CRITICAL, "open", " CanvasBranchView"); _cm.getCanvas().addBin(this.activityLayer); - + setSize(_cm); - + mx.transitions.TransitionManager.start(this, {type:mx.transitions.Zoom, - direction:0, duration:1, easing:mx.transitions.easing.Bounce.easeOut}); + direction:0, duration:1, easing:mx.transitions.easing.Bounce.easeOut}); getController().activityRelease(this.startHub); } @@ -631,4 +636,8 @@ public function defaultController (model:Observable):Controller { return new CanvasController(model); } + + public function setOpen(a:Boolean):Void { + _open = a; + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rddbaafba98df3c2f503d7f8cdb755d9f5194dfd0 -r9cff9ef484b8a878642260d5417f1bb407c7f281 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision ddbaafba98df3c2f503d7f8cdb755d9f5194dfd0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 9cff9ef484b8a878642260d5417f1bb407c7f281) @@ -108,6 +108,7 @@ private var authorMenu:ContextMenu; private var _branchView:CanvasBranchView; + private var _setupBranchView:Boolean; function CanvasActivity(_connector){ _tm = ThemeManager.getInstance(); @@ -418,6 +419,10 @@ bgNegative = "true" setStyles(); } + + if(setupBranchView) + _canvasModel.openBranchActivityContent(this, false); + } @@ -649,6 +654,12 @@ _branchView = a; } - + public function get setupBranchView():Boolean { + return _setupBranchView; + } + + public function set setupBranchView(a:Boolean):Void { + _setupBranchView = a; + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -r9cff9ef484b8a878642260d5417f1bb407c7f281 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 9cff9ef484b8a878642260d5417f1bb407c7f281) @@ -309,7 +309,7 @@ } else if(ca.activity.isBranchingActivity()) { Debugger.log('activityDoubleClick CanvasBranchActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick','CanvasController'); - _canvasModel.openBranchActivityContent(ca); + _canvasModel.openBranchActivityContent(ca, true); // invalidate design after opening tool content window _canvasModel.getCanvas().ddm.validDesign = false; @@ -597,6 +597,8 @@ var p = new Point(_canvasModel.activeView.content._xmouse-(toolActWidth/2), _canvasModel.activeView.content._ymouse-(toolActHeight/2)); _canvasModel.createNewBranchActivity(Activity.CHOOSEN_BRANCHING_ACTIVITY_TYPE,p,parent); _canvasModel.getCanvas().stopBranchTool(); + _canvasModel.lastBranchActionType = CanvasModel.ADD_FROM_TEMPLATE; + } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as =================================================================== diff -u -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 -r9cff9ef484b8a878642260d5417f1bb407c7f281 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision bd2250d190598e8e706bdd0907bcc5ebdf397c98) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision 9cff9ef484b8a878642260d5417f1bb407c7f281) @@ -147,7 +147,8 @@ checkValidDesign(); checkReadOnlyDesign(); - canvasModel.setDesignTitle(); + canvasModel.setDesignTitle(); + canvasModel.lastBranchActionType = CanvasModel.OPEN_FROM_FILE; canvasModel.setDirty(); LFMenuBar.getInstance().enableExport(!canvasModel.autoSaveWait); @@ -512,12 +513,13 @@ } - public function openBranchView(ba){ + public function openBranchView(ba, visible:Boolean){ var cx:Number = ba._x + ba.getVisibleWidth()/2; var cy:Number = ba._y + ba.getVisibleHeight()/2; + var isVisible:Boolean = (visible == null) ? true : visible; - var _branchView_mc:MovieClip = _canvasView_mc.content.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba}); + var _branchView_mc:MovieClip = _canvasView_mc.content.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible}); var branchView:CanvasBranchView = CanvasBranchView(_branchView_mc); branchView.init(canvasModel,undefined); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -r9cff9ef484b8a878642260d5417f1bb407c7f281 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 9cff9ef484b8a878642260d5417f1bb407c7f281) @@ -72,6 +72,10 @@ private var _currentBranchingActivity:Object; private var _activeView:Object; + + private var _lastBranchActionType:Number; + public static var OPEN_FROM_FILE:Number = 0; + public static var ADD_FROM_TEMPLATE:Number = 1; //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher private var dispatchEvent:Function; @@ -94,6 +98,7 @@ _activeTool = "none"; _activeView = null; _currentBranchingActivity = null; + _lastBranchActionType = null; _autoSaveWait = false; _connectionActivities = new Array(); @@ -1339,13 +1344,19 @@ Debugger.log('ta:'+ta.title+',toolContentID:'+ta.toolContentID+', activityUIID:'+ta.activityUIID,Debugger.GEN,'setDefaultToolContentID','CanvasModel'); } - public function openBranchActivityContent(ba):Void { + public function openBranchActivityContent(ba, visible:Boolean):Void { currentBranchingActivity = ba; + if(visible == null) visible = true; + Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "CanvasModel"); + if(ba.branchView != null) { - activeView = ba.branchView; + activeView = (visible) ? ba.branchView : activeView; + ba.branchView.setOpen(visible); ba.branchView.open(); - } else { _cv.openBranchView(currentBranchingActivity); } + } else { _cv.openBranchView(currentBranchingActivity, visible); } + + _lastBranchActionType = null; } public function get currentBranchingActivity():Object { @@ -1515,4 +1526,11 @@ _autoSaveWait = autoSaveWait; } + public function set lastBranchActionType(a:Number):Void { + _lastBranchActionType = a; + } + + public function get lastBranchActionType():Number { + return _lastBranchActionType; + } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as =================================================================== diff -u -r6f4fd0fe7fee43ab750ec98ea12fb3f1b4cb07b5 -r9cff9ef484b8a878642260d5417f1bb407c7f281 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 6f4fd0fe7fee43ab750ec98ea12fb3f1b4cb07b5) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 9cff9ef484b8a878642260d5417f1bb407c7f281) @@ -270,6 +270,9 @@ var cvv = CanvasView(this); var cvc = getController(); + var setupBranchView:Boolean = (cm.lastBranchActionType == CanvasModel.OPEN_FROM_FILE) ? true : false; + Debugger.log('setupBranchView:' + setupBranchView, Debugger.CRITICAL, 'drawActivity','CanvasView'); + Debugger.log('I am in drawActivity and Activity typeID :'+a.activityTypeID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView'); //take action depending on act type if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity()){ @@ -296,7 +299,7 @@ Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView'); } else if(a.isBranchingActivity()){ - var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cvc,_canvasView:cvv}); + var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cvc,_canvasView:cvv, setupBranchView: setupBranchView}); cm.activitiesDisplayed.put(a.activityUIID, newActivity_mc); Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');