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

minor polishing, small bug fixes

Browse Source
This commit is contained in:
Kenneth Jao 2017-02-09 10:26:22 -05:00
parent 07e62b42ff
commit ae8172e7bc
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hourglass/client/main/main.css
View File

@ -799,6 +799,7 @@ textarea.clickModify {
} }
#workComments h3 { #workComments h3 {
font-weight: 400;
margin-bottom: 2%; margin-bottom: 2%;
-webkit-filter: none; -webkit-filter: none;
filter: none; filter: none;
@ -963,7 +964,7 @@ textarea.clickModify {
} }
.fc-left h2 { .fc-left h2 {
font-weight: 400; font-weight: 100;
-webkit-filter: none; -webkit-filter: none;
filter: none; filter: none;

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

@ -40,6 +40,11 @@ Template.login.rendered = function() {
Template.main.created = function() { Template.main.created = function() {
Session.set("mode", Session.get("user").preferences.mode); Session.set("mode", Session.get("user").preferences.mode);
Session.set("classInfo", null); Session.set("classInfo", null);
/*if (Notification.permission !== "granted") {
Notification.requestPermission().then(function(result) {
});
}*/
} }
Template.main.rendered = function() { Template.main.rendered = function() {
@ -325,6 +330,9 @@ Template.main.events({
$(".overlay").fadeOut(150); $(".overlay").fadeOut(150);
if (!Session.get("newWork")) { if (!Session.get("newWork")) {
document.getElementById("workComment").value = ""; document.getElementById("workComment").value = "";
var res = Session.get("restrictText");
res[Object.keys(res)[0]] = "";
Session.set("restrictText", res);
} }
} }
@ -468,8 +476,7 @@ Template.main.events({
}, },
// HANDLING INPUT CHANGING // HANDLING INPUT CHANGING
'focus .clickModify' (event) { 'focus .clickModify' (event) {
$(".optionHolder") toggleOptionMenu(false, modifyingInput);
.fadeOut(100);
if(modifyingInput !== null) { if(modifyingInput !== null) {
if(!$("#"+modifyingInput)[0].className.includes("dropdown")) closeInput(modifyingInput); if(!$("#"+modifyingInput)[0].className.includes("dropdown")) closeInput(modifyingInput);
@ -481,6 +488,16 @@ Template.main.events({
event.target.style.backgroundColor = "rgba(0,0,0,0.1)"; event.target.style.backgroundColor = "rgba(0,0,0,0.1)";
} }
}, },
'keydown #wName' (event) {
if(event.keyCode === 13) {
closeInput(modifyingInput);
event.target.blur();
}
},
'focus #workComment' () {
toggleOptionMenu(false, modifyingInput);
modifyingInput = null;
},
'keydown .dropdown' (event) { 'keydown .dropdown' (event) {
var first = $("#"+modifyingInput).next().children("p:first-child"); var first = $("#"+modifyingInput).next().children("p:first-child");
var last = $("#"+modifyingInput).next().children("p:last-child"); var last = $("#"+modifyingInput).next().children("p:last-child");
@ -1029,3 +1046,7 @@ function calendarEvents(array) {
} }
Session.set("calendarEvents", events); Session.set("calendarEvents", events);
} }
function notifyMe() {
}