refactoring: fromHTMLElement @ canvas, no need to pass canvas instance

[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 80d4b87..02ae2cc 100644 (file)
--- a/src/editor/modules/nodePane/nodePane.js
+++ b/src/editor/modules/nodePane/nodePane.js
@@ -10,7 +10,7 @@ define([
 
 return function(sandbox) {
     
 
 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) {
         currentNode;
     
     view.on('change', 'select', function(e) {


@@ -42,7 +42,8 @@ return function(sandbox) {
             var escapedClassName = (wlxmlNodeElement.getClass() || '').replace(/\./g, '-');
             view.find('.rng-module-nodePane-classSelect').val(escapedClassName);
 
             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);
             widget.on('valueChanged', function(key, value) {
                 wlxmlNodeElement.setMetaAttribute(key, value);
                 //wlxmlNodeElement.setMetaAttribute(key, value);