editor: minor refactoring

[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 f7edfa5..d8090c8 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -10,7 +10,9 @@ define([
 'modules/documentCanvas/canvas/elementsRegister',
 'modules/documentCanvas/canvas/genericElement',
 'modules/documentCanvas/canvas/nullElement',
 'modules/documentCanvas/canvas/elementsRegister',
 'modules/documentCanvas/canvas/genericElement',
 'modules/documentCanvas/canvas/nullElement',

-], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement) {
+'modules/documentCanvas/canvas/gutter',
+'libs/text!./canvas.html'
+], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter, canvasTemplate) {

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


@@ -58,7 +60,8 @@ $.extend(TextHandler.prototype, {
 });
 
 
 });
 
 

-var Canvas = function(wlxmlDocument, elements) {
+var Canvas = function(wlxmlDocument, elements, metadata) {
+    this.metadata = metadata || {};

     this.elementsRegister = new ElementsRegister(documentElement.DocumentNodeElement, nullElement);
 
     elements = [
     this.elementsRegister = new ElementsRegister(documentElement.DocumentNodeElement, nullElement);
 
     elements = [


@@ -73,7 +76,15 @@ var Canvas = function(wlxmlDocument, elements) {
         this.elementsRegister.register(elementDesc);
     }.bind(this));
     this.eventBus = _.extend({}, Backbone.Events);
         this.elementsRegister.register(elementDesc);
     }.bind(this));
     this.eventBus = _.extend({}, Backbone.Events);

-    this.wrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
+    
+    this.dom = $(canvasTemplate);
+    this.rootWrapper = this.dom.find('.root-wrapper');
+    
+
+    this.gutter = gutter.create();
+    this.gutterView = new gutter.GutterView(this.gutter);
+    this.dom.find('.view-row').append(this.gutterView.dom);
+    

     this.wlxmlListener = wlxmlListener.create(this);
     this.loadWlxmlDocument(wlxmlDocument);
     this.setupEventHandling();
     this.wlxmlListener = wlxmlListener.create(this);
     this.loadWlxmlDocument(wlxmlDocument);
     this.setupEventHandling();


@@ -82,6 +93,10 @@ var Canvas = function(wlxmlDocument, elements) {
 
 $.extend(Canvas.prototype, Backbone.Events, {
 
 
 $.extend(Canvas.prototype, Backbone.Events, {
 

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

     loadWlxmlDocument: function(wlxmlDocument) {
         if(!wlxmlDocument) {
             return false;
     loadWlxmlDocument: function(wlxmlDocument) {
         if(!wlxmlDocument) {
             return false;


@@ -123,28 +138,30 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     reloadRoot: function() {
     },
 
     reloadRoot: function() {

+        if(this.rootElement) {
+            this.rootElement.detach();
+        }

         this.rootElement = this.createElement(this.wlxmlDocument.root);
         this.rootElement = this.createElement(this.wlxmlDocument.root);

-        this.wrapper.empty();
-        this.wrapper.append(this.rootElement.dom);
+        this.rootWrapper.append(this.rootElement.dom);

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

-        this.wrapper.on('keyup keydown keypress', function(e) {
+        this.rootWrapper.on('keyup keydown keypress', function(e) {

             keyboard.handleKey(e, canvas);
         });
 
             keyboard.handleKey(e, canvas);
         });
 

-        this.wrapper.on('mouseup', function() {
+        this.rootWrapper.on('mouseup', function() {

             canvas.triggerSelectionChanged();
         });
 
         var mouseDown;
             canvas.triggerSelectionChanged();
         });
 
         var mouseDown;

-        this.wrapper.on('mousedown', '[document-node-element], [document-text-element]', function(e) {
+        this.rootWrapper.on('mousedown', '[document-node-element], [document-text-element]', function(e) {

             mouseDown = e.target;
         });
 
             mouseDown = e.target;
         });
 

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

             e.stopPropagation();
             if(e.originalEvent.detail === 3) {
                 e.preventDefault();
             e.stopPropagation();
             if(e.originalEvent.detail === 3) {
                 e.preventDefault();


@@ -156,7 +173,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
             }
         });
 
             }
         });
 

-        this.wrapper.on('paste', function(e) {
+        this.rootWrapper.on('paste', function(e) {

             e.preventDefault();
 
             var clipboardData = e.originalEvent.clipboardData;
             e.preventDefault();
 
             var clipboardData = e.originalEvent.clipboardData;


@@ -183,7 +200,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
         /* globals MutationObserver */
         var observer = new MutationObserver(function(mutations) {
             mutations.forEach(function(mutation) {
         /* globals MutationObserver */
         var observer = new MutationObserver(function(mutations) {
             mutations.forEach(function(mutation) {

-                if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) {
+                if(canvas.dom[0].contains(mutation.target) && documentElement.DocumentTextElement.isContentContainer(mutation.target)) {

                     observer.disconnect();
                     if(mutation.target.data === '') {
                         mutation.target.data = utils.unicode.ZWS;
                     observer.disconnect();
                     if(mutation.target.data === '') {
                         mutation.target.data = utils.unicode.ZWS;


@@ -192,7 +209,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
                         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');
                     }

-                    observer.observe(canvas.wrapper[0], config);
+                    observer.observe(canvas.dom[0], config);

 
                     var textElement = canvas.getDocumentElement(mutation.target),
                         toSet = mutation.target.data !== utils.unicode.ZWS ? mutation.target.data : '';
 
                     var textElement = canvas.getDocumentElement(mutation.target),
                         toSet = mutation.target.data !== utils.unicode.ZWS ? mutation.target.data : '';


@@ -206,7 +223,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
             });
         });
         var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
             });
         });
         var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};

-        observer.observe(this.wrapper[0], config);
+        observer.observe(this.rootWrapper[0], config);

 
 
         var hoverHandler = function(e) {
 
 
         var hoverHandler = function(e) {


@@ -225,8 +242,8 @@ $.extend(Canvas.prototype, Backbone.Events, {
             el.updateState({exposed:expose[e.type]});
         };
 
             el.updateState({exposed:expose[e.type]});
         };
 

-        this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', hoverHandler);
-        this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', hoverHandler);
+        this.rootWrapper.on('mouseover', '[document-node-element], [document-text-element]', hoverHandler);
+        this.rootWrapper.on('mouseout', '[document-node-element], [document-text-element]', hoverHandler);

 
         this.eventBus.on('elementToggled', function(toggle, element) {
             if(!toggle) {
 
         this.eventBus.on('elementToggled', function(toggle, element) {
             if(!toggle) {


@@ -236,7 +253,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     view: function() {
     },
 
     view: function() {

-        return this.wrapper;
+        return this.dom;

     },
 
     doc: function() {
     },
 
     doc: function() {


@@ -258,7 +275,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     getCurrentTextElement: function() {
     },
 
     getCurrentTextElement: function() {

-        var htmlElement = this.wrapper.find('.current-text-element')[0];
+        var htmlElement = this.rootWrapper.find('.current-text-element')[0];

         if(htmlElement) {
             return this.getDocumentElement(htmlElement);
         }
         if(htmlElement) {
             return this.getDocumentElement(htmlElement);
         }


@@ -279,7 +296,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     contains: function(element) {
     },
 
     contains: function(element) {

-        return element && element.dom && element.dom.parents().index(this.wrapper) !== -1;
+        return element && element.dom && element.dom.parents().index(this.rootWrapper) !== -1;

     },
 
     triggerSelectionChanged: function() {
     },
 
     triggerSelectionChanged: function() {


@@ -332,11 +349,11 @@ $.extend(Canvas.prototype, Backbone.Events, {
             if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) {
                 return byBrowser;
             }
             if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) {
                 return byBrowser;
             }

-            return e.getVerticallyFirstTextElement();
+            return _.isFunction(e.getVerticallyFirstTextElement) ? e.getVerticallyFirstTextElement({considerChildren: false}) : null;

         }.bind(this);
         var _markAsCurrent = function(element) {
             if(element instanceof documentElement.DocumentTextElement) {
         }.bind(this);
         var _markAsCurrent = function(element) {
             if(element instanceof documentElement.DocumentTextElement) {

-                this.wrapper.find('.current-text-element').removeClass('current-text-element');
+                this.rootWrapper.find('.current-text-element').removeClass('current-text-element');

                 element.dom.addClass('current-text-element');
             } else {
                 if(this.currentNodeElement) {
                 element.dom.addClass('current-text-element');
             } else {
                 if(this.currentNodeElement) {


@@ -355,12 +372,12 @@ $.extend(Canvas.prototype, Backbone.Events, {
             currentNodeElement = this.getCurrentNodeElement();
 
         if(currentTextElement && !(currentTextElement.sameNode(textElementToLand))) {
             currentNodeElement = this.getCurrentNodeElement();
 
         if(currentTextElement && !(currentTextElement.sameNode(textElementToLand))) {

-            this.wrapper.find('.current-text-element').removeClass('current-text-element');
+            this.rootWrapper.find('.current-text-element').removeClass('current-text-element');

         }
 
         if(textElementToLand) {
             _markAsCurrent(textElementToLand);
         }
 
         if(textElementToLand) {
             _markAsCurrent(textElementToLand);

-            if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) {
+            if((params.caretTo || params.caretTo === 0) || !textElementToLand.sameNode(this.getCursor().getPosition().element)) {

                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
             }
         } else {
                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
             }
         } else {


@@ -394,21 +411,13 @@ $.extend(Canvas.prototype, Backbone.Events, {
 
         selection.removeAllRanges();
         selection.addRange(range);
 
         selection.removeAllRanges();
         selection.addRange(range);

-        this.wrapper.focus(); // FF requires this for caret to be put where range colllapses, Chrome doesn't.
+        this.rootWrapper.focus(); // FF requires this for caret to be put where range colllapses, Chrome doesn't.

     },
 
     setCursorPosition: function(position) {
         if(position.element) {
             this._moveCaretToTextElement(position.element, position.offset);
         }
     },
 
     setCursorPosition: function(position) {
         if(position.element) {
             this._moveCaretToTextElement(position.element, position.offset);
         }

-    },
-
-    toggleGrid: function() {
-        this.wrapper.toggleClass('grid-on');
-        this.trigger('changed');
-    },
-    isGridToggled: function() {
-        return this.wrapper.hasClass('grid-on');

     }
 });
 
     }
 });
 


@@ -448,6 +457,9 @@ $.extend(Selection.prototype, {
             return doc.createFragment(doc.CaretFragment, {node: anchorNode, offset: this.nativeSelection.anchorOffset});
         }
         if(this.type === 'textSelection') {
             return doc.createFragment(doc.CaretFragment, {node: anchorNode, offset: this.nativeSelection.anchorOffset});
         }
         if(this.type === 'textSelection') {

+            if(!anchorNode || !focusNode) {
+                return;
+            }

             if(anchorNode.isSiblingOf(focusNode)) {
                 return doc.createFragment(doc.TextRangeFragment, {
                     node1: anchorNode,
             if(anchorNode.isSiblingOf(focusNode)) {
                 return doc.createFragment(doc.TextRangeFragment, {
                     node1: anchorNode,


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

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

     }
 };
 
     }
 };