Skip to content

Commit

Permalink
Current version as of 12/16/18
Browse files Browse the repository at this point in the history
  • Loading branch information
@AustinLeath
AustinLeath committed Dec 16, 2018
1 parent cfbcbb0 commit 8370d5b
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 143 deletions.
57 changes: 0 additions & 57 deletions home/assets/js/custommethod.js
View file

This file was deleted.

14 changes: 13 additions & 1 deletion home/assets/js/methodcustom.js
View file
Expand Up @@ -51,7 +51,19 @@ function matchcount1() {
} else if (f > 1) {
matchcount = " (&plusmn 1) matches to reach your rank goal";
} else {
matchcount = " (&plusmn 1) matches to reach your rank goal";
matchcount = " matches to reach your rank goal";
}
document.getElementById("matchcount1").innerHTML = matchcount;
}

function dontwinorlose1() {
var a = document.getElementById("winorlose1").innerHTML;

if (a == "You <b>do not</b> need to win or lose ") {
document.getElementById("result1").style.display = "none";
document.getElementById("anydiv1").innerHTML = "<b>any</b>";
} else {
document.getElementById("result1").style.display = "";
document.getElementById("anydiv1").innerHTML = "";
}
}
6 changes: 3 additions & 3 deletions home/assets/js/methodpreset.js
View file
Expand Up @@ -51,7 +51,7 @@ function matchcount() {
} else if (f > 1) {
matchcount = " (&plusmn 1) matches to reach your rank goal";
} else {
matchcount = " (&plusmn 1) matches to reach your rank goal";
matchcount = " matches to reach your rank goal";
}
document.getElementById("matchcount").innerHTML = matchcount;
}
Expand All @@ -60,9 +60,9 @@ function dontwinorlose() {

if (a == "You <b>do not</b> need to win or lose ") {
document.getElementById("result").style.display = "none";
document.getElementById("anydiv").innerHTML = "ANY";
document.getElementById("anydiv").innerHTML = "<b>any</b>";
} else {
document.getElementById("result").style.display = "";
document.getElementById("anydiv").style.display = "none";
document.getElementById("anydiv").innerHTML = "";
}
}
68 changes: 0 additions & 68 deletions home/assets/js/presetmethod.js
View file

This file was deleted.

16 changes: 14 additions & 2 deletions home/assets/js/primaryfunctions.js
View file
Expand Up @@ -57,7 +57,7 @@ var fullscreenmessage = false;

function checkKeyPressed(e) {
if (e.keyCode == 122) {
document.getElementById('exitfullscreenmessage').style.display = fullscreenmessage ? "block" : "none";
document.getElementById('exitfullscreenmessage').style.display = fullscreenmessage ? "none" : "block";
fullscreenmessage = !fullscreenmessage;
}
}
Expand Down Expand Up @@ -87,7 +87,7 @@ function checkelofill() {
document.getElementById("display").style.display = "none";
document.getElementById("eloerrormessage").style.display = "";
finalmessage = "Enter player ELO";
} else if ( x > 1000) {
} else if ( x > 500) {
document.getElementById("display").style.display = "none";
document.getElementById("eloerrormessage").style.display = "";
finalmessage = "Enter a valid ELO";
Expand Down Expand Up @@ -118,6 +118,10 @@ function checkmmrfill1() {
document.getElementById("display1").style.display = "none";
document.getElementById("mmrerrormessage1").style.display = "";
finalmessage = "Enter player MMR";
} else if ( x > 10000) {
document.getElementById("display1").style.display = "none";
document.getElementById("mmrerrormessage1").style.display = "";
finalmessage = "Enter a valid MMR";
} else {
document.getElementById("mmrerrormessage1").style.display = "none";
finalmessage = "MMR: OK";
Expand All @@ -131,6 +135,10 @@ function checkelofill1() {
document.getElementById("display1").style.display = "none";
document.getElementById("eloerrormessage1").style.display = "";
finalmessage = "Enter player ELO";
} else if ( x > 500) {
document.getElementById("display1").style.display = "none";
document.getElementById("eloerrormessage1").style.display = "";
finalmessage = "Enter a valid ELO";
} else {
document.getElementById("eloerrormessage1").style.display = "none";
finalmessage = "ELO: OK";
Expand All @@ -144,6 +152,10 @@ function checkgoalfill1() {
document.getElementById("display1").style.display = "none";
document.getElementById("goalerrormessage1").style.display = "";
finalmessage = "Select a rank from the dialogue above.";
} else if ( x > 10000) {
document.getElementById("display1").style.display = "none";
document.getElementById("goalerrormessage1").style.display = "";
finalmessage = "Enter a valid Goal";
} else {
document.getElementById("goalerrormessage1").style.display = "none";
finalmessage = "GOAL: OK";
Expand Down
24 changes: 12 additions & 12 deletions index.html
View file
Expand Up @@ -189,13 +189,10 @@
}
#playersearch {
width: 75%;
padding-top: 20%;
padding-top: 10%;
margin: auto;
display: block;
}
#psmodal {
left: 10%;
}
</style>
</head>
<body class="noselect" id="background">
Expand Down Expand Up @@ -223,7 +220,7 @@ <h1 id="cycletxt-5">Coming soon, R6RC for Mac!</h1>
</div>
<button class="button small btnalign" id="presetbtn" type="button" onclick="preset();customreset();disable();" disabled>Preset</button>
<button class="pagechangebtn button small btnalign" type="button" onclick="changelogpage();">View Changelog</button>
<!--<button class="button small btnalign" id="psmodal" type="button" onclick="playersearchpage();">Player Search</button>-->
<!--<button class="pagechangebtntlc button small btnalign" type="button" onclick="playersearchpage();">Player Search</button>-->
<button class="button small btnalign" id="custombtn" type="button" onclick="custom();presetreset();disable1();">Custom</button>
<a id="r6tabclick" href="https://r6tab.com"><img id="r6tab" src="home/images/r6tablogo.png" alt=""/></a>
<a id="twitterclick" href="https://twitter.com/R6RankCalc"><img id="twitterimg" src="home/images/twitter.png" alt=""/></a>
Expand All @@ -235,7 +232,7 @@ <h1 style="text-align: center;">Rainbow Six Siege | Rank Calculator (Preset Rank
<input type="number" name="mmr" id="mmr" min="1300" max="10000" value="" placeholder="Enter your current MMR" />
</div>
<div class="6u$ 12u$(xsmall)">
<input type="number" name="elo" id="elo" min="1" max="1000" value="" placeholder="Enter your current ELO per match" />
<input type="number" name="elo" id="elo" min="1" max="500" value="" placeholder="Enter your current ELO per match" />
</div>
<div class="12u$">
<div class="select-wrapper">
Expand Down Expand Up @@ -309,20 +306,21 @@ <h1 style="text-align: center;">Rainbow Six Siege | Rank Calculator (Custom Rank
</div>
<div class="12u$">
<div class="12u$">
<input id="goal1" name="goal1" type="number" min="1300" max="10000" placeholder="Enter a custom MMR Goal (between 1,300 MMR and 10,000 MMR)" value="" />
<input id="goal1" name="goal1" type="number" min="1300" max="10000" placeholder="Enter a custom MMR goal (between 1,300 MMR and 10,000 MMR)" value="" />
</div>
</div>
<div class="12u$">
<ul class="actions">
<li>
<input type="submit" value="Calculate" class="special" onclick="enable1();checkmmrfill1();checkelofill1();checkgoalfill1();winorlose1();matchcount1();">
<input type="submit" value="Calculate" class="special" onclick="enable1();checkmmrfill1();checkelofill1();checkgoalfill1();winorlose1();matchcount1();dontwinorlose1();">
</li>
<li>
<input type="reset" value="Reset" class="special" onclick="disable1();">
</li>
<li id="display1">
<a id="winorlose1"></a>
<a id="result1"></a>
<a id="anydiv1"></a>
<a id="matchcount1"></a>
</li>
<li id="errordialogue1">
Expand Down Expand Up @@ -360,8 +358,11 @@ <h1><strong>R6RC | Changelog</strong></h2>
<h1>VERSION 0.4.3 CHANGE NOTES</h1>
<ul>
<strong>CHANGES</strong>
<li><b>Added</b> a contributors page</li>
<li><b>Fixed</b> some problems with the equation filter for R6RC</li>
<li><b>Added</b> a contributors page!</li>
<li><b>Added</b> fullscreen mode! Press F11 to test it out</li>
<li><b>Added</b> a dialogue that lets the user know how to exit fullscreen mode</li>
<li><b>Fixed</b> those annoying yellow borders around all of the buttons</li>
<li><b>Improved</b> R6RC startup time</li>
</ul>
<ul>
<strong>COMING SOON</strong>
Expand Down Expand Up @@ -403,6 +404,7 @@ <h1>There are no other contributors! To contribute you must add to the repositor
</section>
</div>
<!-- Scripts -->
<script src="home/assets/js/primaryfunctions.js"></script>
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<!-- normal script imports etc -->
<script src="home/assets/js/jquery.min.js"></script>
Expand All @@ -413,7 +415,6 @@ <h1>There are no other contributors! To contribute you must add to the repositor
<script src="home/assets/js/switchmethod.js"></script>
<!--[if lte IE 8]><script src="home/assets/js/ie/respond.min.js"></script><![endif]-->
<script src="home/assets/js/main.js"></script>
<script src="home/assets/js/primaryfunctions.js"></script>
<script src="home/assets/js/methodpreset.js"></script>
<script src="home/assets/js/methodcustom.js"></script>
<script src="home/assets/js/externalopener.js"></script>
Expand All @@ -422,7 +423,6 @@ <h1>There are no other contributors! To contribute you must add to the repositor
<script src="home/assets/react/react.js"></script>
<script src="home/assets/react/react-dom.js"></script>
<script src="home/assets/react/timeran.js"></script>

<script>
function showHint(str) {
if (str.length == 0) {
Expand Down
2 changes: 2 additions & 0 deletions main.js
View file
Expand Up @@ -245,11 +245,13 @@ if (process.platform === 'darwin') {
accelerator: 'Control+M',
role: 'minimize'
},
/*
{
label: 'Reload',
accelerator: 'Control+R',
role: 'reload'
},
*/
{
label: 'Close',
role: 'close'
Expand Down

0 comments on commit 8370d5b

Please sign in to comment.