diff --git a/index.html b/index.html
index 29d0b25..39da444 100644
--- a/index.html
+++ b/index.html
@@ -424,7 +424,7 @@
},
//Read Txs of Address between from and to
- readData: function (addr, from, to) {
+ readTxs: function (addr, from, to) {
return new Promise((resolve, reject) => {
this.promisedAJAX("GET", `api/addrs/${addr}/txs?from=${from}&to=${to}`).then(response => {
resolve(JSON.parse(response));
@@ -435,7 +435,7 @@
},
//Read All Txs of Address (newest first)
- readAllData: function (addr) {
+ readAllTxs: function (addr) {
return new Promise((resolve, reject) => {
this.promisedAJAX("GET", `api/addrs/${addr}/txs?from=0&to=1`).then(response => {
var totalItems = JSON.parse(response).totalItems;
@@ -453,12 +453,12 @@
//Read Data Sent from Address (if limit is specified, only return newest sent data)
readSentData: function (addr, limit = 0) {
return new Promise((resolve, reject) => {
- this.readAllData(addr).then(items => {
+ this.readAllTxs(addr).then(items => {
var filteredItems = [];
if (limit <= 0) limit = items.length;
for (i = 0; i < items.length && filteredItems.length < limit; i++)
if (items[i].vin[0].addr === addr)
- filteredItems.push(items[i]);
+ filteredItems.push(items[i].floData);
console.log(filteredItems);
resolve(filteredItems);
}).catch(error => {
@@ -470,12 +470,12 @@
//Read newest 'limit' Data matching 'pattern'
readDataPattern: function (addr, pattern, jsonType = false, limit = 1000) {
return new Promise((resolve, reject) => {
- this.readAllData(addr).then(items => {
+ this.readAllTxs(addr).then(items => {
var filteredItems = [];
var pos = (jsonType ? 2 : 0);
for (i = 0; i < items.length && filteredItems.length < limit; i++)
if (items[i].floData.startsWith(pattern, pos))
- filteredItems.push(items[i]);
+ filteredItems.push(items[i].floData);
resolve(filteredItems);
}).catch(error => {
reject(error)
@@ -486,12 +486,12 @@
//Read newest 'limit' Data Sent from Address and matching 'pattern'
readSentDataPattern: function (addr, pattern, jsonType = false, limit = 1000) {
return new Promise((resolve, reject) => {
- this.readAllData(addr).then(items => {
+ this.readAllTxs(addr).then(items => {
var filteredItems = [];
var pos = (jsonType ? 2 : 0);
for (i = 0; i < items.length && filteredItems.length < limit; i++)
if (items[i].vin[0].addr === addr && items[i].floData.startsWith(pattern, pos))
- filteredItems.push(items[i]);
+ filteredItems.push(items[i].floData);
resolve(filteredItems);
}).catch(error => {
reject(error)
@@ -502,11 +502,11 @@
//Read newest 'limit' Data containing 'keyword'
readDataContains: function (addr, keyword, limit = 1000) {
return new Promise((resolve, reject) => {
- this.readAllData(addr).then(items => {
+ this.readAllTxs(addr).then(items => {
var filteredItems = [];
for (i = 0; i < items.length && filteredItems.length < limit; i++)
if (items[i].floData.includes(keyword))
- filteredItems.push(items[i]);
+ filteredItems.push(items[i].floData);
resolve(filteredItems);
}).catch(error => {
reject(error)
@@ -517,11 +517,11 @@
//Read newest 'limit' Data Sent from Address and containing 'keyword'
readSentDataContains: function (addr, keyword, limit = 1000) {
return new Promise((resolve, reject) => {
- this.readAllData(addr).then(items => {
+ this.readAllTxs(addr).then(items => {
var filteredItems = [];
for (i = 0; i < items.length && filteredItems.length < limit; i++)
if (items[i].vin[0].addr === addr && items[i].floData.includes(keyword))
- filteredItems.push(items[i]);
+ filteredItems.push(items[i].floData);
resolve(filteredItems);
}).catch(error => {
reject(error)