infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

lint compliance

Browse Source
pull/1/head
yflory 4 years ago
parent ceb75ad04d
commit fa970ebe94
3 changed files with 20 additions and 49 deletions
Show Stats Download Patch File Download Diff File

49
www/calendar/inner.js
Unescape Escape View File

@ -125,14 +125,14 @@ Messages.calendar_import = "Import to my calendars";
return (brightness > 125) ? 'black' : 'white'; return (brightness > 125) ? 'black' : 'white';
}; };
var getWeekDays = function (locale) { var getWeekDays = function () {
var baseDate = new Date(Date.UTC(2017, 0, 1)); // just a Sunday var baseDate = new Date(Date.UTC(2017, 0, 1)); // just a Sunday
var weekDays = []; var weekDays = [];
for(i = 0; i < 7; i++) { for(var i = 0; i < 7; i++) {
weekDays.push(baseDate.toLocaleDateString(undefined, { weekday: 'long' })); weekDays.push(baseDate.toLocaleDateString(undefined, { weekday: 'long' }));
baseDate.setDate(baseDate.getDate() + 1); baseDate.setDate(baseDate.getDate() + 1);
} }
return weekDays.map(function (day) { return day.replace(/^./, function (str) { return str.toUpperCase(); }) }); return weekDays.map(function (day) { return day.replace(/^./, function (str) { return str.toUpperCase(); }); });
}; };
@ -183,9 +183,6 @@ Messages.calendar_import = "Import to my calendars";
var onCalendarUpdate = function (data) { var onCalendarUpdate = function (data) {
var cal = APP.calendar; var cal = APP.calendar;
// Is it a new calendar?
var isNew = !APP.calendars[data.id];
if (data.deleted) { if (data.deleted) {
// Remove this calendar // Remove this calendar
delete APP.calendars[data.id]; delete APP.calendars[data.id];
@ -200,11 +197,6 @@ Messages.calendar_import = "Import to my calendars";
renderCalendar(); renderCalendar();
}; };
var getPadStart = function (value) {
value = value.toString();
return padStart.call(value, 2, '0');
};
var getTime = function (time) { var getTime = function (time) {
var d = new Date(); var d = new Date();
d.setHours(time.hour); d.setHours(time.hour);
@ -231,17 +223,6 @@ Messages.calendar_import = "Import to my calendars";
timegridDisplayPrimaryTime: getTime, timegridDisplayPrimaryTime: getTime,
}; };
var makeTeamSelector = function () {
var privateData = metadataMgr.getPrivateData();
var keys = Object.keys(privateData.teams);
if (!keys.length) { return; }
var options = [];
keys.forEach(function (id) {
var t = privateData.teams[id];
if (t.viewer) { return; }
});
};
// XXX Note: always create calendars in your own proxy. If you want a team calendar, you can share it with the team later. // XXX Note: always create calendars in your own proxy. If you want a team calendar, you can share it with the team later.
var editCalendar = function (id) { var editCalendar = function (id) {
var isNew = !id; var isNew = !id;
@ -260,7 +241,6 @@ Messages.calendar_import = "Import to my calendars";
var $colorPicker = $(h('div.cp-calendar-colorpicker')); var $colorPicker = $(h('div.cp-calendar-colorpicker'));
var jscolorL = new window.jscolor($colorPicker[0], { showOnClick: false, valueElement: undefined, zIndex: 100000 }); var jscolorL = new window.jscolor($colorPicker[0], { showOnClick: false, valueElement: undefined, zIndex: 100000 });
var to;
$colorPicker.click(function() { $colorPicker.click(function() {
jscolorL.show(); jscolorL.show();
}); });
@ -279,8 +259,8 @@ Messages.calendar_import = "Import to my calendars";
return void newCalendar(obj, function (err) { return void newCalendar(obj, function (err) {
if (err) { console.error(err); return void UI.warn(Messages.error); } if (err) { console.error(err); return void UI.warn(Messages.error); }
UI.log(Messages.saved); UI.log(Messages.saved);
}) });
}; }
obj.id = id; obj.id = id;
updateCalendar(obj, function (err) { updateCalendar(obj, function (err) {
if (err) { console.error(err); return void UI.warn(Messages.error); } if (err) { console.error(err); return void UI.warn(Messages.error); }
@ -302,7 +282,7 @@ Messages.calendar_import = "Import to my calendars";
var obj = { var obj = {
color: color, color: color,
title: title title: title
} };
if (!title || !title.trim() ||!/^#[0-9a-fA-F]{6}$/.test(color)) { if (!title || !title.trim() ||!/^#[0-9a-fA-F]{6}$/.test(color)) {
return true; return true;
} }
@ -427,7 +407,6 @@ Messages.calendar_import = "Import to my calendars";
content: h('span', Messages.propertiesButton), content: h('span', Messages.propertiesButton),
action: function (e) { action: function (e) {
e.stopPropagation(); e.stopPropagation();
var friends = common.getFriends();
var cal = APP.calendars[id]; var cal = APP.calendars[id];
var title = Util.find(cal, ['content', 'metadata', 'title']); var title = Util.find(cal, ['content', 'metadata', 'title']);
var color = Util.find(cal, ['content', 'metadata', 'color']); var color = Util.find(cal, ['content', 'metadata', 'color']);
@ -466,6 +445,7 @@ Messages.calendar_import = "Import to my calendars";
key += Messages.calendar_deleteOwned; key += Messages.calendar_deleteOwned;
} }
UI.confirm(Messages.calendar_deleteConfirm, function (yes) { UI.confirm(Messages.calendar_deleteConfirm, function (yes) {
if (!yes) { return; }
deleteCalendar({ deleteCalendar({
id: id, id: id,
teamId: teamId, teamId: teamId,
@ -768,7 +748,7 @@ Messages.calendar_import = "Import to my calendars";
mutations.forEach(function(mutation) { mutations.forEach(function(mutation) {
var node; var node;
for (var i = 0; i < mutation.addedNodes.length; i++) { for (var i = 0; i < mutation.addedNodes.length; i++) {
var node = mutation.addedNodes[i]; node = mutation.addedNodes[i];
if (node.classList && node.classList.contains('flatpickr-calendar')) { if (node.classList && node.classList.contains('flatpickr-calendar')) {
onFlatPickr(node); onFlatPickr(node);
} }
@ -809,6 +789,7 @@ Messages.calendar_import = "Import to my calendars";
if (!isUpdate) { $el.find('.tui-full-calendar-dropdown-menu li').first().click(); } if (!isUpdate) { $el.find('.tui-full-calendar-dropdown-menu li').first().click(); }
}; };
var onCalendarEditPopup = function (el) { var onCalendarEditPopup = function (el) {
el = el;
// TODO // TODO
}; };
var onPopupRemoved = function () { var onPopupRemoved = function () {
@ -820,11 +801,11 @@ Messages.calendar_import = "Import to my calendars";
$(el).remove(); $(el).remove();
}); });
}; };
var observer = new MutationObserver(function(mutations) { var observer2 = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) { mutations.forEach(function(mutation) {
var node; var node, _node;
for (var i = 0; i < mutation.addedNodes.length; i++) { for (var i = 0; i < mutation.addedNodes.length; i++) {
var node = mutation.addedNodes[i]; node = mutation.addedNodes[i];
try { try {
if (node.classList && node.classList.contains('tui-full-calendar-popup') if (node.classList && node.classList.contains('tui-full-calendar-popup')
&& !node.classList.contains('tui-full-calendar-popup-detail')) { && !node.classList.contains('tui-full-calendar-popup-detail')) {
@ -837,7 +818,7 @@ Messages.calendar_import = "Import to my calendars";
} catch (e) {} } catch (e) {}
} }
for (var j = 0; j < mutation.removedNodes.length; j++) { for (var j = 0; j < mutation.removedNodes.length; j++) {
var _node = mutation.addedNodes[j]; _node = mutation.addedNodes[j];
try { try {
if (_node.classList && _node.classList.contains('tui-full-calendar-popup')) { if (_node.classList && _node.classList.contains('tui-full-calendar-popup')) {
onPopupRemoved(); onPopupRemoved();
@ -846,7 +827,7 @@ Messages.calendar_import = "Import to my calendars";
} }
}); });
}); });
observer.observe($('body')[0], { observer2.observe($('body')[0], {
childList: true, childList: true,
subtree: true subtree: true
}); });
@ -862,7 +843,7 @@ Messages.calendar_import = "Import to my calendars";
initialCalendar: true, initialCalendar: true,
color: user.color, color: user.color,
title: Messages.calendar_default title: Messages.calendar_default
}, function (err, obj) { }, function (err) {
if (err) { return void UI.errorLoadingScreen(Messages.error); } // XXX if (err) { return void UI.errorLoadingScreen(Messages.error); } // XXX
makeCalendar(); makeCalendar();
UI.removeLoadingScreen(); UI.removeLoadingScreen();

6
www/calendar/main.js
Unescape Escape View File

@ -12,15 +12,11 @@ define([
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
SFCommonO.initIframe(waitFor); SFCommonO.initIframe(waitFor);
}).nThen(function (/*waitFor*/) { }).nThen(function (/*waitFor*/) {
var addData = function (meta, Cryptpad, user) { var addData = function (meta) {
// XXX flag when opening URL
meta.calendarHash = Boolean(window.location.hash); meta.calendarHash = Boolean(window.location.hash);
}; };
SFCommonO.start({ SFCommonO.start({
//noHash: true, // Don't add the hash in the URL if it doesn't already exist
//addRpc: addRpc,
addData: addData, addData: addData,
//owned: true,
noRealtime: true, noRealtime: true,
cache: true, cache: true,
}); });

14
www/common/outer/calendar.js
Unescape Escape View File

@ -137,6 +137,7 @@ ctx.calendars[channel] = {
var teamId = cfg.storeId; var teamId = cfg.storeId;
var data = cfg.data; var data = cfg.data;
var channel = data.channel; var channel = data.channel;
console.error(cfg);
if (!channel) { return; } if (!channel) { return; }
var c = ctx.calendars[channel]; var c = ctx.calendars[channel];
@ -373,6 +374,7 @@ ctx.calendars[channel] = {
} }
// Handle additions // Handle additions
// NOTE: this also upgrade from readOnly to edit (add an "href" to the calendar)
if (!o && n) { if (!o && n) {
(function () { (function () {
var id = p[1]; var id = p[1];
@ -386,14 +388,6 @@ ctx.calendars[channel] = {
}); });
})(); })();
} }
// Handle href updates (color and title updates are handled from the calendar channel)
if (o && n && p.length === 3 && p[2] === "href") {
(function () {
var id = p[1];
})();
}
}); });
// If this store contains existing calendars, open them // If this store contains existing calendars, open them
@ -518,7 +512,7 @@ ctx.calendars[channel] = {
if (err) { if (err) {
// Can't open this channel, don't store it // Can't open this channel, don't store it
console.error(err); console.error(err);
return void cb({error: err.error}) return void cb({error: err.error});
} }
if (href && store.id && store.secondaryKey) { if (href && store.id && store.secondaryKey) {
@ -557,7 +551,7 @@ ctx.calendars[channel] = {
if (err) { if (err) {
// Can't open this channel, don't store it // Can't open this channel, don't store it
console.error(err); console.error(err);
return void cb({error: err.error}) return void cb({error: err.error});
} }
// Add the calendar and call back // Add the calendar and call back
c[cal.channel] = cal; c[cal.channel] = cal;

Write Preview
Loading…
Cancel
Save