editor: refactoring - remove old unnecessary markup

[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 a467bee..3bf6b51 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -9,7 +9,9 @@ define([
 'modules/documentCanvas/canvas/wlxmlListener',
 'modules/documentCanvas/canvas/elementsRegister',
 'modules/documentCanvas/canvas/genericElement',
 'modules/documentCanvas/canvas/wlxmlListener',
 'modules/documentCanvas/canvas/elementsRegister',
 'modules/documentCanvas/canvas/genericElement',

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

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


@@ -58,7 +60,7 @@ $.extend(TextHandler.prototype, {
 
 
 var Canvas = function(wlxmlDocument, elements) {
 
 
 var Canvas = function(wlxmlDocument, elements) {

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

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


@@ -72,7 +74,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.wrapper = $('<div style="display: table; width: 96%"><div style="display: table-row" class="crow"></div></div>');
+    
+
+    this.gutter = gutter.create();
+    this.gutterView = new gutter.GutterView(this.gutter);
+    this.rootWrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
+    this.wrapper.find('.crow').append(this.rootWrapper, this.gutterView.dom);
+    

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


@@ -81,6 +91,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.wrapper.offset().top;
+    },
+

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


@@ -123,27 +137,27 @@ $.extend(Canvas.prototype, Backbone.Events, {
 
     reloadRoot: function() {
         this.rootElement = this.createElement(this.wlxmlDocument.root);
 
     reloadRoot: function() {
         this.rootElement = this.createElement(this.wlxmlDocument.root);

-        this.wrapper.empty();
-        this.wrapper.append(this.rootElement.dom);
+        this.rootWrapper.empty();
+        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();


@@ -155,7 +169,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;


@@ -205,22 +219,15 @@ $.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);

 
 
 
 

-        this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', function(e) {
-            var el = canvas.getDocumentElement(e.currentTarget);
-            if(!el) {
-                return;
-            }
-            e.stopPropagation();
-            if(el instanceof documentElement.DocumentTextElement) {
-                el = el.parent();
-            }
-            el.toggleLabel(true);
-        });
-        this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', function(e) {
-            var el = canvas.getDocumentElement(e.currentTarget);
+        var hoverHandler = function(e) {
+            var el = canvas.getDocumentElement(e.currentTarget),
+                expose = {
+                    mouseover: true,
+                    mouseout: false
+                };

             if(!el) {
                 return;
             }
             if(!el) {
                 return;
             }


@@ -228,8 +235,11 @@ $.extend(Canvas.prototype, Backbone.Events, {
             if(el instanceof documentElement.DocumentTextElement) {
                 el = el.parent();
             }
             if(el instanceof documentElement.DocumentTextElement) {
                 el = el.parent();
             }

-            el.toggleLabel(false);
-        });
+            el.updateState({exposed:expose[e.type]});
+        };
+
+        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) {


@@ -248,7 +258,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
 
     toggleElementHighlight: function(node, toggle) {
         var element = utils.getElementForNode(node);
 
     toggleElementHighlight: function(node, toggle) {
         var element = utils.getElementForNode(node);

-        element.toggleHighlight(toggle);
+        element.updateState({exposed: toggle});

     },
 
     getCursor: function() {
     },
 
     getCursor: function() {


@@ -257,14 +267,11 @@ $.extend(Canvas.prototype, Backbone.Events, {
 
     
     getCurrentNodeElement: function() {
 
     
     getCurrentNodeElement: function() {

-        var htmlElement = this.wrapper.find('.current-node-element').parent()[0];
-        if(htmlElement) {
-            return this.getDocumentElement(htmlElement);
-        }
+        return this.currentNodeElement;

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


@@ -285,17 +292,38 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     contains: function(element) {
     },
 
     contains: function(element) {

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

     },
 
     triggerSelectionChanged: function() {
         this.trigger('selectionChanged', this.getSelection());
     },
 
     triggerSelectionChanged: function() {
         this.trigger('selectionChanged', this.getSelection());

+        var s = this.getSelection(),
+            f = s.toDocumentFragment();
+        if(f && f instanceof f.RangeFragment) {
+            if(this.currentNodeElement) {
+                this.currentNodeElement.updateState({active: false});
+                this.currentNodeElement = null;
+            }
+        }

     },
 
     getSelection: function() {
         return new Selection(this);
     },
 
     },
 
     getSelection: function() {
         return new Selection(this);
     },
 

+    select: function(fragment) {
+        if(fragment instanceof this.wlxmlDocument.RangeFragment) {
+            this.setCurrentElement(fragment.endNode, {caretTo: fragment.endOffset});
+        } else if(fragment instanceof this.wlxmlDocument.NodeFragment) {
+            var params = {
+                caretTo: fragment instanceof this.wlxmlDocument.CaretFragment ? fragment.offset : 'start'
+            };
+            this.setCurrentElement(fragment.node, params);
+        } else {
+            logger.debug('Fragment not supported');
+        }
+    },
+

     setCurrentElement: function(element, params) {
         if(!element) {
             logger.debug('Invalid element passed to setCurrentElement: ' + element);
     setCurrentElement: function(element, params) {
         if(!element) {
             logger.debug('Invalid element passed to setCurrentElement: ' + element);


@@ -321,11 +349,14 @@ $.extend(Canvas.prototype, Backbone.Events, {
         }.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 {
                 element.dom.addClass('current-text-element');
             } else {

-                this.wrapper.find('.current-node-element').removeClass('current-node-element');
-                element._container().addClass('current-node-element');
+                if(this.currentNodeElement) {
+                    this.currentNodeElement.updateState({active: false});
+                }
+                element.updateState({active: true});
+                this.currentNodeElement = element;

             }
         }.bind(this);
 
             }
         }.bind(this);
 


@@ -337,7 +368,7 @@ $.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) {
         }
 
         if(textElementToLand) {


@@ -376,7 +407,7 @@ $.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) {
     },
 
     setCursorPosition: function(position) {


@@ -386,11 +417,11 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     toggleGrid: function() {
     },
 
     toggleGrid: function() {

-        this.wrapper.toggleClass('grid-on');
+        this.rootWrapper.toggleClass('grid-on');

         this.trigger('changed');
     },
     isGridToggled: function() {
         this.trigger('changed');
     },
     isGridToggled: function() {

-        return this.wrapper.hasClass('grid-on');
+        return this.rootWrapper.hasClass('grid-on');

     }
 });
 
     }
 });