temp screen lock and wait till swap detail dialog shows up, light theme enable option activated again, version bump

This commit is contained in:
satindergrewal 2017-12-15 01:10:44 +13:00
parent aa712db777
commit d88fe9a564
8 changed files with 22 additions and 5 deletions

2
gui/css/HoldOn.min.css vendored Executable file

File diff suppressed because one or more lines are too long

View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<title>BarterDEX - v0.7.5-beta</title>
<title>BarterDEX - v0.7.6-beta</title>
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" type="text/css" rel="stylesheet" id="bright_css_style">
@ -21,6 +21,7 @@
<link href="css/spinner.css" type="text/css" rel="stylesheet">
<link href="js/fa/css/font-awesome.min.css" type="text/css" rel="stylesheet">
<link href="css/jquery.mCustomScrollbar.min.css" type="text/css" rel="stylesheet">
<link href="css/HoldOn.min.css" type="text/css" rel="stylesheet">
<link href="css/charts/StockChartX.min.css" type="text/css" rel="stylesheet">
<link href="css/charts/StockChartX.UI.min.css" type="text/css" rel="stylesheet">
@ -809,6 +810,7 @@
<script src="js/countdown.min.js" type="text/javascript"></script>
<script src="js/jquery.mCustomScrollbar.concat.min.js" type="text/javascript"></script>
<script src="js/jquery.marquee.min.js" type="text/javascript"></script>
<script src="js/HoldOn.min.js" type="text/javascript"></script>
<!-- Crypto Dependencies -->
<script src="js/wordlist.js" type="text/javascript"></script>
<script src="js/passphrasegenerator.js" type="text/javascript"></script>

2
gui/js/HoldOn.min.js vendored Executable file
View File

@ -0,0 +1,2 @@
(function(b){function a(){if("undefined"==typeof jQuery){throw new Error("HoldOn.js requires jQuery")}var c={};c.open=function(e){$("#holdon-overlay").remove();var h="sk-rect";var g="";var f="";if(e){if(e.hasOwnProperty("theme")){h=e.theme}if(e.hasOwnProperty("message")){f=e.message}}switch(h){case"custom":g='<div style="text-align: center;">'+e.content+"</div>";break;case"sk-dot":g='<div class="sk-dot"> <div class="sk-dot1"></div> <div class="sk-dot2"></div> </div>';break;case"sk-rect":g='<div class="sk-rect"> <div class="rect1"></div> <div class="rect2"></div> <div class="rect3"></div> <div class="rect4"></div> <div class="rect5"></div> </div>';break;case"sk-cube":g='<div class="sk-cube"> <div class="sk-cube1"></div> <div class="sk-cube2"></div> </div>';break;case"sk-bounce":g='<div class="sk-bounce"> <div class="bounce1"></div> <div class="bounce2"></div> <div class="bounce3"></div> </div>';break;case"sk-circle":g='<div class="sk-circle"> <div class="sk-circle1 sk-child"></div> <div class="sk-circle2 sk-child"></div> <div class="sk-circle3 sk-child"></div> <div class="sk-circle4 sk-child"></div> <div class="sk-circle5 sk-child"></div> <div class="sk-circle6 sk-child"></div> <div class="sk-circle7 sk-child"></div> <div class="sk-circle8 sk-child"></div> <div class="sk-circle9 sk-child"></div> <div class="sk-circle10 sk-child"></div> <div class="sk-circle11 sk-child"></div> <div class="sk-circle12 sk-child"></div> </div>';break;case"sk-cube-grid":g='<div class="sk-cube-grid"> <div class="sk-cube-child sk-cube-grid1"></div> <div class="sk-cube-child sk-cube-grid2"></div> <div class="sk-cube-child sk-cube-grid3"></div> <div class="sk-cube-child sk-cube-grid4"></div> <div class="sk-cube-child sk-cube-grid5"></div> <div class="sk-cube-child sk-cube-grid6"></div> <div class="sk-cube-child sk-cube-grid7"></div> <div class="sk-cube-child sk-cube-grid8"></div> <div class="sk-cube-child sk-cube-grid9"></div> </div>';break;case"sk-folding-cube":g='<div class="sk-folding-cube"> <div class="sk-cubechild1 sk-cube-parent"></div> <div class="sk-cubechild2 sk-cube-parent"></div> <div class="sk-cubechild4 sk-cube-parent"></div> <div class="sk-cubechild3 sk-cube-parent"></div> </div>';break;case"sk-fading-circle":g='<div class="sk-fading-circle"> <div class="sk-fading-circle1 sk-circle-child"></div> <div class="sk-fading-circle2 sk-circle-child"></div> <div class="sk-fading-circle3 sk-circle-child"></div> <div class="sk-fading-circle4 sk-circle-child"></div> <div class="sk-fading-circle5 sk-circle-child"></div> <div class="sk-fading-circle6 sk-circle-child"></div> <div class="sk-fading-circle7 sk-circle-child"></div> <div class="sk-fading-circle8 sk-circle-child"></div> <div class="sk-fading-circle9 sk-circle-child"></div> <div class="sk-fading-circle10 sk-circle-child"></div> <div class="sk-fading-circle11 sk-circle-child"></div> <div class="sk-fading-circle12 sk-circle-child"></div> </div>';break;default:g='<div class="sk-rect"> <div class="rect1"></div> <div class="rect2"></div> <div class="rect3"></div> <div class="rect4"></div> <div class="rect5"></div> </div>';console.warn(h+" doesn't exist for HoldOn.js");break}var d='<div id="holdon-overlay" style="display: none;">\n <div id="holdon-content-container">\n <div id="holdon-content">'+g+'</div>\n <div id="holdon-message">'+f+"</div>\n </div>\n </div>";$(d).appendTo("body").fadeIn(300);if(e){if(e.backgroundColor){$("#holdon-overlay").css("backgroundColor",e.backgroundColor)}if(e.backgroundColor){$("#holdon-message").css("color",e.textColor)}}};c.close=function(){$("#holdon-overlay").fadeOut(300,function(){$(this).remove()})};return c}if(typeof(HoldOn)==="undefined"){b.HoldOn=a()}})(window);

View File

@ -751,7 +751,7 @@ if(i.mouseEventsEnabled&&(!n&&!o&&r&&0<r.length&&(o=r[r.length-1],n=o.pageX,o=o.
else if(t.msToBlob)navigator.msSaveBlob(t.msToBlob(),"Chart.png")
else{t=t.toDataURL().replace(/^data:image\/[^;]/,"data:application/octet-stream")
var i=document.createElement("a")
i.download="Chart.png",i.href=t,document.body.appendChild(i),i.click(),document.body.removeChild(i)}}})},n.prototype._loadOptionsState=function(t){t=t||{},this._options={theme:t.theme||e.Theme.Dark,locale:t.locale||"en-US",enableKeyboardEvents:void 0===t.enableKeyboardEvents||!!t.enableKeyboardEvents,enableMouseEvents:void 0===t.enableMouseEvents||!!t.enableMouseEvents,showBarInfoInTitle:void 0===t.showBarInfoInTitle||!!t.showBarInfoInTitle,priceStyle:e.CandlePriceStyle.className}},n.prototype._layoutHtmlElements=function(e,t){this._container.addClass("scxRootContainer"),this._rootDiv=this._container.scxAppend("div","scxContainer").addClass("scxUnSelective").width(e).height(t),this._rootDiv.scxAppend("div","scxBackground").width(e).height(t)},n.prototype._applyTheme=function(){var e=this.theme,t=e.chart
i.download="Chart.png",i.href=t,document.body.appendChild(i),i.click(),document.body.removeChild(i)}}})},n.prototype._loadOptionsState=function(t){t=t||{},this._options={theme:t.theme||e.Theme.Light,locale:t.locale||"en-US",enableKeyboardEvents:void 0===t.enableKeyboardEvents||!!t.enableKeyboardEvents,enableMouseEvents:void 0===t.enableMouseEvents||!!t.enableMouseEvents,showBarInfoInTitle:void 0===t.showBarInfoInTitle||!!t.showBarInfoInTitle,priceStyle:e.CandlePriceStyle.className}},n.prototype._layoutHtmlElements=function(e,t){this._container.addClass("scxRootContainer"),this._rootDiv=this._container.scxAppend("div","scxContainer").addClass("scxUnSelective").width(e).height(t),this._rootDiv.scxAppend("div","scxBackground").width(e).height(t)},n.prototype._applyTheme=function(){var e=this.theme,t=e.chart
this._applyChartBackground(t.background),t=t.border,this._container.find(".scxContainer").css("border",t.width+"px "+t.lineStyle+" "+t.strokeColor),this._valueMarker.theme=e.valueScale.valueMarker,this._dateMarker.theme=e.dateScale.dateMarker},n.prototype._applyChartBackground=function(t){var i=this._container.find(".scxBackground")
if(Array.isArray(t)){if(0===t.length)throw Error("Invalid theme: 'background' must be a color or array of colors.")
1===t.length?e.HtmlUtil.setBackgroundColor(i,t[0]):e.HtmlUtil.setGradientBackground(i,t)}else e.HtmlUtil.setBackgroundColor(i,t)},n.prototype._subscribeEvents=function(){this._rootDiv.on("mouseenter mouseleave mousedown mousemove mouseup click dblclick mousewheel DOMMouseScroll contextmenu touchstart touchmove touchend ".split(" ").join(".scx, "),this,this._handleMouseEvents),t(window).on("resize.scx",this,this._handleWindowResize).on("keydown.scx",this,this._handleKeyDown)},n.prototype._updateHoverRecord=function(t){(t=this._dateScale.projection.recordByX(t))!=this._hoverRecord&&(this._hoverRecord=t,this.fireValueChanged(e.ChartEvent.HOVER_RECORD_CHANGED,t))},n.prototype._handleFullWindowResize=function(){this._container.outerWidth(window.innerWidth-3).outerHeight(window.innerHeight-3),this.size={width:this._container.innerWidth()-1,height:this._container.innerHeight()-this._rootDiv.position().top-1},this.setNeedsUpdate()},n.prototype.barDataSeries=function(){return this._dataManager.barDataSeries()},n.prototype.getCommonDataSeries=function(){return this.barDataSeries()},n.prototype.addDataSeries=function(e,t){return this._dataManager.addDataSeries(e,t)},n.prototype.removeDataSeries=function(e){this._dataManager.removeDataSeries(e)},n.prototype.clearDataSeries=function(e){this._dataManager.clearDataSeries(e)

View File

@ -289,7 +289,7 @@ $('.dexsettings-btn').click(function(e){
<div class="input-group col-sm-2" style="margin: 10px 0;">
<select class="selectpicker settings_theme_select" data-hide-disabled="true" data-width="30%">
<option data-content="Dark Theme" data-tokens="Dark Theme">dark</option>
<!--<option data-content="Light Theme" data-tokens="Light Theme">light</option>-->
<option data-content="Light Theme" data-tokens="Light Theme">light</option>
</select>
</div>`,
closeButton: false,

View File

@ -4501,6 +4501,15 @@ $('.exchange_swap_status_tbl tbody').on('click', '.swapstatus_details', function
function check_swap_status_details(swap_status_data) {
console.log(swap_status_data);
var options_holdon = {
theme:"sk-bounce",
message:'Please wait while getting swap status detail data...',
//backgroundColor:"#1847B1",
textColor:"white"
};
HoldOn.open(options_holdon);
var requestid = swap_status_data.requestid;
var quoteid = swap_status_data.quoteid;
var userpass = sessionStorage.getItem('mm_userpass');
@ -4516,6 +4525,7 @@ function check_swap_status_details(swap_status_data) {
url: url
}).done(function(swap_status_output_data) {
// If successful
HoldOn.close();
console.log(swap_status_output_data);
if (!swap_status_output_data.error === false) {
@ -4807,6 +4817,7 @@ function check_swap_status_details(swap_status_data) {
}).fail(function(jqXHR, textStatus, errorThrown) {
// If fail
HoldOn.close();
console.log(textStatus + ': ' + errorThrown);
});
}

View File

@ -20,7 +20,7 @@ const killmm = require('./ipc/killmm');
const appBasicInfo = {
name: 'BarterDEX',
version: '0.7.5-beta'
version: '0.7.6-beta'
};
app.setName(appBasicInfo.name);

View File

@ -1,6 +1,6 @@
{
"name": "BarterDEX",
"version": "0.7.5-beta",
"version": "0.7.6-beta",
"description": "Full BarterDEX implimentation with powertools for Traders",
"main": "main.js",
"scripts": {