some other minor changes from milpeer

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

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index 3dac88f..de9f20e 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -97,6 +97,15 @@ var Canvas = function(wlxmlDocument, elements, metadata, sandbox) {
 
 $.extend(Canvas.prototype, Backbone.Events, {
 
 
 $.extend(Canvas.prototype, Backbone.Events, {
 

+    createElementType: function(elementPrototype) {
+        /* TODO: reconcile this with ElementsRegister behavior */
+        var Constructor = function() {
+            documentElement.DocumentNodeElement.apply(this, Array.prototype.slice.call(arguments, 0));
+        };
+        Constructor.prototype = elementPrototype;
+        return Constructor;
+    },
+

     getElementOffset: function(element) {
         return element.dom.offset().top - this.dom.offset().top;
     },
     getElementOffset: function(element) {
         return element.dom.offset().top - this.dom.offset().top;
     },


@@ -165,7 +174,9 @@ $.extend(Canvas.prototype, Backbone.Events, {
 
     triggerKeyEvent: function(keyEvent, selection) {
         selection = selection || this.getSelection();
 
     triggerKeyEvent: function(keyEvent, selection) {
         selection = selection || this.getSelection();

-        if(selection && (selection.type === 'caret' || selection.type === 'textSelection') && selection.toDocumentFragment().isValid()) {
+        if(selection && (
+            (selection.type === 'caret' || selection.type === 'textSelection') && selection.toDocumentFragment().isValid()
+            || selection.type == 'nodeSelection')) {

             keyboard.handleKeyEvent(keyEvent, selection);
         }
     },
             keyboard.handleKeyEvent(keyEvent, selection);
         }
     },


@@ -258,7 +269,10 @@ $.extend(Canvas.prototype, Backbone.Events, {
                     if(mutation.target.data === '') {
                         mutation.target.data = utils.unicode.ZWS;
                     }
                     if(mutation.target.data === '') {
                         mutation.target.data = utils.unicode.ZWS;
                     }

-                    else if(mutation.oldValue === utils.unicode.ZWS) {
+                    if(mutation.target.data === mutation.oldValue) {
+                        return; // shouldn't happen, but better be safe
+                    }
+                    if(mutation.oldValue === utils.unicode.ZWS) {

                         mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, '');
                         canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end');
                     }
                         mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, '');
                         canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end');
                     }


@@ -538,18 +552,18 @@ $.extend(Cursor.prototype, {
         return this.getSelectionAnchor();
     },
     getSelectionStart: function() {
         return this.getSelectionAnchor();
     },
     getSelectionStart: function() {

-        return this.getSelectionBoundry('start');
+        return this.getSelectionBoundary('start');

     },
     getSelectionEnd: function() {
     },
     getSelectionEnd: function() {

-        return this.getSelectionBoundry('end');
+        return this.getSelectionBoundary('end');

     },
     getSelectionAnchor: function() {
     },
     getSelectionAnchor: function() {

-        return this.getSelectionBoundry('anchor');
+        return this.getSelectionBoundary('anchor');

     },
     getSelectionFocus: function() {
     },
     getSelectionFocus: function() {

-        return this.getSelectionBoundry('focus');
+        return this.getSelectionBoundary('focus');

     },
     },

-    getSelectionBoundry: function(which) {
+    getSelectionBoundary: function(which) {

         /* globals window */
         var selection = window.getSelection(),
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
         /* globals window */
         var selection = window.getSelection(),
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),