Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r8e4fc8d67f4733b5b989e9baf079daa75832193d -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r8e4fc8d67f4733b5b989e9baf079daa75832193d -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r0267a9238f122504943b400c11ca0fa751698aba -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 0267a9238f122504943b400c11ca0fa751698aba) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision bd2250d190598e8e706bdd0907bcc5ebdf397c98) @@ -85,8 +85,8 @@ if(ca.activity.parentUIID != null && parentAct.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){ _canvasModel.isDragging = false; } else { - _canvasModel.isDragging = true; ca.startDrag(false); + _canvasModel.isDragging = true; } } @@ -125,6 +125,7 @@ if(_canvasModel.isDragging){ ca.stopDrag(); _canvasModel.isDragging = false; + if (ca.activity.parentUIID != null && _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID).activityTypeID != Activity.SEQUENCE_ACTIVITY_TYPE){ for (var i=0; i _canvasView.gridLayer._width - ca.getVisibleWidth()) ca._x = _canvasView.gridLayer._width - ca.getVisibleWidth(); + if(ca._y > _canvasView.gridLayer._height - ca.getVisibleHeight()) ca._y = _canvasView.gridLayer._height - ca.getVisibleHeight(); + //give it the new co-ords and 'drop' it if(!ca.branchConnector) { ca.activity.xCoord = ca._x; @@ -240,6 +249,7 @@ _canvasModel.activeView.removeTempTrans(); new LFError("You cannot create a Transition between the same Activities","addActivityToTransition",this); } + clearAllSelections(optionalOnCanvas, parallelOnCanvas); _canvasModel.selectedItem = ca; _canvasModel.setDirty(); @@ -372,8 +382,16 @@ //if we are on the bin - trash it isActivityOnBin(ca); + + if(ca._x < 0) ca._x = 0; + if(ca._y < 0) ca._y = 0; + if(ca._x > _canvasView.gridLayer._width - ca.getVisibleWidth()) ca._x = _canvasView.gridLayer._width - ca.getVisibleWidth(); + if(ca._y > _canvasView.gridLayer._height - ca.getVisibleHeight()) ca._y = _canvasView.gridLayer._height - ca.getVisibleHeight(); + + // give it the new co-ords and 'drop' it + ca.activity.xCoord = ca._x; + ca.activity.yCoord = ca._y; } - } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as =================================================================== diff -u -r77deb8f0850b92b8de8bbecd08f011b6450c00ea -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision 77deb8f0850b92b8de8bbecd08f011b6450c00ea) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision bd2250d190598e8e706bdd0907bcc5ebdf397c98) @@ -101,7 +101,7 @@ evt.target.open(); canvasModel.setDirty(); } else { - canvasModel.getCanvas().addBin(evt.target.activityLayer); + canvasModel.getCanvas().addBin(evt.target); var autosave_config_interval = Config.getInstance().getItem(AUTOSAVE_CONFIG); if(autosave_config_interval > 0) { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as =================================================================== diff -u -r79ecb1908592f3debc72d036a491420ef5a853b3 -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 79ecb1908592f3debc72d036a491420ef5a853b3) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision bd2250d190598e8e706bdd0907bcc5ebdf397c98) @@ -167,7 +167,6 @@ read_only = _canvasView.attachMovie('Label', 'read_only', _canvasView.getNextHighestDepth(), {_x:5, _y:titleBar._y, _visible:true, autoSize:"left", html:true, styleName:styleObj}); bkg_pnl.onRelease = function(){ - trace('content.onRelease'); Application.getInstance().getCanvas().getCanvasView().getController().canvasRelease(this); } @@ -404,6 +403,7 @@ var r = cm.transitionsDisplayed.remove(t.transitionUIID); r.removeMovieClip(); var s:Boolean = (r==null) ? false : true; + return s; } @@ -412,6 +412,7 @@ */ private function setSize(cm:CanvasModel):Void{ var s:Object = cm.getSize(); + var newWidth:Number = Math.max(s.w, lastScreenWidth); var newHeight:Number = Math.max(s.h, lastScreenHeight); @@ -420,7 +421,7 @@ transparentCover.setSize(newWidth, newHeight); //Create the grid. The gris is re-drawn each time the canvas is resized. - var grid_mc = Grid.drawGrid(gridLayer,Math.round(newWidth),Math.round(newHeight),V_GAP,H_GAP); + var grid_mc = Grid.drawGrid(gridLayer, Math.round(newWidth), Math.round(newHeight), V_GAP, H_GAP); //position bin in canvas. if(cm.activeView == this) { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r8e4fc8d67f4733b5b989e9baf079daa75832193d -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 8e4fc8d67f4733b5b989e9baf079daa75832193d) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision bd2250d190598e8e706bdd0907bcc5ebdf397c98) @@ -541,19 +541,16 @@ numRandomGroups_stp.value = 0; g.numberOfGroups = 0; - numRandomGroups_stp.enabled = false; - - numLearners_stp.enabled = (e != null) ? e :true; - + numRandomGroups_stp.enabled = false; + numLearners_stp.enabled = e&&true; _group_naming_btn.enabled = false; }else{ - numRandomGroups_stp.enabled = (e != null) ? e : true; + numRandomGroups_stp.enabled = e&&true; numLearners_stp.value = 0; g.learnersPerGroups = 0; numLearners_stp.enabled = false; - - _group_naming_btn.enabled = (e != null) ? e : true; + _group_naming_btn.enabled = (e != null && numRandomGroups_stp.value > 0) ? e&&true : false; } //this is a crazy hack to stop the steppter dissapearing after its .enabled property is set. @@ -625,6 +622,9 @@ numGroups_stp.value = 0; g.maxNumberOfGroups = 0; + + _group_naming_btn.enabled = (numRandomGroups_stp.value > 0) ? true : false; + }else{ g.maxNumberOfGroups = numGroups_stp.value; @@ -633,7 +633,7 @@ g.learnersPerGroups = 0; g.numberOfGroups = 0; - _group_naming_btn.enabled = true; + _group_naming_btn.enabled = (numGroups_stp.value > 0) ? true : false; } setModified();