From d613d2e064ec2eb9d5ddf26337082f2904cbac89 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Wed, 7 Aug 2013 15:17:45 +0200
Subject: [PATCH] Refactoring

---
 modules/documentCanvas/canvas/canvas.js | 56 ++++++++++++-------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 25fe689..a8ff8d4 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -140,36 +140,8 @@ $.extend(Canvas.prototype, {
             
             this.d = this.wrapper.children(0);
 
-            this.wrapper.on('keydown', function(e) {
-                if(e.which === 13) { 
-                    e.preventDefault();
-                    var cursor = canvas.getCursor();
-                    if(!cursor.isSelecting()) {
-                        var position = cursor.getPosition(),
-                            element = position.element;
-
-                        if(!(element.parent().parent())) {
-                            return false; // top level element is unsplittable
-                        }
-
-                        var elements = position.element.split({offset: position.offset}),
-                            newEmpty,
-                            goto;
-
-                        if(position.offsetAtBeginning)
-                            newEmpty = elements.first;
-                        else if(position.offsetAtEnd)
-                            newEmpty = elements.second;
-                        if(newEmpty) {
-                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
-                            canvas.setCurrentElement(goto);
-                        }
-                    }
-                }
-            });
-
-
             var KEYS = {
+                ENTER: 13,
                 ARROW_LEFT: 37,
                 ARROW_UP: 38,
                 ARROW_RIGHT: 39,
@@ -291,6 +263,32 @@ $.extend(Canvas.prototype, {
                         e.preventDefault();
                     }
                 }
+
+                if(e.which === KEYS.ENTER) {
+                    e.preventDefault();
+                    var cursor = canvas.getCursor();
+                    if(!cursor.isSelecting()) {
+                        var position = cursor.getPosition(),
+                            element = position.element;
+
+                        if(!(element.parent().parent())) {
+                            return false; // top level element is unsplittable
+                        }
+
+                        var elements = position.element.split({offset: position.offset}),
+                            newEmpty,
+                            goto;
+
+                        if(position.offsetAtBeginning)
+                            newEmpty = elements.first;
+                        else if(position.offsetAtEnd)
+                            newEmpty = elements.second;
+                        if(newEmpty) {
+                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
+                            canvas.setCurrentElement(goto);
+                        }
+                    }
+                }
             });
 
             this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
-- 
2.20.1