june/tera
1
0
Fork 0
forked from circlecloud/tera
Code Releases Activity

sync: sync upstream code

Browse Source 
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
MiaoWoo 2019-07-21 21:03:09 +08:00
parent 88bae3a4bd
commit ae1242686d
5 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/HTML/CSS/mobile-wallet.css
View File

@ -428,7 +428,8 @@ textarea {
.key-field__input {
width: 100%;
padding: 15px 15px 13px 14px;
/*padding: 15px 15px 13px 14px;*/
padding: 8px 15px 8px 14px;
margin: 10px 0 0;
border: 1px solid rgba(0, 0, 0, 0.1);
font-family: inherit;
@ -442,8 +443,10 @@ textarea {
line-height: 21px;
}
.key-field__input--enter {
padding-top: 20px;
padding-bottom: 18px;
/*padding-top: 20px;*/
/*padding-bottom: 18px;*/
padding-top: 10px;
padding-bottom: 8px;
}
.key-field__btn {
@ -488,7 +491,8 @@ textarea {
.key-field__select {
width: 100%;
border: 1px solid rgba(0, 0, 0, 0.1);
padding: 12px 15px;
/*padding: 12px 15px;*/
padding: 8px 8px;
margin-top: 5px;
background: #fff;
font-family: inherit;
@ -2773,7 +2777,7 @@ iframe
.btn--float
{
float: left;
width: 200px;
width: 220px;
margin: 10px;
}

26
src/HTML/JS/diagram.js
View File

@ -44,7 +44,7 @@ function SetHTMLDiagramItem(Item,width)
}
else
{
Str = '<BR><DIV>' + Item.text + '<INPUT type="button" class="delete" onclick="DeleteDiagram(\'' + Item.id + '\')" value="X"></DIV>\
Str = '<BR><DIV>' + Item.text + '<INPUT type="button" class="delete" onclick="DeleteDiagram(\'' + Item.id + '\')" value="X"></DIV>\
<BR><canvas class="DIAGRAM" width="' + width + '" height="' + MinHeight + '" id="' + Item.id + '"></canvas>';
}
var ElBlock = document.getElementById("B" + Item.id);
@ -100,13 +100,18 @@ function DrawDiagram(Item)
var arr = Item.arr;
if(!arr)
arr = Item.ArrList;
var arrX = Item.arrX;
var GreenValue = Item.value;
var StepTime = Item.steptime;
var StartNumber = Item.startnumber;
var StartServer = Item.starttime;
var mouseX = Item.mouseX;
var KPrecision = Item.KPrecision;
var CountNameX = Item.CountNameX;
if(!CountNameX)
CountNameX = 10;
var arrX = Item.arrX;
if(arrX && arrX.length)
CountNameX = arrX.length;
if(!KPrecision)
KPrecision = 1;
if(!arr)
@ -122,6 +127,18 @@ function DrawDiagram(Item)
else
ctx.fillStyle = "#FFF";
ctx.fillRect(0, 0, obj.width, obj.height);
var MaxWidth = obj.width - Left - Right;
if(arr.length > MaxWidth)
{
var K = arr.length / MaxWidth;
var arr2 = [];
for(var i = 0; i < MaxWidth; i++)
{
var i2 = Math.floor(i * K);
arr2[i] = arr[i2];
}
arr = arr2;
}
if(arr.length <= 0)
return ;
var Pow2 = 0;
@ -156,7 +173,7 @@ function DrawDiagram(Item)
var HValue = MaxValue;
if(HValue <= 0)
HValue = 1;
var KX = (obj.width - Left - Right) / arr.length;
var KX = (MaxWidth) / arr.length;
var KY = (obj.height - Top - Button) / HValue;
var DeltaY = 0;
var bLine = Item.line;
@ -315,10 +332,9 @@ function DrawLines(arr,mode,color)
ctx.strokeStyle = "#00F";
ctx.fillText(Rigth("          " + AvgValueText, 8), 0, yT + Top);
}
var CountNameX = 10;
if(arr.length < CountNameX)
CountNameX = arr.length;
var KX3 = (obj.width - Left - Right) / CountNameX;
var KX3 = (MaxWidth) / CountNameX;
var KDelitel = 1;
var Step = arr.length / CountNameX;
var StartTime, bNumber;

19
src/HTML/JS/mobile-wallet.js
View File

@ -676,13 +676,20 @@ function SetArrLog(arr)
}
CheckSending();
};
var DiagramArr = [{name:"MAX:ALL_NODES", text:"All nodes count", value:0, red:"#1d506b", MouseText:" nodes"}, {name:"MAX:HASH_RATE_B",
text:"HashRate, Tera hash/s", value:0, red:"#286b16", MathPow:2, MathDiv:1024 * 1024 * 1024 * 1024, KPrecision:10, NoTextMax:1,
MouseText:" T h/s"}, ];
var DiagramArr = [{name:"MAX:ALL_NODES", text:"All nodes count", value:0, red:"#1d506b", MouseText:" nodes", CountNameX:10},
{name:"MAX:HASH_RATE_B", text:"HashRate, Tera hash/s", value:0, red:"#286b16", MathPow:2, MathDiv:1024 * 1024 * 1024 * 1024,
KPrecision:10, NoTextMax:1, MouseText:" T h/s", CountNameX:10}, ];
function InitDiagram()
{
InitDiagramByArr(DiagramArr, 1120);
var width = 1120;
if(isMobile())
{
for(var i = 0; i < DiagramArr.length; i++)
DiagramArr[i].CountNameX = 4;
width = 320;
}
InitDiagramByArr(DiagramArr, width);
};
function ViewCounters(This)
@ -863,6 +870,10 @@ function OKSend()
SetDataUpdateTime(20);
CancelSend();
openModal('idSending');
setTimeout(function ()
{
closeModal();
}, 8 * 1000);
};
function CancelSend()

4
src/HTML/web-wallet.html
View File

@ -632,12 +632,12 @@
</form>
</section>
<section class="modal dapp-modal" id="idSending" onclick="closeModal()" style="display: none;">
<section class="modal dapp-modal" id="idSending" onclick="closeModal()" style="display: none; margin-top: 100px">
<h2 class="password-modal__title">Sending Tx</h2><BR>
<p class="password-modal__subtitle">Wait 5-8 sec, pls</p>
</section>
<section class="modal dapp-modal" id="idSmartEnter" style="display: none;">
<section class="modal dapp-modal" id="idSmartEnter" style="display: none; margin-top: 20px; padding: 20px">
<h2 class="password-modal__title"><span>Enter number of dapp</span></h2>
<p class="password-modal__subtitle">Enter the dapps number that will be added to your account. Attention make sure that you trust this dapp, otherwise you may lose all funds in this account.</p>

3
src/process/web-process.ts
View File

@ -98,7 +98,7 @@ global.STAT_MODE = 1;
setInterval(global.PrepareStatEverySecond, 1000);
var IndexName = "index.html";
if (global.HTTPS_HOSTING_DOMAIN) {
if (global.HTTPS_HOSTING_DOMAIN && global.HTTP_HOSTING_PORT === 443) {
var file_sert = global.GetDataPath("sertif.lst");
global.CheckCreateDir(global.GetDataPath("tmp"));
var greenlock = require('greenlock').create({
@ -322,6 +322,7 @@ function DoCommandNew(response, Type, Path, Params) {
break;
case "client":
global.DappClientCodeFile(response, ArrPath[1]);
break;
default:
{
var Name = ArrPath[ArrPath.length - 1];