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

minor fixes

Browse Source
This commit is contained in:
Kenneth Jao 2016-10-18 16:27:42 -04:00
parent 81dc4a1b75
commit 85f9b4798e
3 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -706,7 +706,6 @@ Template.main.events({
} }
}, },
'keydown .dropdown' (event) { 'keydown .dropdown' (event) {
event.preventDefault();
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");
var next = $(".selectedOption").next(); var next = $(".selectedOption").next();
@ -714,6 +713,7 @@ Template.main.events({
var lastSel = $(".selectedOption"); var lastSel = $(".selectedOption");
if (event.keyCode === 38) { if (event.keyCode === 38) {
event.preventDefault();
if (lastSel === undefined) { if (lastSel === undefined) {
last.addClass("selectedOption"); last.addClass("selectedOption");
} else { } else {
@ -726,6 +726,7 @@ Template.main.events({
} }
} }
} else if (event.keyCode === 40) { } else if (event.keyCode === 40) {
event.preventDefault();
if (lastSel === undefined) { if (lastSel === undefined) {
first.addClass("selectedOption"); first.addClass("selectedOption");
last.removeClass("selectedOption"); last.removeClass("selectedOption");

2
hourglass/client/profile/profile.js
View File

@ -478,6 +478,7 @@ Template.profile.events({
var lastSel = $(".selectedOption"); var lastSel = $(".selectedOption");
if (event.keyCode === 38) { if (event.keyCode === 38) {
event.preventDefault();
if (lastSel === undefined) { if (lastSel === undefined) {
last.addClass("selectedOption"); last.addClass("selectedOption");
} else { } else {
@ -490,6 +491,7 @@ Template.profile.events({
} }
} }
} else if (event.keyCode === 40) { } else if (event.keyCode === 40) {
event.preventDefault();
if (lastSel === undefined) { if (lastSel === undefined) {
first.addClass("selectedOption"); first.addClass("selectedOption");
last.removeClass("selectedOption"); last.removeClass("selectedOption");

52
hourglass/lib/constants.js
View File

@ -21,10 +21,10 @@ themeColors = {
"classCardColor":"#46396E", "classCardColor":"#46396E",
"textColor": "#F6F6F6" "textColor": "#F6F6F6"
}, },
"requox": { "requom": {
"background": "RedBlack.jpg", "background": "RedBlack.jpg",
"mainColor": "#302c36", "mainColor": "#302C36",
"secondaryColor": "#C51313", "secondaryColor": "#B93A3A",
"sidebarColor": "#327C5A", "sidebarColor": "#327C5A",
"userDropdownColor": "#CC3333", "userDropdownColor": "#CC3333",
"iconHighlight": "#327C5A", "iconHighlight": "#327C5A",
@ -34,36 +34,36 @@ themeColors = {
}, },
"aequor": { "aequor": {
"background": "Sea.jpg", "background": "Sea.jpg",
"mainColor": "#1e926c", "mainColor": "#1E926C",
"secondaryColor": "#1c564f", "secondaryColor": "#1C564F",
"sidebarColor": "#3cb08a", "sidebarColor": "#3CB08A",
"userDropdownColor": "#2ea96a", "userDropdownColor": "#2EA96A",
"iconHighlight": "#61d9a3", "iconHighlight": "#61D9A3",
"modeHighlight": "#c9fe62", "modeHighlight": "#C9FE62",
"classCardColor":"#2567a1", "classCardColor":"#2567A1",
"textColor": "#fcf0f0" "textColor": "#FCF0F0"
}, },
"fresva": { "fresva": {
"background": "Earth.jpg", "background": "Earth.jpg",
"mainColor": "#dea743", "mainColor": "#DEA743",
"secondaryColor": "#496234", "secondaryColor": "#496234",
"sidebarColor": "#6d9957", "sidebarColor": "#6D9957",
"userDropdownColor": "#89bb52", "userDropdownColor": "#89BB52",
"iconHighlight": "#91ee61", "iconHighlight": "#91EE61",
"modeHighlight": "#b9f643", "modeHighlight": "#B9f643",
"classCardColor":"#c18311", "classCardColor":"#C18311",
"textColor": "#fcf0f0" "textColor": "#FCF0F0"
}, },
"atlaneon": { "atlaneon": {
"background": "NeonBlue.jpg", "background": "NeonBlue.jpg",
"mainColor": "#1d1c23", "mainColor": "#1D1C23",
"secondaryColor": "#1f212f", "secondaryColor": "#1F212f",
"sidebarColor": "#312e32", "sidebarColor": "#312E32",
"userDropdownColor": "#2e312b", "userDropdownColor": "#2e312b",
"iconHighlight": "#70e6e6", "iconHighlight": "#70E6E6",
"modeHighlight": "#70e6e6", "modeHighlight": "#70E6E6",
"classCardColor":"#1faab1", "classCardColor":"#1FAAB1",
"textColor": "#fcf0f0" "textColor": "#FCF0F0"
} }
}; };
@ -71,7 +71,7 @@ options = {
"theme": [ "theme": [
{"val": "lux", "alias": "Lux"}, {"val": "lux", "alias": "Lux"},
{"val": "nox", "alias": "Nox"}, {"val": "nox", "alias": "Nox"},
{"val": "requox", "alias": "Recoum"}, {"val": "requom", "alias": "Recoum"},
{"val": "aequor", "alias": "Aequor"}, {"val": "aequor", "alias": "Aequor"},
{"val": "fresva", "alias": "Fresva"}, {"val": "fresva", "alias": "Fresva"},
{"val": "atlaneon", "alias": "Atlaneon"} {"val": "atlaneon", "alias": "Atlaneon"}