From b8fd04203458b16750c8494f5a00851421d251ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 1 Apr 2014 23:19:23 +0200 Subject: [PATCH 1/1] editor: removing lists via lists buttons --- src/editor/modules/documentCanvas/commands.js | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js index 8a26ecc..076478b 100644 --- a/src/editor/modules/documentCanvas/commands.js +++ b/src/editor/modules/documentCanvas/commands.js @@ -94,13 +94,25 @@ commands.register('list', function(canvas, params) { node2 = parent2.wlxmlNode, doc = node1.document; - doc.transaction(function() { - doc.createList({node1: node1, node2: node2, klass: params.meta === 'num' ? 'list.enum' : 'list'}); - }, { - success: function() { - canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset}); + if(cursor.isSelecting()) { + doc.transaction(function() { + doc.createList({node1: node1, node2: node2, klass: params.meta === 'num' ? 'list.enum' : 'list'}); + }, { + success: function() { + canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset}); + } + }); + } else { + var list; + if(node1.isInside('list')) { + list = node1.getParent('list'); + if((params.meta === 'num' && list.getClass() === 'list.enum') || params.meta !== 'num' && list.getClass() === 'list') { + list.object.extractAllItems(); + } else { + list.setClass(params.meta === 'num' ? 'list.enum' : 'list'); + } } - }); + } }); commands.register('toggle-grid', function(canvas, params) { -- 2.20.1