kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed small display bug, removed unnecessary code

Browse Source
This commit is contained in:
Kenneth Jao 2016-08-28 14:45:35 -04:00
parent 073db86deb
commit f6449ffe0c
2 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hourglass/client/main/main.html
View File

@ -47,8 +47,8 @@
<div id="prefCont"> <div id="prefCont">
<div> <div>
<div class="inputRadioPref"> <div class="inputRadioPref">
<span class="prefTitle">Theme:</span><br> <p class="prefTitle">Theme:</p>
<span class="change radio" opc="0" op="0" re="readonly" id="prefTheme">{{pref 'theme'}}</span> <span class="change radio" re="readonly" id="prefTheme">{{pref 'theme'}}</span>
</div> </div>
<div class="prefOptions" style="background-color:{{divColor 'header'}}"> <div class="prefOptions" style="background-color:{{divColor 'header'}}">
<p class="prefOptionText">Light</p> <p class="prefOptionText">Light</p>
@ -57,8 +57,8 @@
</div> </div>
<div> <div>
<div class="inputRadioPref"> <div class="inputRadioPref">
<span class="prefTitle">Default Mode:</span><br> <p class="prefTitle">Default Mode:</p>
<span class="change radio" opc="1" op="1" re="readonly" id="prefMode">{{pref 'mode'}}</span> <span class="change radio" re="readonly" id="prefMode">{{pref 'mode'}}</span>
</div> </div>
<div class="prefOptions" style="background-color:{{divColor 'header'}}"> <div class="prefOptions" style="background-color:{{divColor 'header'}}">
<p class="prefOptionText">Classes</p> <p class="prefOptionText">Classes</p>
@ -67,8 +67,8 @@
</div> </div>
<div> <div>
<div class="inputRadioPref"> <div class="inputRadioPref">
<span class="prefTitle">Hide Homework:</span><br> <p class="prefTitle">Hide Homework:</p>
<span class="change radio" opc="2" op="2" re="readonly" id="prefHide">{{pref 'timeHide'}}</span> <span class="change radio" re="readonly" id="prefHide">{{pref 'timeHide'}}</span>
</div> </div>
<div class="prefOptions" style="background-color:{{divColor 'header'}}"> <div class="prefOptions" style="background-color:{{divColor 'header'}}">
<p class="prefOptionText">1 Day</p> <p class="prefOptionText">1 Day</p>
@ -118,7 +118,7 @@
<div> <div>
<div class="inputRadio"> <div class="inputRadio">
<span class="workTitle">Type:</span> <span class="workTitle">Type:</span>
<span class="change radio req" opc="0" op="0" re="readonly" id="workType">{{work 'type'}}</span> <span class="change radio req" re="readonly" id="workType">{{work 'type'}}</span>
</div> </div>
<div class="workOptions type" style="background-color:{{divColor 'header'}}"> <div class="workOptions type" style="background-color:{{divColor 'header'}}">
<p class="workOptionText">Normal</p> <p class="workOptionText">Normal</p>
@ -154,7 +154,7 @@
</div> </div>
</div> </div>
<div id="workToggle"> <div id="workToggle">
</div> </div>
{{#if newWork}} {{#if newWork}}
{{#if inRole}} {{#if inRole}}

39
hourglass/client/main/main.js
View File

@ -68,8 +68,6 @@ Session.set("newWork",null);
Session.set("currentWork",null); Session.set("currentWork",null);
Session.set("currentReadableWork",null); Session.set("currentReadableWork",null);
Session.set("modifying",null); Session.set("modifying",null);
Session.set("radioDiv",null);
Session.set("radioOffset",null);
Session.set("serverData",null); Session.set("serverData",null);
Session.set("noclass",null); Session.set("noclass",null);
Session.set("calCreWork",null); Session.set("calCreWork",null);
@ -465,6 +463,15 @@ Template.main.events({
'click' (event) { 'click' (event) {
var e = event.target.className; var e = event.target.className;
var sessval = Session.get("modifying"); var sessval = Session.get("modifying");
if (event.target.id !== sessval &&
event.target.id !== sessval + "a" &&
!Session.equals("modifying", null) &&
!event.target.parentNode.className.includes("workOptions") &&
!event.target.parentNode.className.includes("prefOptions")) {
closeInput(sessval);
}
if (e !== Session.get("sidebar") && if (e !== Session.get("sidebar") &&
!e.includes("fa-cog") && !e.includes("fa-cog") &&
!e.includes("fa-bars") && !e.includes("fa-bars") &&
@ -491,16 +498,7 @@ Template.main.events({
} }
if (event.target.id !== sessval &&
event.target.id !== sessval + "a" &&
!Session.equals("modifying", null) &&
!event.target.parentNode.className.includes("workOptions") &&
!event.target.parentNode.className.includes("prefOptions")) {
closeInput(sessval);
}
if (!event.target.className.includes("radio") && if (!event.target.className.includes("radio") &&
!Session.equals("radioDiv", null) &&
!event.target.parentNode.className.includes("workOptions") && !event.target.parentNode.className.includes("workOptions") &&
!event.target.parentNode.className.includes("prefOptions") && !event.target.parentNode.className.includes("prefOptions") &&
event.target.readOnly !== true) { event.target.readOnly !== true) {
@ -509,14 +507,11 @@ Template.main.events({
} else { } else {
var radio = "workOptions"; var radio = "workOptions";
} }
var opnum = parseInt(Session.get("radioDiv")) - parseInt(Session.get("radioOffset"));
for (var i = 0; i < document.getElementsByClassName(radio).length; i++) { for (var i = 0; i < document.getElementsByClassName(radio).length; i++) {
try { try {
closeDivFade(document.getElementsByClassName(radio)[i]); closeDivFade(document.getElementsByClassName(radio)[i]);
} catch (err) {} } catch (err) {}
} }
Session.set("radioDiv", null);
Session.set("radioOffset", null);
} }
}, },
'click .creWork' (event) { 'click .creWork' (event) {
@ -610,8 +605,6 @@ Template.main.events({
} }
var op = event.target; var op = event.target;
Session.set("radioDiv", op.getAttribute("op"));
Session.set("radioOffset", op.getAttribute("opc"));
if(Session.equals("sidebar","optionsContainer") || Session.equals("sidebar","both")) { if(Session.equals("sidebar","optionsContainer") || Session.equals("sidebar","both")) {
var radio = "prefOptions"; var radio = "prefOptions";
} else { } else {
@ -620,18 +613,17 @@ Template.main.events({
try { try {
for (var i = 0; i < document.getElementsByClassName(radio).length; i++) { for (var i = 0; i < document.getElementsByClassName(radio).length; i++) {
var curr = document.getElementsByClassName(radio)[i]; var curr = document.getElementsByClassName(radio)[i];
if (Session.get("radioDiv") !== i.toString()) { if(curr.childNodes[1] !== op.parentNode.parentNode.childNodes[3].childNodes[1]) {
closeDivFade(document.getElementsByClassName(radio)[i]); closeDivFade(document.getElementsByClassName(radio)[i]);
} }
} }
} catch (err) {} } catch (err) {}
openDivFade(document.getElementsByClassName(radio)[op.getAttribute("op")]); openDivFade(op.parentNode.parentNode.childNodes[3]);
}, },
'click .workOptionText' (event) { 'click .workOptionText' (event) {
var sessval = Session.get("modifying"); var sessval = Session.get("modifying");
var p = event.target; var p = event.target;
var opnum = parseInt(Session.get("radioDiv")) - parseInt(Session.get("radioOffset")); var input = p.parentNode.parentNode.childNodes[1].childNodes[5];
var input = document.getElementsByClassName("op")[opnum];
input.value = p.childNodes[0].nodeValue; input.value = p.childNodes[0].nodeValue;
try { try {
closeInput(sessval); closeInput(sessval);
@ -639,14 +631,11 @@ Template.main.events({
closeDivFade(p.parentNode); closeDivFade(p.parentNode);
input.focus(); input.focus();
Session.set("radioDiv", null);
Session.set("radioOffset", null);
}, },
'click .prefOptionText' (event) { 'click .prefOptionText' (event) {
var sessval = Session.get("modifying"); var sessval = Session.get("modifying");
var p = event.target; var p = event.target;
var opnum = parseInt(Session.get("radioDiv")) - parseInt(Session.get("radioOffset")); var input = p.parentNode.parentNode.childNodes[1].childNodes[5];
var input = document.getElementsByClassName("op")[opnum];
input.value = p.childNodes[0].nodeValue; input.value = p.childNodes[0].nodeValue;
try { try {
closeInput(sessval); closeInput(sessval);
@ -654,8 +643,6 @@ Template.main.events({
closeDivFade(p.parentNode); closeDivFade(p.parentNode);
input.focus(); input.focus();
Session.set("radioDiv", null);
Session.set("radioOffset", null);
}, },
'keydown' (event) { 'keydown' (event) {
var sessval = Session.get("modifying"); var sessval = Session.get("modifying");