editor: Merge key event handling refactorings

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / genericElement.js

diff --git a/src/editor/modules/documentCanvas/canvas/genericElement.js b/src/editor/modules/documentCanvas/canvas/genericElement.js
index a703b0c..a769240 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/genericElement.js
+++ b/src/editor/modules/documentCanvas/canvas/genericElement.js
@@ -6,15 +6,8 @@ var $ = require('libs/jquery'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
     utils = require('./utils'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
     utils = require('./utils'),

-    wlxmlUtils = require('utils/wlxml'),

     CommentsView = require('./comments/comments');
 
     CommentsView = require('./comments/comments');
 

-var labelWidget = function(tag, klass) {
-    return $('<span>')
-        .addClass('canvas-widget canvas-widget-label')
-        .text(wlxmlUtils.getTagLabel(tag) + (klass ? ' / ' + wlxmlUtils.getClassLabel(klass) : ''));
-};
-void(labelWidget); // for linters; labelWidget is unused on purpose for now

 
 var DocumentNodeElement = documentElement.DocumentNodeElement;
 
 
 var DocumentNodeElement = documentElement.DocumentNodeElement;
 


@@ -155,23 +148,11 @@ $.extend(generic, {
         }
     },
     onNodeTextChange: function(event) {
         }
     },
     onNodeTextChange: function(event) {

-        var node = event.meta.node,
-            toSet = node.getText(),
-            handled;
-        
-        handled = this.children().some(function(child) {
-            if(child.wlxmlNode.sameNode(node)) {
-                if(toSet === '') {
-                    toSet = utils.unicode.ZWS;
-                }
-                if(toSet !== child.getText()) {
-                    child.setText(toSet);
-                }
-                return true;
-            }
-        });
+        var node = event.meta.node;

 
 

-        if(!handled && node.parent() && node.parent().is('comment') && this.wlxmlNode.sameNode(node.parent().parent())) {
+        /* TODO: This handling of changes to the comments should probably be implemented via separate,
+        non-rendering comments element */
+        if(node.parent() && node.parent().is('comment') && this.wlxmlNode.sameNode(node.parent().parent())) {

             this.commentsView.render();
         }
     },
             this.commentsView.render();
         }
     },