From 452c40c05af9fa48ad7eae39a72637fe5f5b47b4 Mon Sep 17 00:00:00 2001 From: Joas Souza Date: Fri, 30 Oct 2020 14:59:09 -0300 Subject: [PATCH] [feat] Remove text instead of element on selection with triple click Now, instead of keeping the line break selected we change the selection to not include the line break. That means we don't have more than one line selected and because of that, any edition made on it it is allowed. In that specific case only the text is removed. https://trello.com/c/EcJTg02E/2233-p3-selecionar-digitar-n%C3%A3o-substitui-trecho --- .../removeSelectionSceneMarkIntegration.js | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/static/tests/frontend/specs/removeSelectionSceneMarkIntegration.js b/static/tests/frontend/specs/removeSelectionSceneMarkIntegration.js index 9267488..f4c057d 100644 --- a/static/tests/frontend/specs/removeSelectionSceneMarkIntegration.js +++ b/static/tests/frontend/specs/removeSelectionSceneMarkIntegration.js @@ -146,9 +146,29 @@ describe('ep_script_elements - remove selection - ep_script_scene_marks integrat this.timeout(60000); }); - it('removes the scene marks of this heading and removes the rest selected', function(done){ - utils.validateLineTextAndType(9, 'shot', 'shot'); - utils.validateLineTextAndType(10, 'action', 'action'); + // this behaviour has changed because of + // https://trello.com/c/EcJTg02E/2233-p3-selecionar-digitar-n%C3%A3o-substitui-trecho + it('only removes the text of the heading', function(done){ + utils.validateLineTextAndType(0 , 'first scene' , 'act_name'); + utils.validateLineTextAndType(1 , 'first scene' , 'act_summary'); + utils.validateLineTextAndType(2 , 'first scene' , 'act_summary'); + utils.validateLineTextAndType(3 , 'first scene' , 'sequence_name'); + utils.validateLineTextAndType(4 , 'first scene' , 'sequence_summary'); + utils.validateLineTextAndType(5 , '1.1 seq sum' , 'sequence_summary'); + utils.validateLineTextAndType(6 , 'first scene' , 'scene_name'); + utils.validateLineTextAndType(7 , 'first scene' , 'scene_summary'); + utils.validateLineTextAndType(8 , 'first scene' , 'heading'); + utils.validateLineTextAndType(9 , 'shot' , 'shot'); + utils.validateLineTextAndType(10 , 'second scene' , 'act_name'); + utils.validateLineTextAndType(11 , 'second scene' , 'act_summary'); + utils.validateLineTextAndType(12 , 'second scene' , 'act_summary'); + utils.validateLineTextAndType(13 , 'second scene' , 'sequence_name'); + utils.validateLineTextAndType(14 , 'second scene' , 'sequence_summary'); + utils.validateLineTextAndType(15 , '2.1 seq sum' , 'sequence_summary'); + utils.validateLineTextAndType(16 , 'second scene' , 'scene_name'); + utils.validateLineTextAndType(17 , 'second scene' , 'scene_summary'); + utils.validateLineTextAndType(18 , '' , 'heading'); + utils.validateLineTextAndType(19 , 'action' , 'action'); done(); }); @@ -167,12 +187,12 @@ ep_script_elements_test_helper.removeSelectionSceneMarkIntegration = { var secondSceneText = 'second scene'; var firstScene = utils.act(firstSceneText) + utils.actSummary(firstSceneText) + - utils.sequence(firstSceneText) + utils.sequenceSummary('1.1 seq sum') + - utils.synopsis(firstSceneText) + utils.heading(firstSceneText); + utils.sequence(firstSceneText) + utils.sequenceSummary('1.1 seq sum') + + utils.synopsis(firstSceneText) + utils.heading(firstSceneText); var shot = utils.shot('shot'); var secondScene = utils.act(secondSceneText) + utils.actSummary(secondSceneText) + - utils.sequence(secondSceneText) + utils.sequenceSummary('2.1 seq sum') + - utils.synopsis(secondSceneText) + utils.heading(secondSceneText); + utils.sequence(secondSceneText) + utils.sequenceSummary('2.1 seq sum') + + utils.synopsis(secondSceneText) + utils.heading(secondSceneText); var action = utils.action(lastLineOfText); var script = firstScene + shot + secondScene + action; @@ -206,4 +226,4 @@ ep_script_elements_test_helper.removeSelectionSceneMarkIntegration = { utils.validateLineTextAndType(19 , 'action' , 'action'); cb(); } -} \ No newline at end of file +}