Put try/catch directly around this.editor.options.onNodeName(...) (…

…see josdejong#617)
fgodino · Jan 5, 2019 · 8c74bc7 · 8c74bc7
1 parent 1e29d2a
commit 8c74bc7
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/js/Node.js b/src/js/Node.js
@@ -4468,25 +4468,25 @@ Node.prototype._escapeJSON = function (text) {
  * @private
  */
 Node.prototype.updateNodeName = function () {
-  try {
-    var count = this.childs ? this.childs.length : 0;
-    var nodeName;
-    if (this.type === 'object' || this.type === 'array') {
-      if (this.editor.options.onNodeName) {
+  var count = this.childs ? this.childs.length : 0;
+  var nodeName;
+  if (this.type === 'object' || this.type === 'array') {
+    if (this.editor.options.onNodeName) {
+      try {
         nodeName = this.editor.options.onNodeName({
           path: this.getPath(),
           size: count,
           type: this.type
         });
       }
-
-      this.dom.value.innerHTML = (this.type === 'object')
-        ? '{' + (nodeName || count) + '}'
-        : '[' + (nodeName || count) + ']';
+      catch (err) {
+        console.error('Error in onNodeName callback: ', err);
+      }
     }
-  }
-  catch (err) {
-    console.error('Error in onNodeName callback: ', err);
+
+    this.dom.value.innerHTML = (this.type === 'object')
+      ? ('{' + (nodeName || count) + '}')
+      : ('[' + (nodeName || count) + ']');
   }
 }