Index: lams_central/web/author.jsp =================================================================== diff -u -r31744461528118b794d07ee04cb3fe01cb1075c0 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 --- lams_central/web/author.jsp (.../author.jsp) (revision 31744461528118b794d07ee04cb3fe01cb1075c0) +++ lams_central/web/author.jsp (.../author.jsp) (revision 6e921f0eba97c377550ad11dbe6e86fb825c3067) @@ -250,7 +250,8 @@ -?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=&build=<%=authoringClientVersion%>&version=<%=version%>&lang=&country=&langDate=<%=languageDate%>&theme=&actColour=<%= actColour %>&requestSrc=${requestSrc}&learningDesignID=${learningDesignID}&layout=${layout}&uniqueID= + +?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=&build=<%=authoringClientVersion%>&version=<%=version%>&lang=&country=&direction=&langDate=<%=languageDate%>&theme=&actColour=<%= actColour %>&requestSrc=${requestSrc}&learningDesignID=${learningDesignID}&layout=${layout}&uniqueID= lams_preloader.swf lams_preloader Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -raf37dfbc73134445fa352a539763fc78db5def1d -r6e921f0eba97c377550ad11dbe6e86fb825c3067 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -raf37dfbc73134445fa352a539763fc78db5def1d -r6e921f0eba97c377550ad11dbe6e86fb825c3067 Binary files differ Index: lams_central/web/lams_preloader.swf =================================================================== diff -u -rb5a8e9ab4637d1ea1d21b674079706ab7ceb8388 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 Binary files differ Index: lams_flash/src/central/flash/lams_authoring.fla =================================================================== diff -u -r031d2ed6bc0f7a199fb16d6caeef600f30780549 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 Binary files differ Index: lams_flash/src/central/flash/main.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r6e921f0eba97c377550ad11dbe6e86fb825c3067 --- lams_flash/src/central/flash/main.as (.../main.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/main.as (.../main.as) (revision 6e921f0eba97c377550ad11dbe6e86fb825c3067) @@ -29,9 +29,14 @@ if(StringUtils.isEmpty(layout)){ _root.layout = "normal"; - Debugger.log('Mode is not defined, using defualt:'+_root.mode,Debugger.CRITICAL,'main','ROOT'); + Debugger.log('Mode is not defined, using default:'+_root.mode,Debugger.CRITICAL,'main','ROOT'); } +if(StringUtils.isEmpty(direction)){ + _root.direction = "LTR"; + Debugger.log('Direction is not defined, using default:'+_root.direction,Debugger.CRITICAL,'main','ROOT'); +} + if(StringUtils.isEmpty(learningDesignID)){ _root.learningDesignID = null; Debugger.log('LearningDesignID is not defined, using default:'+_root.learningDesignID,Debugger.CRITICAL,'main','ROOT'); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as =================================================================== diff -u -r65b93154434968657e32949992a29bb8c98e08e1 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as (.../BranchConnector.as) (revision 65b93154434968657e32949992a29bb8c98e08e1) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as (.../BranchConnector.as) (revision 6e921f0eba97c377550ad11dbe6e86fb825c3067) @@ -70,8 +70,7 @@ Debugger.log("is open: " + model.activeView.isOpen, Debugger.CRITICAL, "init", "BranchConnector"); if(branch.direction != DIR_TO_END && model.activeView.isOpen) - createBranchLabel(); - + createBranchLabel(); } /** @@ -125,7 +124,7 @@ var _xpos = (_quadrant == CanvasConnection.Q1 || _quadrant == CanvasConnection.Q4) ? arrow_mc._x + _offset : arrow_mc._x - _offset; var _ypos = (_quadrant == CanvasConnection.Q1 || _quadrant == CanvasConnection.Q2) ? arrow_mc._y + _offset : arrow_mc._y - _offset - 22; - bcLabel_mc = model.activeView.labelContainer.attachMovie("Label", "bcLabel" + _branch.branchUIID, model.activeView.labelContainer.getNextHighestDepth(), {_x: _xpos, _y: _ypos, text:_branch.sequenceName, _width: 40, _height: 22, autoSize: "center", _visible: false}); + bcLabel_mc = this.attachMovie("Label", "bcLabel" + _branch.branchUIID, model.activeView.labelContainer.getNextHighestDepth(), {_x: _xpos, _y: _ypos, text:_branch.sequenceName, _width: 40, _height: 22, autoSize: "center", _visible: false}); bcLabel = Label(bcLabel_mc); bcLabel.setStyle('styleName', _tm.getStyleObject("label")); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r5c5f0b9b919241a47311827fff78276693cb7933 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 5c5f0b9b919241a47311827fff78276693cb7933) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 6e921f0eba97c377550ad11dbe6e86fb825c3067) @@ -319,12 +319,16 @@ var _endx = (_canvasSize.w - 2*CanvasBranchView.hSpace) - CanvasActivity.HUB_CONNECTOR_MARGIN - CanvasActivity.BRANCH_ICON_WIDTH; var _endy = ((_canvasSize.h - 2*CanvasBranchView.vSpace)/2) - CanvasActivity.BRANCH_ICON_HEIGHT; + var hubStartDir_x = (ApplicationParent.isRTL()) ? _endx : _startx; + var hubEndDir_x = (ApplicationParent.isRTL()) ? _startx : _endx; + // start-point connector hub - cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: _startx , _y: _starty, branchConnector:true}) + cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: hubStartDir_x , _y: _starty, branchConnector:true}) : activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _monitorController:getController(), _canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true}); // end-point connector hub - cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: _endx , _y: _endy, branchConnector:true}) + cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: hubEndDir_x , _y: _endy, branchConnector:true}) : activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _monitorController:MonitorController(getController()), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true}); + this.onEnterFrame = hitConnectorHubs; } @@ -790,8 +794,8 @@ if(_isBranchChild) Debugger.log("bc cx: " + cx + " // bc cy: " + cy, Debugger.CRITICAL, "setPosition", "CanvasBranchView"); - canvas_scp._x = (_isBranchChild) ? -cx : -cx+hSpace; - canvas_scp._y = (_isBranchChild) ? -cy : -cy+vSpace; + canvas_scp._x = (_isBranchChild) ? -cx : -cx + hSpace; + canvas_scp._y = (_isBranchChild) ? -cy : -cy + vSpace; //+ getParentScrollVPosition() ; close_mc._x = bkg_pnl._x + bkg_pnl.width - close_mc._width - 10; close_mc._y = bkg_pnl._y + 10; @@ -939,5 +943,12 @@ public function set isOpen(a:Boolean):Void { _isOpen = a; } - + + public function getParentScrollVPosition():Number { + return (_parent instanceof CanvasBranchView) ? CanvasBranchView(_parent).getScrollVPosition() : CanvasView(_parent).getScrollVPosition(); + } + + public function getScrollVPosition():Number { + return canvas_scp.vPosition; + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as =================================================================== diff -u -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as (.../CanvasBranchingConnector.as) (revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as (.../CanvasBranchingConnector.as) (revision 6e921f0eba97c377550ad11dbe6e86fb825c3067) @@ -56,6 +56,5 @@ _canvasController.activityClick(this); } } - } \ No newline at end of file Index: lams_flash/src/central/flash/preloader.fla =================================================================== diff -u -rb5a8e9ab4637d1ea1d21b674079706ab7ceb8388 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 Binary files differ Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as =================================================================== diff -u -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 -r6e921f0eba97c377550ad11dbe6e86fb825c3067 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision 6e921f0eba97c377550ad11dbe6e86fb825c3067) @@ -44,6 +44,8 @@ public static var C_DEFAULT:String = "default"; public static var C_LICON:String = "c_licon"; + public static var RTL:String = "RTL"; + public static var TRANSITION:String = "transition"; public static var SERIAL_NO = "0000-0000-0000-0001-AAAA"; @@ -307,6 +309,11 @@ public function set controlKeyPressed(key:String){ _controlKeyPressed = key; - } + } + public static function isRTL():Boolean { + Debugger.log("root direction: " + _root.direction, Debugger.CRITICAL, "isRTL", "ApplicationParent"); + return (_root.direction == ApplicationParent.RTL); + } + } \ No newline at end of file