From 5adf77a193ed63e6ca6740ce7bcd660a453053a2 Mon Sep 17 00:00:00 2001
From: Cristina <cristina.barrantes@logtrust.com>
Date: Mon, 30 Jul 2018 13:09:27 +0200
Subject: [PATCH] Use getPath in onEvent

---
 examples/16_on_event_api.html | 34 +++++++++++++++-------------------
 src/js/Node.js                | 23 +----------------------
 2 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/examples/16_on_event_api.html b/examples/16_on_event_api.html
index ab99240..25c4f77 100644
--- a/examples/16_on_event_api.html
+++ b/examples/16_on_event_api.html
@@ -51,7 +51,7 @@
     onEvent: function(node, event) {
       if (event.type === 'click') {
         var message = 'click on <' + node.field +
-          '> under path <' + printPath(node.path) + 
+          '> under path <' + node.path + 
           '> with pretty path: <' + prettyPrintPath(node.path) + '>';
         if (node.value) message += ' with value <' + node.value + '>';
         console.log(message);
@@ -60,37 +60,33 @@
         var str = '';
         for (var i=0; i<path.length; i++) {
           var element = path[i];
-          if (element.name === undefined) continue;
-          if (i>0 && (path[i-1].type === 'array')) {
-            str += '[' + element.name + ']'
+          if (typeof element === 'number') {
+            str += '[' + element + ']'
           } else {
-            str += (str.length > 0) ? ','+element.name : element.name; 
+            if (str.length > 0) str += ',';
+            str += element; 
           }
         }
         return str;
       }
-      function printPath(path) {
-        var str = '';
-        for (var i=0; i<path.length; i++) {
-          var element = path[i];
-          str += '[' + element.name + ',' + element.type + ']';
-        }
-        return str;
-      }
     }
   };
 
-  //json = 1;
+  // json = 1;
   
-  //json = "zero";
+  // json = "zero";
 
-  //json = ["zero", "one", "two", [3,4,5,6]];
+  // json = ["zero", "one", "two", [3,4,5,6]];
   
-  //json = {"zero": 0}
+  // json = ["zero"];
 
-  //json = {
+  // json = {"0": "zero"};
+  
+  // json = {"[0]": "zero"};
+
+  // json = {
   //  "myarray": [1, 2, [3, 4, 5]]
-  //};
+  // };
   
   json = {
     "array": [1, 2, [3,4,5]],
diff --git a/src/js/Node.js b/src/js/Node.js
index cba0536..cd8a5da 100644
--- a/src/js/Node.js
+++ b/src/js/Node.js
@@ -105,27 +105,6 @@ Node.prototype.getPath = function () {
   return path;
 };
 
-/**
- * Get the path of this node with the type for each element in path.
- * @return {[{name: String, type: String}]} Array containing the path to this
- * node including, for each element, its type
- */
-Node.prototype.getExtendedPath = function () {
-  var node = this;
-  var path = [];
-  while (node) {
-    var name = node.getName();
-    // note: name is undefined if it is an array
-    var element = {
-      name: name,
-      type: node.type
-    };
-    path.unshift(element);
-    node = node.parent;
-  }
-  return path;
-};
-
 /**
  * Get node serializable name
  * @returns {String|Number}
@@ -2591,7 +2570,7 @@ Node.prototype._onEvent = function (event) {
   if (element === this.dom.field || element === this.dom.value) {
     var info = {
       field: this.getField(),
-      path: this.getExtendedPath()
+      path: this.getPath()
     };
     // For leaf values, include value
     if (!this._hasChilds() &&element === this.dom.value) {