Skip to content

Commit ef8c527

Browse files
mariobehlingmariobehling
authored
Revert "feat: allow custom Project Names (#29)" (#30)
This reverts commit 4238402.
1 parent 4238402 commit ef8c527

File tree

4 files changed

+410
-442
lines changed

4 files changed

+410
-442
lines changed

‎src/popup.html

100755100644
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ <h6 class="center">
4242
</div>
4343
</div>
4444
<div class="row">
45-
<div class="input-field col s12">
46-
<input placeholder="Your Project Name" id="projectName" type="text">
47-
<label for="projectName">Your Project Name</label>
48-
</div>
4945
<div class="input-field col s12">
5046
<input placeholder="Required for getting data from github" id="githubUsername" type="text">
5147
<label for="githubUsername">Your Github Username</label>

‎src/scripts/background.js

Whitespace-only changes.

‎src/scripts/main.js

100755100644
Lines changed: 72 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,175 +1,148 @@
11
/* global $,Materialize*/
22
var enableToggleElement = document.getElementById("enable");
33
var githubUsernameElement = document.getElementById("githubUsername");
4-
var projectNameElement = document.getElementById("projectName");
5-
var lastWeekContributionElement = document.getElementById("lastWeekContribution");
4+
var lastWeekContributionElement=document.getElementById("lastWeekContribution");
65
var startingDateElement = document.getElementById("startingDate");
76
var endingDateElement = document.getElementById("endingDate");
87
var showOpenLabelElement = document.getElementById("showOpenLabel");
98
var userReasonElement = document.getElementById("userReason");
10-
var gsoc = 0; //0 means gsoc. 1 means gsoc
11-
function handleBodyOnLoad() {
9+
var gsoc = 0;//0 means gsoc. 1 means gsoc
10+
function handleBodyOnLoad(){
1211
// prefill name
13-
chrome.storage.local.get(["githubUsername", "projectName", "enableToggle", "startingDate", "endingDate", "showOpenLabel", "userReason", "lastWeekContribution", "gsoc"], function(items) {
14-
if (items.githubUsername) {
15-
githubUsernameElement.value = items.githubUsername;
12+
chrome.storage.local.get(["githubUsername","enableToggle","startingDate","endingDate","showOpenLabel","showClosedLabel","userReason","lastWeekContribution","gsoc"],function(items){
13+
if(items.githubUsername){
14+
githubUsernameElement.value=items.githubUsername;
1615
}
17-
if (items.projectName) {
18-
projectNameElement.value = items.projectName;
16+
if(items.enableToggle){
17+
enableToggleElement.checked=items.enableToggle;
1918
}
20-
if (items.enableToggle) {
21-
enableToggleElement.checked = items.enableToggle;
22-
} else if (items.enableToggle !== false) { // undefined
23-
enableToggleElement.checked = true;
19+
else if(items.enableToggle!==false){// undefined
20+
enableToggleElement.checked=true;
2421
handleEnableChange();
2522
}
26-
if (items.endingDate) {
23+
if(items.endingDate){
2724
endingDateElement.value = items.endingDate;
2825
}
29-
if (items.startingDate) {
26+
if(items.startingDate){
3027
startingDateElement.value = items.startingDate;
3128
}
32-
if (items.showOpenLabel) {
33-
showOpenLabelElement.checked = items.showOpenLabel;
34-
} else if (items.showOpenLabel !== false) { // undefined
35-
showOpenLabelElement.checked = true;
29+
if(items.showOpenLabel){
30+
showOpenLabelElement.checked= items.showOpenLabel;
31+
}
32+
else if(items.showOpenLabel!==false){// undefined
33+
showOpenLabelElement.checked=true;
3634
handleOpenLabelChange();
3735
}
38-
if (items.userReason) {
36+
if(items.userReason){
3937
userReasonElement.value = items.userReason;
4038
}
41-
if (items.lastWeekContribution) {
42-
lastWeekContributionElement.checked = items.lastWeekContribution;
39+
if(items.lastWeekContribution){
40+
lastWeekContributionElement.checked=items.lastWeekContribution;
4341
handleLastWeekContributionChange();
44-
} else if (items.lastWeekContribution !== false) {
45-
lastWeekContributionElement.checked = true;
42+
}
43+
else if(items.lastWeekContribution!==false){
44+
lastWeekContributionElement.checked=true;
4645
handleLastWeekContributionChange();
4746
}
48-
if (items.gsoc == 1) {
47+
if(items.gsoc==1){
4948
handleGsocClick();
50-
} else {
49+
}
50+
else{
5151
handleCodeheatClick();
5252
}
5353
});
5454
}
55-
56-
function handleEnableChange() {
55+
function handleEnableChange(){
5756
var value = enableToggleElement.checked;
58-
chrome.storage.local.set({
59-
"enableToggle": value
60-
});
57+
chrome.storage.local.set({"enableToggle": value});
6158
}
62-
63-
function handleStartingDateChange() {
59+
function handleStartingDateChange(){
6460
var value = startingDateElement.value;
65-
chrome.storage.local.set({
66-
"startingDate": value
67-
});
61+
console.log("starting date:");
62+
console.log(value);
63+
chrome.storage.local.set({"startingDate": value});
6864
}
69-
70-
function handleEndingDateChange() {
65+
function handleEndingDateChange(){
7166
var value = endingDateElement.value;
72-
chrome.storage.local.set({
73-
"endingDate": value
74-
});
67+
chrome.storage.local.set({"endingDate": value});
7568
}
76-
77-
function handleLastWeekContributionChange() {
69+
function handleLastWeekContributionChange(keepPreviousValue=false){
7870
var value = lastWeekContributionElement.checked;
79-
if (value) {
80-
startingDateElement.disabled = true;
81-
endingDateElement.disabled = true;
82-
endingDateElement.value = getToday();
83-
startingDateElement.value = getLastWeek();
71+
if(value){
72+
startingDateElement.disabled=true;
73+
endingDateElement.disabled=true;
74+
endingDateElement.value=getToday();
75+
startingDateElement.value=getLastWeek();
8476
handleEndingDateChange();
8577
handleStartingDateChange();
86-
} else {
87-
startingDateElement.disabled = false;
88-
endingDateElement.disabled = false;
8978
}
90-
chrome.storage.local.set({
91-
"lastWeekContribution": value
92-
});
79+
else{
80+
startingDateElement.disabled=false;
81+
endingDateElement.disabled=false;
82+
}
83+
chrome.storage.local.set({"lastWeekContribution": value});
9384
}
94-
95-
function getLastWeek() {
85+
function getLastWeek(){
9686
var today = new Date();
97-
var noDays_to_goback = gsoc == 0 ? 7 : 1;
87+
var noDays_to_goback=gsoc==0?7:1;
9888
var lastWeek = new Date(today.getFullYear(), today.getMonth(), today.getDate() - noDays_to_goback);
9989
var lastWeekMonth = lastWeek.getMonth() + 1;
10090
var lastWeekDay = lastWeek.getDate();
10191
var lastWeekYear = lastWeek.getFullYear();
102-
var lastWeekDisplayPadded = ("0000" + lastWeekYear.toString()).slice(-4) + "-" + ("00" + lastWeekMonth.toString()).slice(-2) + "-" + ("00" + lastWeekDay.toString()).slice(-2);
92+
var lastWeekDisplayPadded =("0000" + lastWeekYear .toString()).slice(-4) +"-" + ("00" + lastWeekMonth.toString()).slice(-2)+ "-" + ("00" + lastWeekDay .toString()).slice(-2);
10393
return lastWeekDisplayPadded;
10494
}
105-
106-
function getToday() {
95+
function getToday(){
10796
var today = new Date();
10897
var Week = new Date(today.getFullYear(), today.getMonth(), today.getDate());
10998
var WeekMonth = Week.getMonth() + 1;
11099
var WeekDay = Week.getDate();
111100
var WeekYear = Week.getFullYear();
112-
var WeekDisplayPadded = ("0000" + WeekYear.toString()).slice(-4) + "-" + ("00" + WeekMonth.toString()).slice(-2) + "-" + ("00" + WeekDay.toString()).slice(-2);
101+
var WeekDisplayPadded =("0000" + WeekYear .toString()).slice(-4) +"-" + ("00" + WeekMonth.toString()).slice(-2)+ "-" + ("00" + WeekDay .toString()).slice(-2);
113102
return WeekDisplayPadded;
114103
}
115104

116-
function handleGithubUsernameChange() {
117-
var value = githubUsernameElement.value;
118-
chrome.storage.local.set({
119-
"githubUsername": value
120-
});
121-
}
122105

123-
function handleProjectNameChange() {
124-
var value = projectNameElement.value;
125-
chrome.storage.local.set({
126-
"projectName": value
127-
});
106+
function handleGithubUsernameChange(){
107+
var value = githubUsernameElement.value;
108+
chrome.storage.local.set({"githubUsername": value});
128109
}
129-
130-
function handleOpenLabelChange() {
110+
function handleOpenLabelChange(){
131111
var value = showOpenLabelElement.checked;
132-
chrome.storage.local.set({
133-
"showOpenLabel": value
134-
});
112+
chrome.storage.local.set({"showOpenLabel": value});
113+
chrome.storage.local.set({"showClosedLabel": value});
135114
}
136-
137-
function handleUserReasonChange() {
115+
function handleClosedLabelChange(){
116+
var value = showClosedLabelElement.checked;
117+
chrome.storage.local.set({"showClosedLabel": value});
118+
}
119+
function handleUserReasonChange(){
138120
var value = userReasonElement.value;
139-
chrome.storage.local.set({
140-
"userReason": value
141-
});
121+
chrome.storage.local.set({"userReason": value});
142122
}
143-
144-
function handleCodeheatClick() {
145-
gsoc = 0;
123+
function handleCodeheatClick(){
124+
gsoc=0;
146125
$("#codeheatTab").addClass("active");
147-
$(".tabs").tabs();
126+
$('.tabs').tabs();
148127
$("#noDays").text("7 days");
149-
chrome.storage.local.set({
150-
"gsoc": 0
151-
});
128+
chrome.storage.local.set({"gsoc": 0});
152129
handleLastWeekContributionChange();
153130
}
154-
155-
function handleGsocClick() {
156-
gsoc = 1;
131+
function handleGsocClick(){
132+
gsoc=1;
157133
$("#gsocTab").addClass("active");
158-
$(".tabs").tabs();
134+
$('.tabs').tabs();
159135
$("#noDays").text("1 day");
160-
chrome.storage.local.set({
161-
"gsoc": 1
162-
});
136+
chrome.storage.local.set({"gsoc": 1});
163137
handleLastWeekContributionChange();
164138
}
165139
enableToggleElement.addEventListener("change", handleEnableChange);
166140
githubUsernameElement.addEventListener("keyup", handleGithubUsernameChange);
167-
projectNameElement.addEventListener("keyup", handleProjectNameChange);
168141
startingDateElement.addEventListener("change", handleStartingDateChange);
169142
endingDateElement.addEventListener("change", handleEndingDateChange);
170143
lastWeekContributionElement.addEventListener("change", handleLastWeekContributionChange);
171144
showOpenLabelElement.addEventListener("change", handleOpenLabelChange);
172145
userReasonElement.addEventListener("keyup", handleUserReasonChange);
173146
document.addEventListener("DOMContentLoaded", handleBodyOnLoad);
174-
document.getElementById("codeheatTab").addEventListener("click", handleCodeheatClick);
175-
document.getElementById("gsocTab").addEventListener("click", handleGsocClick);
147+
document.getElementById("codeheatTab").addEventListener("click",handleCodeheatClick);
148+
document.getElementById("gsocTab").addEventListener("click",handleGsocClick);

0 commit comments

Comments
 (0)