prevent empty span in a new node

[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 0259452..2776edb 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -3,6 +3,7 @@ define([
 'libs/underscore',
 'libs/backbone',
 'fnpjs/logging/logging',
 'libs/underscore',
 'libs/backbone',
 'fnpjs/logging/logging',

+'views/menu/menu',

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


@@ -14,8 +15,8 @@ define([
 'modules/documentCanvas/canvas/selection',
 'modules/documentCanvas/canvas/keyEvent',
 'libs/text!./canvas.html'
 'modules/documentCanvas/canvas/selection',
 'modules/documentCanvas/canvas/keyEvent',
 'libs/text!./canvas.html'

-], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter, selection, keyEvent, canvasTemplate) {
-    
+], function($, _, Backbone, logging, Menu, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter, selection, keyEvent, canvasTemplate) {
+

 'use strict';
 /* global document:false, window:false, Node:false, gettext */
 
 'use strict';
 /* global document:false, window:false, Node:false, gettext */
 


@@ -62,9 +63,10 @@ $.extend(TextHandler.prototype, {
 });
 
 
 });
 
 

-var Canvas = function(wlxmlDocument, elements, metadata) {
+var Canvas = function(wlxmlDocument, elements, metadata, sandbox) {

     this.metadata = metadata || {};
     this.metadata = metadata || {};

-    this.elementsRegister = new ElementsRegister(documentElement.DocumentNodeElement, nullElement);
+    this.sandbox = sandbox;
+    this.elementsRegister = this.createElementsRegister();

 
     elements = [
         {tag: 'section', klass: null, prototype: genericElement},
 
     elements = [
         {tag: 'section', klass: null, prototype: genericElement},


@@ -95,6 +97,15 @@ var Canvas = function(wlxmlDocument, elements, metadata) {
 
 $.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;
     },


@@ -109,14 +120,28 @@ $.extend(Canvas.prototype, Backbone.Events, {
         this.reloadRoot();
     },
 
         this.reloadRoot();
     },
 

-    createElement: function(wlxmlNode) {
+    createElement: function(wlxmlNode, register, useRoot) {

         var Factory;
         var Factory;

+        register = register || this.elementsRegister;

         if(wlxmlNode.nodeType === Node.TEXT_NODE) {
             Factory = documentElement.DocumentTextElement;
         } else {
         if(wlxmlNode.nodeType === Node.TEXT_NODE) {
             Factory = documentElement.DocumentTextElement;
         } else {

+            Factory = register.getElement({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()});
+        }
+        if(!Factory && useRoot) {

             Factory = this.elementsRegister.getElement({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()});
             Factory = this.elementsRegister.getElement({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()});

+            if(!Factory) {
+                Factory = documentElement.DocumentNodeElement;
+            }

         }
         }

-        return new Factory(wlxmlNode, this);
+
+        if(Factory) {
+            return new Factory(wlxmlNode, this);
+        }
+    },
+
+    createElementsRegister: function() {
+        return new ElementsRegister(documentElement.DocumentNodeElement, nullElement);

     },
 
     getDocumentElement: function(htmlElement) {
     },
 
     getDocumentElement: function(htmlElement) {


@@ -147,14 +172,19 @@ $.extend(Canvas.prototype, Backbone.Events, {
         this.rootWrapper.append(this.rootElement.dom);
     },
 
         this.rootWrapper.append(this.rootElement.dom);
     },
 

-

     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);
         }
     },
 

+    createAction: function(fqName, config) {
+        return this.sandbox.createAction(fqName, config);
+    },
+

     setupEventHandling: function() {
         var canvas = this;
 
     setupEventHandling: function() {
         var canvas = this;
 


@@ -196,6 +226,17 @@ $.extend(Canvas.prototype, Backbone.Events, {
             }
         });
 
             }
         });
 

+        this.rootWrapper.on('contextmenu', function(e) {
+            var el = canvas.getDocumentElement(e.target);
+            
+            if(!el) {
+                return;
+            }
+
+            e.preventDefault();
+            this.showContextMenu(el, {x: e.clientX, y: e.clientY});
+        }.bind(this));
+

         this.rootWrapper.on('paste', function(e) {
             e.preventDefault();
 
         this.rootWrapper.on('paste', function(e) {
             e.preventDefault();
 


@@ -454,6 +495,18 @@ $.extend(Canvas.prototype, Backbone.Events, {
         if(position.element) {
             this._moveCaretToTextElement(position.element, position.offset);
         }
         if(position.element) {
             this._moveCaretToTextElement(position.element, position.offset);
         }

+    },
+    showContextMenu: function(element, coors) {
+        var menu = new Menu();
+
+        while(element) {
+            (element.contextMenuActions || []).forEach(menu.addAction.bind(menu));
+            element = element.parent();
+        }
+        if(menu.actions.length) {
+            menu.updateContextParam('fragment', this.getSelection().toDocumentFragment());
+            this.sandbox.showContextMenu(menu, {x: coors.x, y: coors.y});
+        }

     }
 });
 
     }
 });
 


@@ -496,18 +549,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),


@@ -585,8 +638,8 @@ $.extend(Cursor.prototype, {
 });
 
 return {
 });
 
 return {

-    fromXMLDocument: function(wlxmlDocument, elements, metadata) {
-        return new Canvas(wlxmlDocument, elements, metadata);
+    fromXMLDocument: function(wlxmlDocument, elements, metadata, sandbox) {
+        return new Canvas(wlxmlDocument, elements, metadata, sandbox);

     }
 };
 
     }
 };