editor: canvas - refactoring Canvas Selection

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index c964779..6f648ec 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -11,8 +11,9 @@ define([
 'modules/documentCanvas/canvas/genericElement',
 'modules/documentCanvas/canvas/nullElement',
 'modules/documentCanvas/canvas/gutter',
 'modules/documentCanvas/canvas/genericElement',
 'modules/documentCanvas/canvas/nullElement',
 'modules/documentCanvas/canvas/gutter',

+'modules/documentCanvas/canvas/selection',

 'libs/text!./canvas.html'
 'libs/text!./canvas.html'

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

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


@@ -316,9 +317,14 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     triggerSelectionChanged: function() {
     },
 
     triggerSelectionChanged: function() {

-        this.trigger('selectionChanged', this.getSelection());

         var s = this.getSelection(),
         var s = this.getSelection(),

-            f = s.toDocumentFragment();
+            f;
+        if(!s) {
+            return;
+        }
+        this.trigger('selectionChanged', s);
+        f = s.toDocumentFragment();
+

         if(f && f instanceof f.RangeFragment) {
             if(this.currentNodeElement) {
                 this.currentNodeElement.updateState({active: false});
         if(f && f instanceof f.RangeFragment) {
             if(this.currentNodeElement) {
                 this.currentNodeElement.updateState({active: false});


@@ -328,7 +334,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     getSelection: function() {
     },
 
     getSelection: function() {

-        return new Selection(this);
+        return selection.fromNativeSelection(this);

     },
 
     select: function(fragment) {
     },
 
     select: function(fragment) {


@@ -439,69 +445,6 @@ $.extend(Canvas.prototype, Backbone.Events, {
 });
 
 
 });
 
 

-var isText = function(node) {
-    return node && node.nodeType === Node.TEXT_NODE && $(node.parentNode).is('[document-text-element]');
-};
-
-var Selection = function(canvas) {
-    this.canvas = canvas;
-    var nativeSelection = this.nativeSelection = window.getSelection();
-    Object.defineProperty(this, 'type', {
-        get: function() {
-            if(nativeSelection.focusNode) {
-                if(nativeSelection.isCollapsed && isText(nativeSelection.focusNode)) {
-                    return 'caret';
-                }
-                if(isText(nativeSelection.focusNode) && isText(nativeSelection.anchorNode)) {
-                    return 'textSelection';
-                }
-            }
-            if(canvas.getCurrentNodeElement()) {
-                return 'node';
-            }
-        }
-    });
-};
-
-$.extend(Selection.prototype, {
-    toDocumentFragment: function() {
-        var doc = this.canvas.wlxmlDocument,
-            anchorElement = this.canvas.getDocumentElement(this.nativeSelection.anchorNode),
-            focusElement = this.canvas.getDocumentElement(this.nativeSelection.focusNode),
-            anchorNode = anchorElement ? anchorElement.wlxmlNode : null,
-            focusNode = focusElement ? focusElement.wlxmlNode : null;
-        if(this.type === 'caret') {
-            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,
-                    offset1: this.nativeSelection.anchorOffset,
-                    node2: focusNode,
-                    offset2: this.nativeSelection.focusOffset,
-                });
-            }
-            else {
-                var siblingParents = doc.getSiblingParents({node1: anchorNode, node2: focusNode});
-                return doc.createFragment(doc.RangeFragment, {
-                    node1: siblingParents.node1,
-                    node2: siblingParents.node2
-                });
-            }
-        }
-        if(this.type === 'node') {
-            return doc.createFragment(doc.NodeFragment, {node: this.canvas.getCurrentNodeElement().wlxmlNode});
-        }
-    },
-    sameAs: function(other) {
-        void(other);
-    }
-});
-

 var Cursor = function(canvas) {
     this.canvas = canvas;
     this.selection = window.getSelection();
 var Cursor = function(canvas) {
     this.canvas = canvas;
     this.selection = window.getSelection();

diff --git a/src/editor/modules/documentCanvas/canvas/selection.js b/src/editor/modules/documentCanvas/canvas/selection.js
new file mode 100644 (file)
index 0000000..790f56d
--- /dev/null
+++ b/src/editor/modules/documentCanvas/canvas/selection.js
@@ -0,0 +1,115 @@
+define(function(require) {
+    
+'use strict';
+
+var $ = require('libs/jquery');
+
+var Selection = function(canvas, params) {
+    this.canvas = canvas;
+    $.extend(this, params);
+};
+
+var CaretSelection = function(canvas, params) {
+    Selection.call(this, canvas, params);
+};
+CaretSelection.prototype = Object.create(Selection.prototype);
+$.extend(CaretSelection.prototype, {
+    toDocumentFragment: function() {
+        var doc = this.canvas.wlxmlDocument;
+        return doc.createFragment(doc.CaretFragment, {node: this.element.wlxmlNode, offset: this.offset});
+    }
+});
+
+var TextSelection = function(canvas, params) {
+    Selection.call(this, canvas, params);
+};
+TextSelection.prototype = Object.create(Selection.prototype);
+$.extend(TextSelection.prototype, {
+    toDocumentFragment: function() {
+        var doc = this.canvas.wlxmlDocument,
+            anchorNode = this.anchorElement ? this.anchorElement.wlxmlNode : null,
+            focusNode = this.focusElement ? this.focusElement.wlxmlNode : null;
+        
+        if(!anchorNode || !focusNode) {
+            return;
+        }
+
+        if(anchorNode.isSiblingOf(focusNode)) {
+            return doc.createFragment(doc.TextRangeFragment, {
+                node1: anchorNode,
+                offset1: this.anchorOffset,
+                node2: focusNode,
+                offset2: this.focusOffset,
+            });
+        }
+        else {
+            var siblingParents = doc.getSiblingParents({node1: anchorNode, node2: focusNode});
+            return doc.createFragment(doc.RangeFragment, {
+                node1: siblingParents.node1,
+                node2: siblingParents.node2
+            });
+        }
+    }
+});
+
+var NodeSelection = function(canvas, params) {
+    Selection.call(this, canvas, params);
+};
+NodeSelection.prototype = Object.create(Selection.prototype);
+$.extend(NodeSelection.prototype, {
+    toDocumentFragment: function() {
+        var doc = this.canvas.wlxmlDocument;
+        doc.createFragment(doc.NodeFragment, {node: this.element.wlxmlNode});
+    }
+});
+
+
+var isText = function(node) {
+    /* globals Node */
+    return node && node.nodeType === Node.TEXT_NODE && $(node.parentNode).is('[document-text-element]');
+};
+
+var types = {
+    caret: CaretSelection,
+    textSelection: TextSelection,
+    nodeSelection: NodeSelection
+};
+
+return {
+    fromParams: function(canvas, params) {
+        return new types[params.type](canvas, params);
+    },
+    fromNativeSelection: function(canvas) {
+        /* globals window */
+        var nativeSelection =  window.getSelection(),
+            params = {},
+            element;
+        if(nativeSelection.focusNode) {
+            if(nativeSelection.isCollapsed && isText(nativeSelection.focusNode)) {
+                params = {
+                    type: 'caret',
+                    element: canvas.getDocumentElement(nativeSelection.focusNode),
+                    offset: nativeSelection.focusOffset
+                };
+            } else if(isText(nativeSelection.focusNode) && isText(nativeSelection.anchorNode)) {
+                params = {
+                    type: 'textSelection',
+                    anchorElement: canvas.getDocumentElement(nativeSelection.anchorNode),
+                    anchorOffset: nativeSelection.anchorOffset,
+                    focusElement: canvas.getDocumentElement(nativeSelection.focusNode),
+                    focusOffset: nativeSelection.focusOffset
+                };
+            }
+        } else if((element = canvas.getCurrentNodeElement())) {
+            params = {
+                type: 'nodeSelection',
+                element: element
+            };
+        }
+        if(params.type) {
+            return this.fromParams(canvas, params);
+        }
+    }
+};
+
+});
\ No newline at end of file