Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4f4793f8696a7f713d42aef785f3777862394359 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 4f4793f8696a7f713d42aef785f3777862394359) @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * * http://www.gnu.org/licenses/gpl.txt @@ -964,25 +964,7 @@ var learningDesignID = _ddm.learningDesignID; JsPopup.getInstance().launchPopupWindow(serverUrl+'authoring/exportToolContent.do?learningDesignID=' + learningDesignID, 'Export', 298, 712, true, true, false, false, false); } - /* - public function cut():Void{ - Debugger.log('Cut',Debugger.GEN,'cut','Canvas'); - - } - - public function copy():Void{ - Debugger.log('Copy',Debugger.GEN,'copy','Canvas'); - - } - - public function paste():Void{ - Debugger.log('Paste',Debugger.GEN,'paster','Canvas'); - - } - - */ - /** * Used by application to set the size * @param width The desired width @@ -993,21 +975,6 @@ } /** - * Initialises the property inspector - * @usage - - public function initPropertyInspector():Void{ - //note the init obnject parameters are passed into the _container object in the embeded class (*in this case PropertyInspector) - //we are setting up a vew so we need to pass the model and controller to it - var cc:CanvasController = canvasView.getController(); - _pi = PopUpManager.createPopUp(Application.root, LFWindow, false,{title:Dictionary.getValue('property_inspector_title'),closeButton:true,scrollContentPath:"PropertyInspector",_canvasModel:canvasModel,_canvasController:cc}); - //Assign dialog load handler - _pi.addEventListener('contentLoaded',Delegate.create(this,piLoaded)); - //okClickedCallback = callBack; - } - */ - - /** * Sts up the bin * @usage * @return @@ -1021,34 +988,13 @@ } /** - * Fired whern property inspector's contentLoaded is fired - * Positions the PI - * @usage - * @param evt - * @return - - public function piLoaded(evt:Object) { - if(evt.type == 'contentLoaded'){ - //call a resize to line up the PI - Application.getInstance().onResize(); - - - }else { - //TODO raise wrong event type error - } - - } - */ - - /** * recieves event fired after update to the DDM * @usage * @param evt * @return */ public function onDDMUpdated(evt:Object):Void{ - //_global.breakpoint(); - //var _ddm:DesignDataModel = evt.target; + Debugger.log('DDM has been updated, _ddm.validDesign:'+_ddm.validDesign,Debugger.GEN,'onDDMUpdated','Canvas'); //if its valid, its not anymore! if(_ddm.validDesign){ @@ -1067,8 +1013,7 @@ * @return */ public function onDDMBeforeUpdate(evt:Object):Void{ - //_global.breakpoint(); - //var _ddm:DesignDataModel = evt.target; + Debugger.log('DDM about to be updated',Debugger.GEN,'onDDMBeforeUpdate','Canvas'); //take a snapshot of the design and save it in the undoStack var snapshot:Object = _ddm.toData(); @@ -1089,11 +1034,6 @@ */ public function undo():Void{ - - //_global.breakpoint(); - //Debugger.log('Before executing _undoStack.length:'+_undoStack.length,Debugger.GEN,'undo','Canvas'); - //Debugger.log('Before executing _redoStack.length:'+_redoStack.length,Debugger.GEN,'undo','Canvas'); - if(_undoStack.length>0){ //get the last state off the stack var snapshot = _undoStack.pop(); @@ -1106,9 +1046,6 @@ _ddm.setDesign(snapshot,true); canvasModel.setDirty(); - //Debugger.log('After executing _undoStack.length:'+_undoStack.length,Debugger.GEN,'undo','Canvas'); - //Debugger.log('After executing _redoStack.length:'+_redoStack.length,Debugger.GEN,'undo','Canvas'); - }else{ Debugger.log("Cannot Undo! no data on stack!",Debugger.GEN,'redo','Canvas'); } @@ -1122,10 +1059,6 @@ */ public function redo():Void{ - //Debugger.log('Before executing _undoStack.length:'+_undoStack.length,Debugger.GEN,'redo','Canvas'); - //Debugger.log('Before executing _redoStack.length:'+_redoStack.length,Debugger.GEN,'redo','Canvas'); - //_global.breakpoint(); - if(_redoStack.length > 0){ //get the last state off the stack var snapshot = _redoStack.pop(); @@ -1137,9 +1070,6 @@ _ddm.setDesign(snapshot,true); canvasModel.setDirty(); - //Debugger.log('After executing _undoStack.length:'+_undoStack.length,Debugger.GEN,'undo','Canvas'); - //Debugger.log('After executing _redoStack.length:'+_redoStack.length,Debugger.GEN,'undo','Canvas'); - }else{ Debugger.log("Cannot Redo! no data on stack!",Debugger.GEN,'redo','Canvas'); } @@ -1175,6 +1105,7 @@ public function getCanvasModel():CanvasModel{ return canvasModel; } + public function get view():MovieClip{ return getCanvasView(); } Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4f4793f8696a7f713d42aef785f3777862394359 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 4f4793f8696a7f713d42aef785f3777862394359) @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * * http://www.gnu.org/licenses/gpl.txt @@ -433,45 +433,6 @@ targetCA = CanvasOptionalActivity(transitionTargetObj); return targetCA; } - //else{ - //var e = new LFError(Dictionary.getValue('cv_invalid_trans_target'),"createValidTransitionTarget",this,String(transitionTargetObj)); - //bail - //return e; - //} - - /* - //if(ca instanceof CanvasActivity){ - if(ICanvasActivity(ca) != null){ - Debugger.log("Target implements ICanvasActivity", Debugger.GEN,'activityReleaseOutside','CanvasController'); - var r:Object = _canvasModel.addActivityToTransition(targetCA); - if(r instanceof LFError){ - //Debugger.error(r); - r.showErrorAlert(null); - } - //TODO: Check on status of try catch bug - *//* - try{ - _canvasModel.addActivityToTransition(ca); - //}catch(e:org.lamsfoundation.lams.common.util.LFError){ - }catch(e:LFError){ - trace('in catch'); - Debugger.error(e); - } - */ - - - - /* - }else{ - Debugger.log("Target does NOT implement ICanvasActivity", Debugger.CRITICAL,'activityReleaseOutside','CanvasController'); - //released over something other than a CanvasActivity so reset the t tool - - } - */ } - - - - - + } Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4f4793f8696a7f713d42aef785f3777862394359 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 4f4793f8696a7f713d42aef785f3777862394359) @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * * http://www.gnu.org/licenses/gpl.txt Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4f4793f8696a7f713d42aef785f3777862394359 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 4f4793f8696a7f713d42aef785f3777862394359) @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * * http://www.gnu.org/licenses/gpl.txt @@ -71,7 +71,7 @@ private var dispatchEvent:Function; public var addEventListener:Function; public var removeEventListener:Function; - //public var menu:ContextMenu; + /** @@ -97,50 +97,13 @@ H_GAP = 10; V_GAP = 10; _cm = CanvasModel(m) - setupCM(); + //register to recive updates form the model _cm.addEventListener('viewUpdate',this); MovieClipUtils.doLater(Proxy.create(this,draw)); } - public function setupCM():Void{ - trace("Value for this: "+this) - var myCopy:Array = new Array(); - var menuArr:Array = new Array(); - menuArr[0] = ["Open/Edit Activity Content", getOpenEditActivtiyContent]; - menuArr[1] =["Copy Activity", getCopy]; - menuArr[2] = ["Paste Activity",getPaste]; - - for (var i=0; i