fix emacs warnings
This commit is contained in:
parent
8fd8a9412a
commit
b98f229c0b
@ -1,3 +1,4 @@
|
||||
/* jshint esversion: 6 */
|
||||
import {
|
||||
Template
|
||||
} from 'meteor/templating';
|
||||
@ -99,8 +100,8 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective
|
||||
|
||||
for(var j = 0; j < thisWork.length; j++) { // For each work in class.
|
||||
if(hide !== 0) { // Time to hide isn't never.
|
||||
var due = (moment(thisWork[j].dueDate))["_d"];
|
||||
var offset = (moment().subtract(hide,'days'))["_d"];
|
||||
var due = (moment(thisWork[j].dueDate))._d;
|
||||
var offset = (moment().subtract(hide,'days'))._d;
|
||||
if(offset > due) { // If due is before hide days before today
|
||||
thisWork[j] = "no";
|
||||
j = 0;
|
||||
@ -116,7 +117,7 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective
|
||||
}
|
||||
while(thisWork.indexOf("no") !== -1) thisWork.splice(thisWork.indexOf("no"),1); // Splice all filtered works.
|
||||
|
||||
for(var j = 0; j < thisWork.length; j++) {
|
||||
for(j = 0; j < thisWork.length; j++) {
|
||||
thisWork[j].realDate = thisWork[j].dueDate;
|
||||
thisWork[j].dueDate = moment(thisWork[j].dueDate).calendar(null, {
|
||||
sameDay: '[Today]',
|
||||
@ -134,8 +135,8 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective
|
||||
}
|
||||
thisWork[j].typeColor = workColors[thisWork[j].type];
|
||||
|
||||
thisWork[j].confirmationLength = thisWork[j].confirmations.length // Counts the number of confirmations and reports for a particular work.
|
||||
thisWork[j].reportLength = thisWork[j].reports.length
|
||||
thisWork[j].confirmationLength = thisWork[j].confirmations.length; // Counts the number of confirmations and reports for a particular work.
|
||||
thisWork[j].reportLength = thisWork[j].reports.length;
|
||||
|
||||
var hoverHighlight = Session.get("classDispHover"); // Highlight/scale related class works on hover.
|
||||
if(hoverHighlight !== null && hoverHighlight === found._id) {
|
||||
@ -241,7 +242,7 @@ Template.main.helpers({
|
||||
var works = userClasses[i].thisClassWork;
|
||||
for(var j = 0; j < works.length; j++) {
|
||||
var work = works[j];
|
||||
var currClass = classes.findOne({_id: work.class})
|
||||
var currClass = classes.findOne({_id: work.class});
|
||||
var inRole = false;
|
||||
|
||||
if(Meteor.userId() === work.creator ||
|
||||
@ -258,7 +259,7 @@ Template.main.helpers({
|
||||
borderColor: "#444",
|
||||
startEditable: inRole,
|
||||
className: "workevent "+work.class,
|
||||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
callback(events);
|
||||
@ -272,7 +273,7 @@ Template.main.helpers({
|
||||
},
|
||||
eventClick: function(event, jsEvent, view) { // On-click for work.
|
||||
Session.set("newWork",false);
|
||||
var thisWork = work.findOne({_id:event.id})
|
||||
var thisWork = work.findOne({_id:event.id});
|
||||
Session.set("currentWork",thisWork);
|
||||
var thisReadWork = formReadable(thisWork);
|
||||
Session.set("currentReadableWork",thisReadWork);
|
||||
@ -371,7 +372,7 @@ Template.main.helpers({
|
||||
if(Session.get("newWork")) {
|
||||
return true;
|
||||
} else {
|
||||
var currClass = classes.findOne({_id: Session.get("currentWork")["class"]})
|
||||
var currClass = classes.findOne({_id: Session.get("currentWork")["class"]});
|
||||
if(Meteor.userId() === Session.get("currentWork").creator ||
|
||||
Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
|
||||
currClass.moderators.indexOf(Meteor.userId()) !== -1 ||
|
||||
@ -434,10 +435,11 @@ Template.main.events({
|
||||
!event.target.parentNode.className.includes("workOptions") &&
|
||||
!event.target.parentNode.className.includes("prefOptions") &&
|
||||
event.target.readOnly !== true) {
|
||||
var radio;
|
||||
if(Session.equals("sidebar","optionsContainer") || Session.equals("sidebar","both")) {
|
||||
var radio = "prefOptions";
|
||||
radio = "prefOptions";
|
||||
} else {
|
||||
var radio = "workOptions";
|
||||
radio = "workOptions";
|
||||
}
|
||||
for (var i = 0; i < document.getElementsByClassName(radio).length; i++) {
|
||||
try {
|
||||
@ -492,10 +494,11 @@ Template.main.events({
|
||||
Session.set("sidebar",null); // Closes all sidebars.
|
||||
},
|
||||
'click .creWork' (event) { // Cick add work button.
|
||||
var attr;
|
||||
if(event.target.className !== "creWork") {
|
||||
var attr = event.target.parentNode.getAttribute("classid");
|
||||
attr = event.target.parentNode.getAttribute("classid");
|
||||
} else {
|
||||
var attr = event.target.getAttribute("classid");
|
||||
attr = event.target.getAttribute("classid");
|
||||
}
|
||||
Session.set("newWork", true);
|
||||
Session.set("currentReadableWork", // Default readable work.
|
||||
@ -527,7 +530,7 @@ Template.main.events({
|
||||
currClass.moderators.indexOf(Meteor.userId()) !== -1 ||
|
||||
currClass.banned.indexOf(Meteor.userId()) !== -1)) {
|
||||
var inputs = $('#editWork .change').css("cursor","default");
|
||||
};
|
||||
}
|
||||
}
|
||||
openDivFade(document.getElementsByClassName("overlay")[0]);
|
||||
},
|
||||
@ -604,10 +607,11 @@ Template.main.events({
|
||||
}
|
||||
|
||||
var op = event.target;
|
||||
var radio;
|
||||
if(Session.equals("sidebar","optionsContainer") || Session.equals("sidebar","both")) {
|
||||
var radio = "prefOptions";
|
||||
radio = "prefOptions";
|
||||
} else {
|
||||
var radio = "workOptions";
|
||||
radio = "workOptions";
|
||||
}
|
||||
try {
|
||||
for (var i = 0; i < document.getElementsByClassName(radio).length; i++) { // Close any previously open menus.
|
||||
@ -702,19 +706,18 @@ Template.main.events({
|
||||
} else if(chars === 0) {
|
||||
document.getElementById("commentRestrict").style.color = "#FF1A1A"; // Make text red if 0 characters left.
|
||||
}
|
||||
Session.set("commentRestrict", "Characters left: " + chars.toString());
|
||||
|
||||
Session.set("commentRestrict",chars.toString() + " characters left");
|
||||
},
|
||||
'click #markDone' () { // Click done button.
|
||||
serverData = [Session.get("currentWork")._id, "done"]
|
||||
serverData = [Session.get("currentWork")._id, "done"];
|
||||
sendData("toggleWork");
|
||||
},
|
||||
'click #markConfirm' () { // Click confirm button.
|
||||
serverData = [Session.get("currentWork")._id, "confirmations"]
|
||||
serverData = [Session.get("currentWork")._id, "confirmations"];
|
||||
sendData("toggleWork");
|
||||
},
|
||||
'click #markReport' () { // Click report button.
|
||||
serverData = [Session.get("currentWork")._id, "reports"]
|
||||
serverData = [Session.get("currentWork")._id, "reports"];
|
||||
sendData("toggleWork");
|
||||
},
|
||||
// CLASS FILTERS
|
||||
@ -728,7 +731,7 @@ Template.main.events({
|
||||
Session.set("sidebar",null);
|
||||
|
||||
var date = calWorkDate.split("-");
|
||||
var date = new Date(date[0],parseInt(date[1])-1,date[2],11,59,59);
|
||||
date = new Date(date[0],parseInt(date[1])-1,date[2],11,59,59);
|
||||
Session.set("newWork", true);
|
||||
Session.set("currentReadableWork",
|
||||
{
|
||||
@ -754,10 +757,11 @@ Template.main.events({
|
||||
Session.set("classDisp",[]);
|
||||
},
|
||||
'mouseover .sideClass' (event) { // Highlight/scale filter on-hover.
|
||||
var div;
|
||||
if(event.target.className !== "sideClass") {
|
||||
var div = event.target.parentNode;
|
||||
div = event.target.parentNode;
|
||||
} else {
|
||||
var div = event.target;
|
||||
div = event.target;
|
||||
}
|
||||
while(div.getAttribute("classid") === null) div = div.parentNode;
|
||||
var classid = div.getAttribute("classid");
|
||||
@ -802,10 +806,11 @@ function sendData(funcName) { // Call Meteor function, and do actions after func
|
||||
function closeInput(modifyingInput) { // Close a changeable input and change it back to span.
|
||||
var input = document.getElementById(modifyingInput + "a");
|
||||
var span = document.getElementById(modifyingInput);
|
||||
var color;
|
||||
if(Session.equals("sidebar","optionsContainer") || Session.equals("sidebar","both")) {
|
||||
var color = "#000";
|
||||
color = "#000";
|
||||
} else {
|
||||
var color = "#8C8C8C";
|
||||
color = "#8C8C8C";
|
||||
}
|
||||
span.style.color = color;
|
||||
input.parentNode.removeChild(input);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user