Skip to content
Permalink
Browse files

Merge pull request #2 from loon3/web

merge 0.2.8
  • Loading branch information...
loon3 committed May 13, 2019
2 parents 8e45489 + 3f928ee commit 300d95290641e3316a21db0de35d27199dae48d3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -7,7 +7,7 @@ function pageCreateManage(address){

var source_html = "https://xchain.io/api/issuances/"+address
var collection = ""
var cardImage
var cardImage, cardDivisible
var assetArray = []

$.getJSON( source_html, function( data ) {
@@ -21,7 +21,7 @@ function pageCreateManage(address){

for(var i=0; i < data.data.length; i++){

if(assetArray.indexOf(data.data[i]['asset']) == -1){
if(assetArray.indexOf(data.data[i]['asset']) == -1 && data.data[i]['description'] != "LOCK"){

assetArray.push(data.data[i]['asset']);

@@ -38,11 +38,13 @@ function pageCreateManage(address){
cardAlias = descArray[1]
}
}

cardDivisible = data.data[i]['divisible']

if(data.data[i]['locked']){
var lockedButton = "<button type='button' class='btn btn-info btn-block asset-lock-button' disabled><i class='fa fa-lock' aria-hidden='true'></i> Locked</button>"
} else {
var lockedButton = "<button type='button' class='btn btn-info btn-block asset-lock-button' data-asset='"+data.data[i]['asset']+"' data-alias='"+cardAlias+"'><i class='fa fa-unlock' aria-hidden='true'></i> Unlocked</button>"
var lockedButton = "<button type='button' class='btn btn-info btn-block asset-lock-button' data-asset='"+data.data[i]['asset']+"' data-alias='"+cardAlias+"' data-divisible='"+cardDivisible+"'><i class='fa fa-unlock' aria-hidden='true'></i> Unlocked</button>"
}

if(anchors[data.data[i]['asset']]){
@@ -27,5 +27,5 @@
"manifest_version": 2,
"name": "Freeport",
"short_name": "freeport",
"version": "0.2.7"
"version": "0.2.8"
}
@@ -32,3 +32,5 @@ v0.2.5 - Allow spending from unspent UTXOs
v0.2.6 - Link Twitter username to address

v0.2.7 - UX improvement, update Twitter link method

v0.2.8 - Fix lock divisible asset bug

0 comments on commit 300d952

Please sign in to comment.
You can’t perform that action at this time.