Index: lams_central/src/flash/lams_authoring_main.fla =================================================================== diff -u -rfd9dfc4534dc33a019435e2c05ddd462a722ed2c -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e Binary files differ Index: lams_central/src/flash/lams_monitoring_main.fla =================================================================== diff -u -rfd9dfc4534dc33a019435e2c05ddd462a722ed2c -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e Binary files differ Index: lams_central/src/flash/lams_wizard_main.fla =================================================================== diff -u -rfd9dfc4534dc33a019435e2c05ddd462a722ed2c -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as =================================================================== diff -u -rd423a4b17582eded7b47569aae9db70ed4f5ba8c -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e --- lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision d423a4b17582eded7b47569aae9db70ed4f5ba8c) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision a35cb5d77e69b0c6d98b3af081f9510ca1a2276e) @@ -67,11 +67,12 @@ public static var WORKSPACE_W:Number = 300; public static var WORKSPACE_H:Number = 200; - private static var LOADING_ROOT_DEPTH:Number = 1000; //depth of the loading movie + private static var LOADING_ROOT_DEPTH:Number = 100; //depth of the loading movie private static var APP_ROOT_DEPTH:Number = 10; //depth of the application root private static var DIALOGUE_DEPTH:Number = 20; //depth of the dialogue box private static var TOOLTIP_DEPTH:Number = 60; //depth of the tooltip - private static var CURSOR_DEPTH:Number = 40; //depth of the cursors + private static var CURSOR_DEPTH:Number = 70; //depth of the cursors + private static var CCURSOR_DEPTH:Number = 101; private static var MENU_DEPTH:Number = 25; //depth of the menu private static var PI_DEPTH:Number = 35; //depth of the menu private static var TOOLBAR_DEPTH:Number = 50; //depth of the menu @@ -169,6 +170,8 @@ loader.start(COMPONENT_NO); + _customCursor_mc = _container_mc.createEmptyMovieClip('_customCursor_mc', CCURSOR_DEPTH); + //add the cursors: Cursor.addCursor(C_HOURGLASS); Cursor.addCursor(C_OPTIONAL); @@ -403,9 +406,8 @@ _appRoot_mc = _container_mc.createEmptyMovieClip('appRoot_mc',APP_ROOT_DEPTH); //Create screen elements _dialogueContainer_mc = _container_mc.createEmptyMovieClip('_dialogueContainer_mc',DIALOGUE_DEPTH); - - _cursorContainer_mc = _container_mc.createEmptyMovieClip('_cursorContainer_mc',CURSOR_DEPTH); - _toolbarContainer_mc = _container_mc.createEmptyMovieClip('_toolbarContainer_mc',TOOLBAR_DEPTH); + _cursorContainer_mc = _container_mc.createEmptyMovieClip('_cursorContainer_mc',CURSOR_DEPTH); + _toolbarContainer_mc = _container_mc.createEmptyMovieClip('_toolbarContainer_mc',TOOLBAR_DEPTH); _pi_mc = _container_mc.createEmptyMovieClip('_pi_mc',PI_DEPTH); _tooltipContainer_mc = _container_mc.createEmptyMovieClip('_tooltipContainer_mc',TOOLTIP_DEPTH); Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -rfd41014bc0f705e4ba8432e8c75ac8309ecf96c4 -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision fd41014bc0f705e4ba8432e8c75ac8309ecf96c4) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision a35cb5d77e69b0c6d98b3af081f9510ca1a2276e) @@ -246,11 +246,19 @@ //Debugger.log("currentCursor:"+currentCursor, Debugger.GEN,'activityReleaseOutside','CanvasController'); //strip the last mc off the path as its the click target //_global.breakpoint(); - //Debugger.log("currentCursor._droptarget:"+currentCursor._droptarget, Debugger.GEN,'activityReleaseOutside','CanvasController'); - var dt:String = new String(eval(currentCursor._droptarget)); + Debugger.log("currentCursor._droptarget:"+currentCursor._droptarget, Debugger.GEN,'activityReleaseOutside','CanvasController'); + var _dt:String = currentCursor._droptarget; + var idx:Number = _dt.indexOf("/", 1); + var _dt = _dt.substring(idx, _dt.length); + + var dt:String = new String(eval(_dt)); + + Debugger.log("currentCursor._droptarget eval:"+dt, Debugger.GEN,'activityReleaseOutside','CanvasController'); + var i:Number = dt.lastIndexOf("."); + dt = dt.substring(0,i); - //Debugger.log("Subst:"+dt, Debugger.GEN,'activityReleaseOutside','CanvasController'); + Debugger.log("Subst:"+dt, Debugger.GEN,'activityReleaseOutside','CanvasController'); var transitionTarget_mc:MovieClip = eval(dt); Debugger.log("Transition drop target:"+transitionTarget_mc, Debugger.GEN,'activityReleaseOutside','CanvasController'); Index: lams_central/src/flash/org/lamsfoundation/lams/learner/Application.as =================================================================== diff -u -rb9b3c709cb91a986353699a2b860cc9d84d51025 -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e --- lams_central/src/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision b9b3c709cb91a986353699a2b860cc9d84d51025) +++ lams_central/src/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision a35cb5d77e69b0c6d98b3af081f9510ca1a2276e) @@ -59,7 +59,10 @@ private static var APP_ROOT_DEPTH:Number = 10; //depth of the application root private static var HEADER_DEPTH:Number = 20; - private static var TOOLTIP_DEPTH:Number = 60; //depth of the cursors + private static var TOOLTIP_DEPTH:Number = 60; //depth of the cursors + + private static var CCURSOR_DEPTH:Number = 101; + // UI Elements private static var UI_LOAD_CHECK_INTERVAL:Number = 50; @@ -124,6 +127,8 @@ _container_mc = container_mc; _UILoaded = false; + _customCursor_mc = _container_mc.createEmptyMovieClip('_customCursor_mc', CCURSOR_DEPTH); + //add the cursors: Cursor.addCursor(C_HOURGLASS); Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as =================================================================== diff -u -r84916c60163206d8689768fd4d38b221d5cae161 -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision 84916c60163206d8689768fd4d38b221d5cae161) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision a35cb5d77e69b0c6d98b3af081f9510ca1a2276e) @@ -69,6 +69,7 @@ public static var TOOLTIP_DEPTH:Number = 60; //depth of the cursors public static var CURSOR_DEPTH:Number = 40; //depth of the cursors public static var MENU_DEPTH:Number = 25; //depth of the menu + public static var CCURSOR_DEPTH:Number = 101; public static var UI_LOAD_CHECK_INTERVAL:Number = 50; public static var UI_LOAD_CHECK_TIMEOUT_COUNT:Number = 200; @@ -164,6 +165,8 @@ loader.start(COMPONENT_NO); + _customCursor_mc = _container_mc.createEmptyMovieClip('_customCursor_mc', CCURSOR_DEPTH); + //add the cursors: Cursor.addCursor(C_HOURGLASS); //Cursor.addCursor(C_WHITEARROW); Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/Application.as =================================================================== diff -u -r5d1eb5c58ff341d052783805cf9e097b85041242 -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e --- lams_central/src/flash/org/lamsfoundation/lams/wizard/Application.as (.../Application.as) (revision 5d1eb5c58ff341d052783805cf9e097b85041242) +++ lams_central/src/flash/org/lamsfoundation/lams/wizard/Application.as (.../Application.as) (revision a35cb5d77e69b0c6d98b3af081f9510ca1a2276e) @@ -51,12 +51,13 @@ private static var WIZARD_W:Number = 584; private static var WIZARD_H:Number = 550; - private static var LOADING_ROOT_DEPTH:Number = 1000; //depth of the loading movie + private static var LOADING_ROOT_DEPTH:Number = 100; //depth of the loading movie private static var APP_ROOT_DEPTH:Number = 10; //depth of the application root private static var DIALOGUE_DEPTH:Number = 20; //depth of the cursors private static var TOOLTIP_DEPTH:Number = 30; //depth of the cursors private static var CURSOR_DEPTH:Number = 40; //depth of the cursors - + private static var CCURSOR_DEPTH:Number = 101; + private static var UI_LOAD_CHECK_INTERVAL:Number = 50; private static var UI_LOAD_CHECK_TIMEOUT_COUNT:Number = 200; private static var DATA_LOAD_CHECK_INTERVAL:Number = 50; @@ -137,6 +138,8 @@ loader.start(COMPONENT_NO); + _customCursor_mc = _container_mc.createEmptyMovieClip('_customCursor_mc', CCURSOR_DEPTH); + //add the cursors: Cursor.addCursor(C_HOURGLASS); Index: lams_central/src/flash/preloader.fla =================================================================== diff -u -rfd9dfc4534dc33a019435e2c05ddd462a722ed2c -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r3fbc57b3e49550170696fdbc2af377c6bff7dae1 -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e Binary files differ Index: lams_central/web/lams_preloader.swf =================================================================== diff -u -r957077559d640733a906351004aee79125380465 -ra35cb5d77e69b0c6d98b3af081f9510ca1a2276e Binary files differ