editor: Better invalid cursor handling

[fnpeditor.git] / src / editor / modules / nodePane / nodePane.js

diff --git a/src/editor/modules/nodePane/nodePane.js b/src/editor/modules/nodePane/nodePane.js
index dbdd951..02ae2cc 100644 (file)
--- a/src/editor/modules/nodePane/nodePane.js
+++ b/src/editor/modules/nodePane/nodePane.js
@@ -10,21 +10,16 @@ define([
 
 return function(sandbox) {
     
-    var view = $(_.template(templateSrc)({tagNames: wlxmlUtils.wlxmlTagNames, classNames: wlxmlUtils.wlxmlClassNames})),
+    var view = $(_.template(templateSrc)({utils: wlxmlUtils})),
         currentNode;
     
     view.on('change', 'select', function(e) {
         var target = $(e.target);
         var attr = target.attr('class').split('-')[3] === 'tagSelect' ? 'Tag' : 'Class',
             value = target.val().replace(/-/g, '.');
-                
-        if(attr === 'Class') {
-            //currentNode.document.transform('setClass', {node: currentNode, klass: value});
-            currentNode.transform('setAttr', {name: 'class', value: value});
-        }
-        //currentNode['set' + attr](value);
+        currentNode['set' + attr](value);
     });
-    
+   
     return {
         start: function() {
             sandbox.publish('ready');
@@ -33,14 +28,25 @@ return function(sandbox) {
             return view;
         },
         setNodeElement: function(wlxmlNodeElement) {
+            var module = this;
+            if(!currentNode) {
+                wlxmlNodeElement.document.on('change', function(event) {
+                    if(event.type === 'nodeAttrChange' && event.meta.node.sameNode(currentNode)) {
+                        module.setNodeElement(currentNode);
+                    }
+                });
+            }
+
             view.find('.rng-module-nodePane-tagSelect').val(wlxmlNodeElement.getTagName());
 
             var escapedClassName = (wlxmlNodeElement.getClass() || '').replace(/\./g, '-');
             view.find('.rng-module-nodePane-classSelect').val(escapedClassName);
 
-            var widget = metaWidget.create({attrs:wlxmlNodeElement.getMetaAttributes()});
+            var attrs = _.extend(wlxmlNodeElement.getMetaAttributes(), wlxmlNodeElement.getOtherAttributes());
+            var widget = metaWidget.create({attrs:attrs});
             widget.on('valueChanged', function(key, value) {
                 wlxmlNodeElement.setMetaAttribute(key, value);
+                //wlxmlNodeElement.setMetaAttribute(key, value);
             });
             view.find('.metaFields').empty().append(widget.el);