Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -rcb63a28069a1267691684394eb67c7eee0f77fde -r9aa697756d53159eb517ae2477c5b055a61a83c3 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision cb63a28069a1267691684394eb67c7eee0f77fde) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 9aa697756d53159eb517ae2477c5b055a61a83c3) @@ -47,6 +47,8 @@ 'liveEdit' : false, // should the sequence be saved before exiting? 'modified' : false, + // was start point of a new branching placed? + 'addBranchingStart' : null, // list of all dialogs, so they can be easily closed all at once 'dialogs' : [], // icons for special activities Index: lams_central/web/includes/javascript/authoring/authoringHandler.js =================================================================== diff -u -r07865c855b32c77613ed72dd81cd499033dca4dd -r9aa697756d53159eb517ae2477c5b055a61a83c3 --- lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision 07865c855b32c77613ed72dd81cd499033dca4dd) +++ lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision 9aa697756d53159eb517ae2477c5b055a61a83c3) @@ -221,6 +221,17 @@ .off('mousedown') .off('mouseup') .off('mousemove'); + + // if the user started adding a branching and did not finish it + if (layout.addBranchingStart){ + layout.infoDialog.text('').dialog('close'); + + if (layout.addBranchingStart instanceof ActivityDefs.BranchingEdgeActivity) { + layout.activities.splice(layout.activities.indexOf(layout.addBranchingStart), 1); + layout.addBranchingStart.items.remove(); + } + layout.addBranchingStart = null; + } if (init) { // if clicked anywhere, activity selection is gone Index: lams_central/web/includes/javascript/authoring/authoringMenu.js =================================================================== diff -u -recd8e0c2bae067dc95d7bdd782396b59c5d6ad0c -r9aa697756d53159eb517ae2477c5b055a61a83c3 --- lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision ecd8e0c2bae067dc95d7bdd782396b59c5d6ad0c) +++ lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 9aa697756d53159eb517ae2477c5b055a61a83c3) @@ -157,6 +157,8 @@ var dialog = layout.infoDialog.text(LABELS.BRANCHING_START_PLACE_PROMPT); dialog.dialog('open'); + layout.addBranchingStart = true; + var branchingActivity = null; canvas.css('cursor', 'pointer').click(function(event){ // pageX and pageY tell event coordinates relative to the whole page @@ -179,6 +181,7 @@ } else { // extract main branchingActivity structure from created start point branchingActivity = branchingEdge.branchingActivity; + layout.addBranchingStart = branchingEdge; dialog.text(LABELS.BRANCHING_END_PLACE_PROMPT); } });