editor: Better invalid cursor handling

[fnpeditor.git] / src / editor / modules / documentCanvas / commands.js

diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
index df21cff..85831d8 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -1,9 +1,11 @@
 define([
 define([

-'modules/documentCanvas/canvas/documentElement',
-'./canvas/utils'
-], function(documentElement, utils) {
+'./canvas/utils',
+'views/dialog/dialog',
+'fnpjs/datetime'
+], function(utils, Dialog, datetime) {

     
 'use strict';
     
 'use strict';

+/* globals gettext */

 
 
 var gridToggled = false;
 
 
 var gridToggled = false;


@@ -14,8 +16,8 @@ var commands = {
         this._cmds[name] = command;
     },
 
         this._cmds[name] = command;
     },
 

-    run: function(name, params, canvas) {
-        return this._cmds[name](canvas, params);
+    run: function(name, params, canvas, user) {
+        return this._cmds[name](canvas, params, user);

     }
 };
 
     }
 };
 


@@ -32,15 +34,7 @@ commands.register('redo', function(canvas) {
 });
 
 commands.register('remove-node', function(canvas) {
 });
 
 commands.register('remove-node', function(canvas) {

-    var cursor = canvas.getCursor(),
-        selectionStart = cursor.getSelectionStart(),
-        selectionEnd = cursor.getSelectionEnd(),
-        parent1 = selectionStart.element.parent() || undefined,
-        parent2 = selectionEnd.element.parent() || undefined;
-
-//    canvas.wlxmlDocument.transform('detach2', {node:canvas.getCurrentNodeElement().data('wlxmlNode')});
-    canvas.getCurrentNodeElement().data('wlxmlNode').transform('smartxml.detach');
-
+    canvas.getCurrentNodeElement().wlxmlNode.detach();

 });
 
 commands.register('unwrap-node', function(canvas) {
 });
 
 commands.register('unwrap-node', function(canvas) {


@@ -51,18 +45,14 @@ commands.register('unwrap-node', function(canvas) {
         parent2 = selectionEnd.element.parent() || undefined;
 
     var selectionAnchor = cursor.getSelectionAnchor(),
         parent2 = selectionEnd.element.parent() || undefined;
 
     var selectionAnchor = cursor.getSelectionAnchor(),

-        node1 = parent1.data('wlxmlNode'),
-        node2 = parent2.data('wlxmlNode'),
+        node1 = parent1.wlxmlNode,
+        node2 = parent2.wlxmlNode,

         doc = node1.document;
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
         doc = node1.document;
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {

-
-
-        doc.transform('extractItems', {item1: node1, item2: node2});
-
-        //canvas.list.extractItems({element1: parent1, element2: parent2});
+        doc.extractItems({item1: node1, item2: node2});

         canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
     } else if(!cursor.isSelecting()) {
         canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
     } else if(!cursor.isSelecting()) {

-        var nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'),
+        var nodeToUnwrap = cursor.getPosition().element.wlxmlNode,

             parentNode = nodeToUnwrap.unwrap();
         if(parentNode) {
             canvas.setCurrentElement(utils.findCanvasElement(parentNode));
             parentNode = nodeToUnwrap.unwrap();
         if(parentNode) {
             canvas.setCurrentElement(utils.findCanvasElement(parentNode));


@@ -77,119 +67,235 @@ commands.register('wrap-node', function(canvas) {
         parent1 = selectionStart.element.parent() || undefined,
         parent2 = selectionEnd.element.parent() || undefined;
 
         parent1 = selectionStart.element.parent() || undefined,
         parent2 = selectionEnd.element.parent() || undefined;
 

-    var node1 = parent1.data('wlxmlNode'),
-        node2 = parent2.data('wlxmlNode'),
+    var node1 = parent1.wlxmlNode,
+        node2 = parent2.wlxmlNode,

         doc = node1.document;
 
         doc = node1.document;
 

-    if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
-        //canvas.list.create({element1: parent1, element2: parent2});
-        doc.transform('createList', {node1: node1, node2: node2});
+    if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
+        doc.createList({node1: node1, node2: node2});

     }
 });
 
 commands.register('list', function(canvas, params) {
     }
 });
 
 commands.register('list', function(canvas, params) {

+    void(params);

     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),
         selectionEnd = cursor.getSelectionEnd(),
         parent1 = selectionStart.element.parent() || undefined,
     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),
         selectionEnd = cursor.getSelectionEnd(),
         parent1 = selectionStart.element.parent() || undefined,

-        parent2 = selectionEnd.element.parent() || undefined;
-
-    var selectionFocus = cursor.getSelectionFocus();
-
-    if(selectionStart.element.isInsideList() || selectionEnd.element.isInsideList()) {
-        return;
-    }
-
-    var node1 = parent1.data('wlxmlNode'),
-        node2 = parent2.data('wlxmlNode'),
+        parent2 = selectionEnd.element.parent() || undefined,
+        selectionFocus = cursor.getSelectionFocus(),
+        node1 = parent1.wlxmlNode,
+        node2 = parent2.wlxmlNode,

         doc = node1.document;
     
         doc = node1.document;
     

-    doc.transform('createList', {node1: node1, node2: node2});
-
-    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) {
 });
 
 commands.register('toggle-grid', function(canvas, params) {

-    canvas.doc().dom().find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', params.toggle);
+    canvas.doc().dom().parent().toggleClass('grid-on', params.toggle);

     gridToggled = params.toggle;
 });
 
     gridToggled = params.toggle;
 });
 

-commands.register('newNodeRequested', function(canvas, params) {
+commands.register('newNodeRequested', function(canvas, params, user) {

     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),
     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),

-        selectionEnd = cursor.getSelectionEnd();
+        selectionEnd = cursor.getSelectionEnd(),
+        wlxmlNode, caretTo, wrapperCanvasElement;
+
+    var insertNode = function(insertion, callback) {
+        var doc = canvas.wlxmlDocument,
+            metadata, creator, dialog;
+
+        var execCallback = function(node) {
+            if(callback) {
+                callback(node);
+            }
+        };
+
+        if(params.wlxmlTag === 'aside' && params.wlxmlClass === 'comment') {
+            doc.transaction(function() {
+                var node = insertion();
+                if(user) {
+                    creator = user.name;
+                    if(user.email) {
+                        creator += ' (' + user.email + ')';
+                    }
+                } else {
+                    creator = 'anonymous';
+                }
+
+                metadata = node.getMetadata();
+                metadata.add({key: 'creator', value: creator});
+                metadata.add({key: 'date', value: datetime.currentStrfmt()});
+                return node;
+            }, {
+                success: execCallback
+            });
+        } else if(params.wlxmlClass === 'link') {
+            dialog = Dialog.create({
+                title: gettext('Create link'),
+                executeButtonText: gettext('Apply'),
+                cancelButtonText: gettext('Cancel'),
+                fields: [
+                    {label: gettext('Link'), name: 'href', type: 'input'}
+                ]
+            });
+            dialog.on('execute', function(event) {
+                doc.transaction(function() {
+                    var node = insertion();
+                    node.setAttr('href', event.formData.href);
+                    event.success();
+                    return node;
+                }, {
+                    success: execCallback
+                });
+            });
+            dialog.show();
+        } else {
+            doc.transaction(function() {
+                return insertion();
+            }, {success: execCallback});
+        }
+    };

 
     if(cursor.isSelecting()) {
         if(cursor.isSelectingSiblings()) {
             if(cursor.isSelectingWithinElement()) {
 
     if(cursor.isSelecting()) {
         if(cursor.isSelectingSiblings()) {
             if(cursor.isSelectingWithinElement()) {

-                var wlxmlNode = selectionStart.element.data('wlxmlNode'),
-                    caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end',
-                    //wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset}),
-                    wrapper = wlxmlNode.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset})
-                    ;
-                var wrapperCanvasElement = utils.findCanvasElement(wrapper);
-                canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});
+                wlxmlNode = selectionStart.element.wlxmlNode;
+                caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end';
+
+                insertNode(
+                    function() {
+                        return wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset});
+                    },
+                    function(wrapper) {
+                        wrapperCanvasElement = utils.findCanvasElement(wrapper);
+                        canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});
+                    }
+                );

             }
             else {
             }
             else {

-                var wlxmlNode = selectionStart.element.data('wlxmlNode').parent(),
-                    caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
-
-                // var wrapper = wlxmlNode.wrapText({
-                //     _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
-                //     offsetStart: selectionStart.offset,
-                //     offsetEnd: selectionEnd.offset,
-                //     textNodeIdx: [wlxmlNode.indexOf(selectionStart.element.data('wlxmlNode')), wlxmlNode.indexOf(selectionEnd.element.data('wlxmlNode'))] //parent.childIndex(selectionEnd.element)]
-                // }),
-                var wrapper = wlxmlNode.transform('smartxml.wrapText', {
-                    _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
-                    offsetStart: selectionStart.offset,
-                    offsetEnd: selectionEnd.offset,
-                    textNodeIdx: [wlxmlNode.indexOf(selectionStart.element.data('wlxmlNode')), wlxmlNode.indexOf(selectionEnd.element.data('wlxmlNode'))] //parent.childIndex(selectionEnd.element)]
-                }),
-                wrapperCanvasElement = utils.findCanvasElement(wrapper);
-                canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo});
+                wlxmlNode = selectionStart.element.wlxmlNode.parent();
+                caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
+
+                insertNode(
+                    function() {
+                        return wlxmlNode.wrapText({
+                            _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
+                            offsetStart: selectionStart.offset,
+                            offsetEnd: selectionEnd.offset,
+                            textNodeIdx: [wlxmlNode.indexOf(selectionStart.element.wlxmlNode), wlxmlNode.indexOf(selectionEnd.element.wlxmlNode)] //parent.childIndex(selectionEnd.element)]
+                        });
+                    },
+                    function(wrapper) {
+                        wrapperCanvasElement = utils.findCanvasElement(wrapper);
+                        canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo});
+                    }
+                );

             }
         } else {
             }
         } else {

-            var node1 = selectionStart.element.data('wlxmlNode'),
-                node2 = selectionEnd.element.data('wlxmlNode'),
+            var node1 = selectionStart.element.wlxmlNode,
+                node2 = selectionEnd.element.wlxmlNode,

                 siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2});
 
             if(siblingParents) {
                 siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2});
 
             if(siblingParents) {

-                // canvas.wlxmlDocument.wrapNodes({
-                //     element1: siblingParents.node1,
-                //     element2: siblingParents.node2,
-                //     _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
-                // });
-                canvas.wlxmlDocument.transform('smartxml.wrapNodes', {
-                    node1: siblingParents.node1,
-                    node2: siblingParents.node2,
-                    _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
-                });
+                insertNode(
+                    function() {
+                        return canvas.wlxmlDocument.wrapNodes({
+                            node1: siblingParents.node1,
+                            node2: siblingParents.node2,
+                            _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}
+                        });
+                    }
+                );

             }
         }
     } else if(canvas.getCurrentNodeElement()) {
             }
         }
     } else if(canvas.getCurrentNodeElement()) {

-        var node = canvas.getCurrentNodeElement().data('wlxmlNode'),
-            // wrapper = node.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
-            wrapper = node.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
-        canvas.setCurrentElement(utils.findCanvasElement(wrapper));
-    }
-
+        wlxmlNode = canvas.getCurrentNodeElement().wlxmlNode;
+
+        var linkFound = [wlxmlNode].concat(wlxmlNode.parents()).some(function(node) {
+            if(node.getClass() === 'link') {
+                var dialog = Dialog.create({
+                    title: gettext('Edit link'),
+                    executeButtonText: gettext('Apply'),
+                    cancelButtonText: gettext('Cancel'),
+                    fields: [
+                        {label: gettext('Link'), name: 'href', type: 'input', initialValue: node.getAttr('href')},
+                    ]
+                });
+                dialog.on('execute', function(event) {
+                    canvas.wlxmlDocument.transaction(function() {
+                        node.setAttr('href', event.formData.href);
+                        event.success();
+                    });
+                });
+                dialog.show();
+                return true;
+            }
+        });
+        if(linkFound) {
+            return;
+        }

 
 

+        if(params.ctrlKey) {
+            insertNode(
+                function() {
+                    return wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});
+                },
+                function(wrapper) {
+                    canvas.setCurrentElement(utils.findCanvasElement(wrapper));
+                }
+            );
+        } else {
+            insertNode(
+                function() {
+                    var node = wlxmlNode.after({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});
+                    node.append({text:''});
+                    return node;
+                }, function(wrapper) {
+                    canvas.setCurrentElement(utils.findCanvasElement(wrapper));
+                }
+            );
+        }
+    }

 });
 
 commands.register('footnote', function(canvas, params) {
 });
 
 commands.register('footnote', function(canvas, params) {

+    void(params);

     var cursor = canvas.getCursor(),
         position = cursor.getPosition(),
     var cursor = canvas.getCursor(),
         position = cursor.getPosition(),

-        asideElement;
+        asideNode, asideElement, node;

         
 
     if(cursor.isSelectingWithinElement()) {
         
 
     if(cursor.isSelectingWithinElement()) {

-        asideElement = position.element.wrapWithNodeElement({tag: 'aside', klass: 'footnote', start: cursor.getSelectionStart().offset, end: cursor.getSelectionEnd().offset});
+        asideNode = position.element.wlxmlNode.wrapWith({tagName: 'aside', attrs:{'class': 'footnote'}, start: cursor.getSelectionStart().offset, end: cursor.getSelectionEnd().offset});

     } else {
     } else {

-        asideElement = position.element.divide({tag: 'aside', klass: 'footnote', offset: position.offset});
-        asideElement.append({text: ''});
+        node = position.element.wlxmlNode;
+        node.document.transaction(function() {
+            asideNode = node.divideWithElementNode({tagName: 'aside', attrs:{'class': 'footnote'}}, {offset: position.offset});
+            asideNode.append({text: ''});
+        });

     }
 
     }
 

+    asideElement = utils.findCanvasElement(asideNode);

     asideElement.toggle(true);
     canvas.setCurrentElement(asideElement);
 });
     asideElement.toggle(true);
     canvas.setCurrentElement(asideElement);
 });


@@ -199,11 +305,11 @@ commands.register('take-away-node', function(canvas) {
         element = position.element,
         nodeElement = element ? element.parent() : canvas.getCurrentNodeElement();
 
         element = position.element,
         nodeElement = element ? element.parent() : canvas.getCurrentNodeElement();
 

-    if(!nodeElement || !(nodeElement.parent()))
+    if(!nodeElement || !(nodeElement.parent())) {

         return;
         return;

+    }

 
 

-
-    var range = nodeElement.data('wlxmlNode').unwrapContent();
+    var range = nodeElement.wlxmlNode.unwrapContent();

 
     if(element) {
         var elementIsFirstChild = nodeElement.childIndex(element);
 
     if(element) {
         var elementIsFirstChild = nodeElement.childIndex(element);


@@ -211,21 +317,21 @@ commands.register('take-away-node', function(canvas) {
             canvas.setCurrentElement(element, {caretTo: position.offset});
         } else {
             if(elementIsFirstChild) {
             canvas.setCurrentElement(element, {caretTo: position.offset});
         } else {
             if(elementIsFirstChild) {

-                canvas.setCurrentElement(findCanvasElement(range.element1), {caretTo: 'end'});
+                canvas.setCurrentElement(utils.findCanvasElement(range.element1), {caretTo: 'end'});

             } else {
             } else {

-                canvas.setCurrentElement(findCanvasElement(range.element2), {caretTo: 'end'});
+                canvas.setCurrentElement(utils.findCanvasElement(range.element2), {caretTo: 'end'});

             }
         }
     } else {
             }
         }
     } else {

-        canvas.setCurrentElement(findCanvasElement(range.element1), {caretTo: 'start'});
+        canvas.setCurrentElement(utils.findCanvasElement(range.element1), {caretTo: 'start'});

     }
 
 });
 
 
 return {
     }
 
 });
 
 
 return {

-    run: function(name, params, canvas) {
-        return commands.run(name, params, canvas);
+    run: function(name, params, canvas, user) {
+        return commands.run(name, params, canvas, user);

     }
 };
 
     }
 };