From b649ae0a1e4d0288a51159203ee741c4a61a0475 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 27 Oct 2017 17:54:56 +0900 Subject: [PATCH] fix linter issues --- BTCPayServer/wwwroot/css/creative.css | 4 ---- BTCPayServer/wwwroot/js/core.js | 16 ++++++++-------- .../vendor/bootstrap/css/bootstrap-grid.css | 4 +--- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/BTCPayServer/wwwroot/css/creative.css b/BTCPayServer/wwwroot/css/creative.css index f4442105f..4e655477d 100644 --- a/BTCPayServer/wwwroot/css/creative.css +++ b/BTCPayServer/wwwroot/css/creative.css @@ -188,10 +188,6 @@ body { #mainNav.navbar-shrink .navbar-nav > li.nav-item > a.nav-link:focus { color: white; } - - #mainNav.navbar-shrink .navbar-nav > li.nav-item > a.nav-link:hover, - #mainNav.navbar-shrink .navbar-nav > li.nav-item > a.nav-link:focus:hover { - } } header.masthead { diff --git a/BTCPayServer/wwwroot/js/core.js b/BTCPayServer/wwwroot/js/core.js index 4627f3da0..1ca1cabb1 100644 --- a/BTCPayServer/wwwroot/js/core.js +++ b/BTCPayServer/wwwroot/js/core.js @@ -148,14 +148,14 @@ onDataCallback(srvModel); function onDataCallback(jsonData) { var newStatus = jsonData.status; - if (newStatus == "complete" || - newStatus == "confirmed" || - newStatus == "paid") { + if (newStatus === "complete" || + newStatus === "confirmed" || + newStatus === "paid") { if ($(".modal-dialog").hasClass("expired")) { $(".modal-dialog").removeClass("expired"); } - if (srvModel.merchantRefLink != "") { + if (srvModel.merchantRefLink !== "") { $(".action-button").click(function () { window.location.href = srvModel.merchantRefLink; }); @@ -174,7 +174,7 @@ function onDataCallback(jsonData) { $("#paid").addClass("active"); } - if (newStatus == "expired" || newStatus == "invalid") { //TODO: different state if the invoice is invalid (failed to confirm after timeout) + if (newStatus === "expired" || newStatus === "invalid") { //TODO: different state if the invoice is invalid (failed to confirm after timeout) $(".timer-row").removeClass("expiring-soon"); $(".timer-row__message span").html("Invoice expired."); $(".timer-row__spinner").html(""); @@ -183,7 +183,7 @@ function onDataCallback(jsonData) { $("#expired").addClass("active"); } - if (checkoutCtrl.srvModel.status != newStatus) { + if (checkoutCtrl.srvModel.status !== newStatus) { window.parent.postMessage({ "invoiceId": srvModel.invoiceId, "status": newStatus }, "*"); } @@ -259,7 +259,7 @@ function progressStart(timerMax) { var timeDiff = end.getTime() - now.getTime(); var perc = 100 - Math.round((timeDiff / timerMax) * 100); - if (perc === 75 && (status == "paidPartial" || status == "new")) { + if (perc === 75 && (status === "paidPartial" || status === "new")) { $(".timer-row").addClass("expiring-soon"); $(".timer-row__message span").html("Invoice expiring soon ..."); updateProgress(perc); @@ -268,7 +268,7 @@ function progressStart(timerMax) { updateProgress(perc); setTimeout(animateUpdate, timeoutVal); } - if (perc >= 100 && status == "expired") { + if (perc >= 100 && status === "expired") { onDataCallback(status); } } diff --git a/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap-grid.css b/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap-grid.css index 1bee2b820..d429637dd 100644 --- a/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap-grid.css +++ b/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap-grid.css @@ -1,6 +1,4 @@ -@-ms-viewport { - width: device-width; -} + html { box-sizing: border-box;