Fixed the binding option "addArrayIndexPadding" not working when set …

…to true.
williamtroup · Aug 31, 2024 · 354b932 · 354b932
1 parent c7f4fd2
commit 354b932
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/dist/jsontree.esm.js b/dist/jsontree.esm.js
@@ -771,7 +771,7 @@ var Arr;
     e.getIndex = t;
     function n(e, t, n) {
         let o = t.toString();
-        if (!e.addArrayIndexPadding) {
+        if (e.addArrayIndexPadding) {
             o = Str.padNumber(parseInt(o), n.toString().length);
         }
         if (e.showArrayIndexBrackets) {
@@ -781,7 +781,7 @@ var Arr;
     }
     e.getIndexName = n;
     function o(e) {
-        return parseInt(e.replace("[", "").replace("]", ""));
+        return parseInt(e.replace(/^\D+/g, ""));
     }
     e.getIndexFromBrackets = o;
     function l(e, t, n) {

diff --git a/dist/jsontree.esm.js.map b/dist/jsontree.esm.js.map
diff --git a/dist/jsontree.js b/dist/jsontree.js
@@ -773,7 +773,7 @@ var Arr;
     e.getIndex = t;
     function n(e, t, n) {
         let o = t.toString();
-        if (!e.addArrayIndexPadding) {
+        if (e.addArrayIndexPadding) {
             o = Str.padNumber(parseInt(o), n.toString().length);
         }
         if (e.showArrayIndexBrackets) {
@@ -783,7 +783,7 @@ var Arr;
     }
     e.getIndexName = n;
     function o(e) {
-        return parseInt(e.replace("[", "").replace("]", ""));
+        return parseInt(e.replace(/^\D+/g, ""));
     }
     e.getIndexFromBrackets = o;
     function l(e, t, n) {

diff --git a/dist/jsontree.js.map b/dist/jsontree.js.map
diff --git a/dist/jsontree.min.js b/dist/jsontree.min.js
diff --git a/src/ts/data/arr.ts b/src/ts/data/arr.ts
@@ -24,7 +24,7 @@ export namespace Arr {
     export function getIndexName( bindingOptions: BindingOptions, index: number, largestValue: number ) : string {
         let result: string = index.toString();
 
-        if ( !bindingOptions.addArrayIndexPadding ) {
+        if ( bindingOptions.addArrayIndexPadding ) {
             result = Str.padNumber( parseInt( result ), largestValue.toString().length );
         }
 
@@ -36,7 +36,7 @@ export namespace Arr {
     }
 
     export function getIndexFromBrackets( propertyName: string ) : number {
-        return parseInt( propertyName.replace( "[", Char.empty ).replace( "]", Char.empty ) );
+        return parseInt( propertyName.replace( /^\D+/g, Char.empty ) );
     }
 
     export function moveIndex( arrayData: any[], oldIndex: number, newIndex: number ) : void {

diff --git a/test/js/scripts.js b/test/js/scripts.js
@@ -33,6 +33,7 @@ function bindingOptions( showValueColors = true, allowValueToolTips = true ) {
         showOpenedObjectArrayBorders: true,
         showPropertyNameQuotes: false,
         showPropertyNameAndIndexColors: true,
+        addArrayIndexPadding: false,
         valueToolTips: allowValueToolTips ? {
             "value1": "This is a boolean tooltip for Value 1",
             "value5\\1": "This is a string tooltip for Value 1 > Array Index 1",