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 cb9fb69..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) {


@@ -189,9 +172,11 @@ $.extend(Canvas.prototype, {
             });
          
             this.wrapper.on('keydown', function(e) {
             });
          
             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);


@@ -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;


@@ -617,7 +766,7 @@ $.extend(Cursor.prototype, {
                 element: focusElement,
                 offset: getOffset('focus'),
                 offsetAtBeginning: getOffset('focus') === 0,
                 element: focusElement,
                 offset: getOffset('focus'),
                 offsetAtBeginning: getOffset('focus') === 0,

-                offsetAtEnd: selection.focusElement.data.length === getOffset('focus')
+                offsetAtEnd: selection.focusNode.data.length === getOffset('focus')

             };
         }
         
             };
         }