diff --git a/js/oper.js b/js/oper.js index 701b4bd..2115a25 100644 --- a/js/oper.js +++ b/js/oper.js @@ -243,8 +243,18 @@ $('#search').click(function () { var resourceList = searchData[i].item.resourceList; for(var j=0;j < resourceList.length;j++){ var restype = resourceList[j].type.slice(0,5); + var resexlink = resourceList[j].externalLink + var resLink = '' + if(resexlink){ + resLink = resexlink + }else{ + resLink = info.apiUrl.replace(/api\/memo.*/,'')+'o/r/'+resourceList[j].id+'/'+resourceList[j].filename + } if(restype == 'image'){ - searchDom += '' + searchDom += '' + } + if(restype !== 'image'){ + searchDom += ''+resourceList[j].filename+'' } } } @@ -309,8 +319,18 @@ function randDom(randomData){ var resourceList = randomData.resourceList; for(var j=0;j < resourceList.length;j++){ var restype = resourceList[j].type.slice(0,5); + var resexlink = resourceList[j].externalLink + var resLink = '' + if(resexlink){ + resLink = resexlink + }else{ + resLink = info.apiUrl.replace(/api\/memo.*/,'')+'o/r/'+resourceList[j].id+'/'+resourceList[j].filename + } if(restype == 'image'){ - randomDom += '' + randomDom += '' + } + if(restype !== 'image'){ + randomDom += ''+resourceList[j].filename+'' } } }