hide icon for enumerated lists

[fnpeditor.git] / modules / documentCanvas / canvas / canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index bd45273..48e4abf 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -1,13 +1,15 @@
 define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',
 define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',

+'libs/backbone-min',

 'modules/documentCanvas/canvas/documentElement',
 'modules/documentCanvas/canvas/utils'
 'modules/documentCanvas/canvas/documentElement',
 'modules/documentCanvas/canvas/utils'

-], function($, _, documentElement, utils) {
+], function($, _, Backbone, documentElement, utils) {

     
 'use strict';
 
 var Canvas = function(wlxml, publisher) {
     
 'use strict';
 
 var Canvas = function(wlxml, publisher) {

+    this.eventBus = _.extend({}, Backbone.Events);

     this.loadWlxml(wlxml);
     this.publisher = publisher ? publisher : function() {};
 };
     this.loadWlxml(wlxml);
     this.publisher = publisher ? publisher : function() {};
 };


@@ -19,7 +21,8 @@ $.extend(Canvas.prototype, {
         if(d) {
             this.wrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
             this.wrapper.append(d);
         if(d) {
             this.wrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
             this.wrapper.append(d);

-            
+            var canvas = this;
+

             this.wrapper.find('*').replaceWith(function() {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
             this.wrapper.find('*').replaceWith(function() {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))


@@ -40,7 +43,7 @@ $.extend(Canvas.prototype, {
                     meta: meta,
                     others: others,
                     rawChildren: currentTag.contents()
                     meta: meta,
                     others: others,
                     rawChildren: currentTag.contents()

-                });
+                }, canvas);

 
                 ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
                     element.data(attr, '');
 
                 ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
                     element.data(attr, '');


@@ -137,35 +140,15 @@ $.extend(Canvas.prototype, {
             
             this.d = this.wrapper.children(0);
 
             
             this.d = this.wrapper.children(0);
 

-            var canvas = this;
-            this.wrapper.on('keydown', function(e) {
-                if(e.which === 13) { 
-                    e.preventDefault();
-                    var cursor = canvas.getCursor();
-                    if(!cursor.isSelecting()) {
-                        var position = cursor.getPosition(),
-                            elements = position.element.split({offset: position.offset}),
-                            newEmpty,
-                            goto;
-
-                        if(position.offsetAtBeginning)
-                            newEmpty = elements.first;
-                        else if(position.offsetAtEnd)
-                            newEmpty = elements.second;
-                        if(newEmpty) {
-                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
-                            canvas.setCurrentElement(goto);
-                        }
-                    }
-                }
-            });
-
-

             var KEYS = {
             var KEYS = {

+                ENTER: 13,

                 ARROW_LEFT: 37,
                 ARROW_UP: 38,
                 ARROW_RIGHT: 39,
                 ARROW_LEFT: 37,
                 ARROW_UP: 38,
                 ARROW_RIGHT: 39,

-                ARROW_DOWN: 40
+                ARROW_DOWN: 40,
+                BACKSPACE: 8,
+                DELETE: 46,
+                X: 88

             }
 
             this.wrapper.on('keyup', function(e) {
             }
 
             this.wrapper.on('keyup', function(e) {


@@ -175,23 +158,25 @@ $.extend(Canvas.prototype, {
                     if(!element) {
                         // Chrome hack
                         var direction;
                     if(!element) {
                         // Chrome hack
                         var direction;

-                        if(e.which === (KEYS.ARROW_LEFT  || KEYS.ARROW_DOWN)) {
+                        if(e.which === KEYS.ARROW_LEFT  || e.which === KEYS.ARROW_UP) {

                             direction = 'above';
                             caretTo = 'end';
                         } else {
                             direction = 'below';
                             caretTo = 'start';
                         }
                             direction = 'above';
                             caretTo = 'end';
                         } else {
                             direction = 'below';
                             caretTo = 'start';
                         }

-                        element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode));
+                        element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', direction, window.getSelection().focusNode));

                     }
                     canvas.setCurrentElement(element, {caretTo: caretTo});
                 }
             });
          
             this.wrapper.on('keydown', function(e) {
                     }
                     canvas.setCurrentElement(element, {caretTo: caretTo});
                 }
             });
          
             this.wrapper.on('keydown', function(e) {

+                var cursor = canvas.getCursor(),
+                    position = canvas.getCursor().getPosition(),
+                    element = position.element;

                 if(e.which >= 37 && e.which <= 40) {
                 if(e.which >= 37 && e.which <= 40) {

-                    var position = canvas.getCursor().getPosition(),
-                        element = position.element;
+

                     if(element && (element instanceof documentElement.DocumentTextElement)) {
                         if(element.isEmpty()) {
                             var direction, caretTo;
                     if(element && (element instanceof documentElement.DocumentTextElement)) {
                         if(element.isEmpty()) {
                             var direction, caretTo;


@@ -219,6 +204,106 @@ $.extend(Canvas.prototype, {
 
 
                 }
 
 
                 }

+
+                var selectsWholeTextElement = function() {
+                    if(cursor.isSelecting() && cursor.getSelectionStart().offsetAtBeginning && cursor.getSelectionEnd().offsetAtEnd)
+                        return true;
+                    return false;
+                }
+
+                if(e.which === KEYS.X && e.ctrlKey && selectsWholeTextElement()) {
+                    e.preventDefault();
+                }
+
+                if(e.which === KEYS.BACKSPACE || e.which === KEYS.DELETE) {
+                    if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) {
+                        e.preventDefault();
+                        return;
+                    }
+                        
+                    var cursorAtOperationEdge = position.offsetAtBeginning;
+                    if(e.which === KEYS.DELETE) {
+                        cursorAtOperationEdge = position.offsetAtEnd;
+                    }
+
+                    if(element.getText().length === 1 || selectsWholeTextElement()) {
+                        e.preventDefault();
+                        element.setText('');
+                    }
+                    else if(element.isEmpty()) {
+
+                        var direction = 'above',
+                            caretTo = 'end';
+                            
+                        if(e.which === KEYS.DELETE) {
+                            direction = 'below';
+                            caretTo = 'start';
+                        }
+
+                        e.preventDefault();
+
+                        var parent = element.parent(),
+                            grandParent = parent ? parent.parent() : null,
+                            goto;
+                        if(parent.children().length === 1) {
+                            if(grandParent && grandParent.children().length === 1) {
+                                goto = grandParent.append({text: ''});
+                            } else {
+                                goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
+                            }
+                            parent.detach();
+                        } else {
+                            goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
+                            element.detach();
+                        }
+                        canvas.setCurrentElement(goto, {caretTo: caretTo});
+                    }
+                    else if(cursorAtOperationEdge) {
+                        // todo
+                        e.preventDefault();
+                    }
+                }
+
+                if(e.which === KEYS.ENTER) {
+                    e.preventDefault();
+                    var cursor = canvas.getCursor(),
+                        position = cursor.getPosition(),
+                        element = position.element;
+
+                    if(!cursor.isSelecting()) {
+                        if(e.ctrlKey) {
+                            var added = element.after({tag: 'block'});
+                            added.append({text:''});
+                            canvas.setCurrentElement(added, {caretTo: 'start'});
+
+                        } else {
+
+                            if(!(element.parent().parent())) {
+                                return false; // top level element is unsplittable
+                            }
+
+                            var elements = position.element.split({offset: position.offset}),
+                                newEmpty,
+                                goto,
+                                gotoOptions;
+
+                            if(position.offsetAtBeginning)
+                                newEmpty = elements.first;
+                            else if(position.offsetAtEnd)
+                                newEmpty = elements.second;
+                            
+                            if(newEmpty) {
+                                goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
+                                gotoOptions = {};
+                            } else {
+                                goto = elements.second;
+                                gotoOptions = {caretTo: 'start'};
+                            }
+
+                            canvas.setCurrentElement(goto, gotoOptions);
+                        }
+                    }
+                }

             });
 
             this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
             });
 
             this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {


@@ -228,8 +313,11 @@ $.extend(Canvas.prototype, {
 
             var observer = new MutationObserver(function(mutations) {
                 mutations.forEach(function(mutation) {
 
             var observer = new MutationObserver(function(mutations) {
                 mutations.forEach(function(mutation) {

-                    if(documentElement.DocumentTextElement.isContentContainer(mutation.target) && mutation.target.data === '')
-                        mutation.target.data = utils.unicode.ZWS;
+                    if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) {
+                        if(mutation.target.data === '')
+                            mutation.target.data = utils.unicode.ZWS;
+                        canvas.publisher('contentChanged');
+                    }

                 });
             });
             var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
                 });
             });
             var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};


@@ -255,6 +343,13 @@ $.extend(Canvas.prototype, {
                 el.toggleLabel(false);
             });
 
                 el.toggleLabel(false);
             });
 

+            this.eventBus.on('elementToggled', function(toggle, element) {
+                if(!toggle) {
+                    element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', 'above', element.dom()[0]));
+                    canvas.setCurrentElement(element);
+                }
+            })
+

         } else {
             this.d = null;
         }
         } else {
             this.d = null;
         }


@@ -310,6 +405,59 @@ $.extend(Canvas.prototype, {
             wrapperElement.after({text: suffixOutside});
         return wrapperElement;
     },
             wrapperElement.after({text: suffixOutside});
         return wrapperElement;
     },

+
+    wrapElements: function(params) {
+        if(!(params.element1.parent().sameNode(params.element2.parent())))
+            return;
+
+        var parent = params.element1.parent(),
+            parentChildren = parent.children(),
+            wrapper = documentElement.DocumentNodeElement.create({
+                tag: params._with.tag,
+                klass: params._with.klass}),
+            idx1 = parent.childIndex(params.element1),
+            idx2 = parent.childIndex(params.element2);
+
+        if(idx1 > idx2) {
+            var tmp = idx1;
+            idx1 = idx2;
+            idx2 = tmp;
+        }
+
+        var insertingMethod, insertingTarget;
+        if(idx1 === 0) {
+            insertingMethod = 'prepend';
+            insertingTarget = parent;
+        } else {
+            insertingMethod = 'after';
+            insertingTarget = parentChildren[idx1-1];
+        }
+
+        for(var i = idx1; i <= idx2; i++) {
+            wrapper.append(parentChildren[i].detach());
+        }
+
+        insertingTarget[insertingMethod](wrapper);
+        return wrapper;
+    },
+
+    getSiblingParents: function(params) {
+        var parents1 = [params.element1].concat(params.element1.parents()).reverse(),
+            parents2 = [params.element2].concat(params.element2.parents()).reverse(),
+            noSiblingParents = null;
+
+        if(parents1.length === 0 || parents2.length === 0 || !(parents1[0].sameNode(parents2[0])))
+            return noSiblingParents;
+
+        var i;
+        for(i = 0; i < Math.min(parents1.length, parents2.length); i++) {
+            if(parents1[i].sameNode(parents2[i]))
+                continue;
+            break;
+        }
+        return {element1: parents1[i], element2: parents2[i]};
+    },
+

     getDocumentElement: function(from) {
         if(from instanceof HTMLElement || from instanceof Text) {
            return documentElement.DocumentElement.fromHTMLElement(from, this);
     getDocumentElement: function(from) {
         if(from instanceof HTMLElement || from instanceof Text) {
            return documentElement.DocumentElement.fromHTMLElement(from, this);


@@ -323,7 +471,7 @@ $.extend(Canvas.prototype, {
 
     
     getCurrentNodeElement: function() {
 
     
     getCurrentNodeElement: function() {

-        return this.getDocumentElement(this.wrapper.find('.current-node-element')[0]);
+        return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);

     },
 
     getCurrentTextElement: function() {
     },
 
     getCurrentTextElement: function() {


@@ -351,7 +499,7 @@ $.extend(Canvas.prototype, {
                 element.dom().addClass('current-text-element');
             } else {
                 this.wrapper.find('.current-node-element').removeClass('current-node-element')
                 element.dom().addClass('current-text-element');
             } else {
                 this.wrapper.find('.current-node-element').removeClass('current-node-element')

-                element.dom().addClass('current-node-element');
+                element._container().addClass('current-node-element');

                 this.publisher('currentElementChanged', element);
             }
         }.bind(this);
                 this.publisher('currentElementChanged', element);
             }
         }.bind(this);


@@ -456,7 +604,8 @@ $.extend(Canvas.prototype.list, {
         
         var toret;
         if(parent.is('list')) {
         
         var toret;
         if(parent.is('list')) {

-            listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
+            var item = listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
+            item.exec('toggleBullet', false);

             toret = listElement.parent();
         } else {
             toret = listElement;
             toret = listElement.parent();
         } else {
             toret = listElement;


@@ -584,23 +733,40 @@ $.extend(Cursor.prototype, {
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         

-        if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement)
+        var getOffset = function(where) {
+            var toret, node;
+            if(where === 'anchor') {
+                node = selection.anchorNode;
+                toret = selection.anchorOffset;
+            } else {
+                node = selection.focusNode;
+                toret = selection.focusOffset;
+            }
+                        
+            if(toret === 1 && node.data.charAt(0) === utils.unicode.ZWS)
+                toret = 0;
+            else if((toret === node.data.length - 1) && (node.data.charAt(node.data.length - 1) === utils.unicode.ZWS))
+                toret++;
+            return toret;
+        }
+
+        if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement)

             return {};
 
         if(which === 'anchor') {
             return {
                 element: anchorElement,
             return {};
 
         if(which === 'anchor') {
             return {
                 element: anchorElement,

-                offset: selection.anchorOffset,
-                offsetAtBeginning: selection.anchorOffset === 0,
-                offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
+                offset: getOffset('anchor'),
+                offsetAtBeginning: getOffset('anchor') === 0,
+                offsetAtEnd: selection.anchorNode.data.length === getOffset('anchor')

             };
         }
         if(which === 'focus') {
             return {
                 element: focusElement,
             };
         }
         if(which === 'focus') {
             return {
                 element: focusElement,

-                offset: selection.focusOffset,
-                offsetAtBeginning: selection.focusOffset === 0,
-                offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset
+                offset: getOffset('focus'),
+                offsetAtBeginning: getOffset('focus') === 0,
+                offsetAtEnd: selection.focusNode.data.length === getOffset('focus')

             };
         }
         
             };
         }
         


@@ -613,38 +779,39 @@ $.extend(Cursor.prototype, {
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;

-                    offset = selection.anchorOffset;
+                    offset = getOffset('anchor')

                 }
                 else if(which === 'end') {
                     element = focusElement,
                 }
                 else if(which === 'end') {
                     element = focusElement,

-                    offset = selection.focusOffset;
+                    offset = getOffset('focus')

                 }
             } else {
                 if(which === 'start') {
                     element = focusElement,
                 }
             } else {
                 if(which === 'start') {
                     element = focusElement,

-                    offset = selection.focusOffset
+                    offset = getOffset('focus')

                 }
                 else if(which === 'end') {
                     element = anchorElement;
                 }
                 else if(which === 'end') {
                     element = anchorElement;

-                    offset = selection.anchorOffset;
+                    offset = getOffset('anchor')

                 }
             }
         } else {
             // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
             if(which === 'start') {
                 element = anchorElement;
                 }
             }
         } else {
             // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
             if(which === 'start') {
                 element = anchorElement;

-                offset = selection.anchorOffset
+                offset = getOffset('anchor')

             } else {
                 element = focusElement;
             } else {
                 element = focusElement;

-                offset = selection.focusOffset
+                offset = getOffset('focus')

             }
         }
 
             }
         }
 

+        var nodeLen = (element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length;

         return {
             element: element,
             offset: offset,
             offsetAtBeginning: offset === 0,
         return {
             element: element,
             offset: offset,
             offsetAtBeginning: offset === 0,

-            offsetAtEnd: element.getText().length === offset
+            offsetAtEnd: nodeLen === offset

         }
     }
 })
         }
     }
 })