2016-03-24 17:19:32 +01:00
|
|
|
/* global Log, Module, moment, config */
|
2020-04-21 10:41:21 +02:00
|
|
|
|
2016-03-24 17:19:32 +01:00
|
|
|
/* Magic Mirror
|
|
|
|
* Module: Clock
|
|
|
|
*
|
2020-04-28 23:05:28 +02:00
|
|
|
* By Michael Teeuw https://michaelteeuw.nl
|
2016-03-24 17:19:32 +01:00
|
|
|
* MIT Licensed.
|
|
|
|
*/
|
2016-04-05 14:35:11 -04:00
|
|
|
Module.register("clock",{
|
2016-03-24 17:19:32 +01:00
|
|
|
// Module config defaults.
|
|
|
|
defaults: {
|
2016-12-01 19:48:53 -03:00
|
|
|
displayType: "digital", // options: digital, analog, both
|
2016-07-09 16:29:25 -06:00
|
|
|
|
2016-03-29 13:28:15 +02:00
|
|
|
timeFormat: config.timeFormat,
|
2016-03-24 17:19:32 +01:00
|
|
|
displaySeconds: true,
|
2016-04-18 19:52:40 -04:00
|
|
|
showPeriod: true,
|
|
|
|
showPeriodUpper: false,
|
2016-07-08 17:16:51 -06:00
|
|
|
clockBold: false,
|
2016-09-11 08:14:28 -07:00
|
|
|
showDate: true,
|
2017-03-28 22:02:30 +02:00
|
|
|
showWeek: false,
|
2017-03-17 14:32:01 +01:00
|
|
|
dateFormat: "dddd, LL",
|
2016-07-09 16:29:25 -06:00
|
|
|
|
2016-07-08 17:16:51 -06:00
|
|
|
/* specific to the analog clock */
|
2016-12-01 19:48:53 -03:00
|
|
|
analogSize: "200px",
|
|
|
|
analogFace: "simple", // options: 'none', 'simple', 'face-###' (where ### is 001 to 012 inclusive)
|
|
|
|
analogPlacement: "bottom", // options: 'top', 'bottom', 'left', 'right'
|
|
|
|
analogShowDate: "top", // options: false, 'top', or 'bottom'
|
|
|
|
secondsColor: "#888888",
|
2016-10-24 23:53:34 -03:00
|
|
|
timezone: null,
|
2020-01-17 21:52:04 -08:00
|
|
|
|
|
|
|
showSunTimes: false,
|
|
|
|
showMoonTimes: false,
|
|
|
|
lat: 47.630539,
|
|
|
|
lon: -122.344147,
|
2016-03-24 17:19:32 +01:00
|
|
|
},
|
|
|
|
// Define required scripts.
|
|
|
|
getScripts: function() {
|
2020-01-17 21:52:04 -08:00
|
|
|
return ["moment.js", "moment-timezone.js", "suncalc.js"];
|
2016-03-24 17:19:32 +01:00
|
|
|
},
|
2016-07-08 17:16:51 -06:00
|
|
|
// Define styles.
|
|
|
|
getStyles: function() {
|
|
|
|
return ["clock_styles.css"];
|
|
|
|
},
|
2016-03-24 17:19:32 +01:00
|
|
|
// Define start sequence.
|
|
|
|
start: function() {
|
2016-04-05 14:35:11 -04:00
|
|
|
Log.info("Starting module: " + this.name);
|
2016-07-08 17:16:51 -06:00
|
|
|
|
2019-02-27 13:33:14 +01:00
|
|
|
// Schedule update interval.
|
|
|
|
var self = this;
|
2019-09-22 17:33:01 +02:00
|
|
|
self.second = moment().second();
|
|
|
|
self.minute = moment().minute();
|
|
|
|
|
|
|
|
//Calculate how many ms should pass until next update depending on if seconds is displayed or not
|
|
|
|
var delayCalculator = function(reducedSeconds) {
|
|
|
|
if (self.config.displaySeconds) {
|
|
|
|
return 1000 - moment().milliseconds();
|
|
|
|
} else {
|
|
|
|
return ((60 - reducedSeconds) * 1000) - moment().milliseconds();
|
2019-05-18 20:00:53 -04:00
|
|
|
}
|
2019-09-22 17:33:01 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
//A recursive timeout function instead of interval to avoid drifting
|
|
|
|
var notificationTimer = function() {
|
|
|
|
self.updateDom();
|
|
|
|
|
|
|
|
//If seconds is displayed CLOCK_SECOND-notification should be sent (but not when CLOCK_MINUTE-notification is sent)
|
|
|
|
if (self.config.displaySeconds) {
|
|
|
|
self.second = (self.second + 1) % 60;
|
|
|
|
if (self.second !== 0) {
|
|
|
|
self.sendNotification("CLOCK_SECOND", self.second);
|
|
|
|
setTimeout(notificationTimer, delayCalculator(0));
|
|
|
|
return;
|
2019-06-03 14:01:27 +02:00
|
|
|
}
|
|
|
|
}
|
2019-09-22 17:33:01 +02:00
|
|
|
|
|
|
|
//If minute changed or seconds isn't displayed send CLOCK_MINUTE-notification
|
|
|
|
self.minute = (self.minute + 1) % 60;
|
|
|
|
self.sendNotification("CLOCK_MINUTE", self.minute);
|
|
|
|
setTimeout(notificationTimer, delayCalculator(0));
|
|
|
|
};
|
|
|
|
|
|
|
|
//Set the initial timeout with the amount of seconds elapsed as reducedSeconds so it will trigger when the minute changes
|
|
|
|
setTimeout(notificationTimer, delayCalculator(self.second));
|
2016-07-08 17:16:51 -06:00
|
|
|
|
2016-03-24 17:19:32 +01:00
|
|
|
// Set locale.
|
|
|
|
moment.locale(config.language);
|
2016-07-09 16:29:25 -06:00
|
|
|
|
2016-03-24 17:19:32 +01:00
|
|
|
},
|
|
|
|
// Override dom generator.
|
|
|
|
getDom: function() {
|
2016-07-08 17:16:51 -06:00
|
|
|
|
2016-03-24 17:19:32 +01:00
|
|
|
var wrapper = document.createElement("div");
|
2016-07-08 17:16:51 -06:00
|
|
|
|
|
|
|
/************************************
|
|
|
|
* Create wrappers for DIGITAL clock
|
|
|
|
*/
|
|
|
|
|
2016-03-24 17:19:32 +01:00
|
|
|
var dateWrapper = document.createElement("div");
|
|
|
|
var timeWrapper = document.createElement("div");
|
|
|
|
var secondsWrapper = document.createElement("sup");
|
2016-04-20 11:42:01 +02:00
|
|
|
var periodWrapper = document.createElement("span");
|
2020-01-17 21:52:04 -08:00
|
|
|
var sunWrapper = document.createElement("div");
|
|
|
|
var moonWrapper = document.createElement("div");
|
2019-06-05 10:23:58 +02:00
|
|
|
var weekWrapper = document.createElement("div");
|
2016-03-24 17:19:32 +01:00
|
|
|
// Style Wrappers
|
|
|
|
dateWrapper.className = "date normal medium";
|
|
|
|
timeWrapper.className = "time bright large light";
|
|
|
|
secondsWrapper.className = "dimmed";
|
2020-01-17 21:52:04 -08:00
|
|
|
sunWrapper.className = "sun dimmed small";
|
|
|
|
moonWrapper.className = "moon dimmed small";
|
2019-06-05 10:23:58 +02:00
|
|
|
weekWrapper.className = "week dimmed medium";
|
2016-05-10 16:18:35 +02:00
|
|
|
|
2016-03-24 17:19:32 +01:00
|
|
|
// Set content of wrappers.
|
2016-04-29 11:24:14 -04:00
|
|
|
// The moment().format("h") method has a bug on the Raspberry Pi.
|
2016-04-18 19:12:24 +02:00
|
|
|
// So we need to generate the timestring manually.
|
|
|
|
// See issue: https://github.com/MichMich/MagicMirror/issues/181
|
2016-05-10 16:18:35 +02:00
|
|
|
var timeString;
|
2016-10-24 23:53:34 -03:00
|
|
|
var now = moment();
|
2019-05-18 20:00:53 -04:00
|
|
|
this.lastDisplayedMinute = now.minute();
|
2016-10-24 23:53:34 -03:00
|
|
|
if (this.config.timezone) {
|
|
|
|
now.tz(this.config.timezone);
|
|
|
|
}
|
2017-02-07 23:51:13 +01:00
|
|
|
|
|
|
|
var hourSymbol = "HH";
|
2017-02-08 00:05:28 +01:00
|
|
|
if (this.config.timeFormat !== 24) {
|
|
|
|
hourSymbol = "h";
|
|
|
|
}
|
2017-02-07 23:51:13 +01:00
|
|
|
|
2016-04-29 11:24:14 -04:00
|
|
|
if (this.config.clockBold === true) {
|
2017-02-07 23:51:13 +01:00
|
|
|
timeString = now.format(hourSymbol + "[<span class=\"bold\">]mm[</span>]");
|
2016-04-29 11:24:14 -04:00
|
|
|
} else {
|
2017-02-07 23:51:13 +01:00
|
|
|
timeString = now.format(hourSymbol + ":mm");
|
2016-04-29 11:24:14 -04:00
|
|
|
}
|
2016-05-10 16:18:35 +02:00
|
|
|
|
2016-09-11 08:14:28 -07:00
|
|
|
if(this.config.showDate){
|
2017-03-17 14:32:01 +01:00
|
|
|
dateWrapper.innerHTML = now.format(this.config.dateFormat);
|
2016-09-11 08:14:28 -07:00
|
|
|
}
|
2017-03-28 22:02:30 +02:00
|
|
|
if (this.config.showWeek) {
|
2017-10-03 21:18:25 +02:00
|
|
|
weekWrapper.innerHTML = this.translate("WEEK", { weekNumber: now.week() });
|
2017-03-28 22:02:30 +02:00
|
|
|
}
|
2016-04-18 19:12:24 +02:00
|
|
|
timeWrapper.innerHTML = timeString;
|
2016-10-24 23:53:34 -03:00
|
|
|
secondsWrapper.innerHTML = now.format("ss");
|
2016-04-20 11:42:01 +02:00
|
|
|
if (this.config.showPeriodUpper) {
|
2016-10-24 23:53:34 -03:00
|
|
|
periodWrapper.innerHTML = now.format("A");
|
2016-04-20 11:42:01 +02:00
|
|
|
} else {
|
2016-10-24 23:53:34 -03:00
|
|
|
periodWrapper.innerHTML = now.format("a");
|
2016-04-20 11:42:01 +02:00
|
|
|
}
|
2016-03-24 17:19:32 +01:00
|
|
|
if (this.config.displaySeconds) {
|
|
|
|
timeWrapper.appendChild(secondsWrapper);
|
|
|
|
}
|
2016-04-20 12:16:41 +02:00
|
|
|
if (this.config.showPeriod && this.config.timeFormat !== 24) {
|
2016-04-20 11:42:01 +02:00
|
|
|
timeWrapper.appendChild(periodWrapper);
|
|
|
|
}
|
2016-07-08 17:16:51 -06:00
|
|
|
|
2020-01-17 21:52:04 -08:00
|
|
|
function formatTime(config, time) {
|
2020-02-13 08:35:09 +01:00
|
|
|
var formatString = hourSymbol + ":mm";
|
2020-01-17 21:52:04 -08:00
|
|
|
if (config.showPeriod && config.timeFormat !== 24) {
|
2020-02-13 08:35:09 +01:00
|
|
|
formatString += config.showPeriodUpper ? "A" : "a";
|
2020-01-17 21:52:04 -08:00
|
|
|
}
|
|
|
|
return moment(time).format(formatString);
|
|
|
|
}
|
|
|
|
if (this.config.showSunTimes) {
|
|
|
|
const sunTimes = SunCalc.getTimes(now, this.config.lat, this.config.lon);
|
|
|
|
const isVisible = now.isBetween(sunTimes.sunrise, sunTimes.sunset);
|
2020-01-18 09:50:43 -08:00
|
|
|
var nextEvent;
|
|
|
|
if (now.isBefore(sunTimes.sunrise)) {
|
|
|
|
nextEvent = sunTimes.sunrise;
|
|
|
|
} else if (now.isBefore(sunTimes.sunset)) {
|
|
|
|
nextEvent = sunTimes.sunset;
|
|
|
|
} else {
|
2020-02-13 08:35:09 +01:00
|
|
|
const tomorrowSunTimes = SunCalc.getTimes(now.clone().add(1, "day"), this.config.lat, this.config.lon);
|
2020-01-18 09:50:43 -08:00
|
|
|
nextEvent = tomorrowSunTimes.sunrise;
|
|
|
|
}
|
|
|
|
const untilNextEvent = moment.duration(moment(nextEvent).diff(now));
|
2020-02-13 08:35:09 +01:00
|
|
|
const untilNextEventString = untilNextEvent.hours() + "h " + untilNextEvent.minutes() + "m";
|
|
|
|
sunWrapper.innerHTML = "<span class=\"" + (isVisible ? "bright" : "") + "\"><i class=\"fa fa-sun-o\" aria-hidden=\"true\"></i> " + untilNextEventString + "</span>" +
|
|
|
|
"<span><i class=\"fa fa-arrow-up\" aria-hidden=\"true\"></i>" + formatTime(this.config, sunTimes.sunrise) + "</span>" +
|
|
|
|
"<span><i class=\"fa fa-arrow-down\" aria-hidden=\"true\"></i>" + formatTime(this.config, sunTimes.sunset) + "</span>";
|
2020-01-17 21:52:04 -08:00
|
|
|
}
|
|
|
|
if (this.config.showMoonTimes) {
|
|
|
|
const moonIllumination = SunCalc.getMoonIllumination(now.toDate());
|
|
|
|
const moonTimes = SunCalc.getMoonTimes(now, this.config.lat, this.config.lon);
|
2020-02-09 21:59:51 -08:00
|
|
|
const moonRise = moonTimes.rise;
|
|
|
|
var moonSet;
|
|
|
|
if (moment(moonTimes.set).isAfter(moonTimes.rise)) {
|
|
|
|
moonSet = moonTimes.set;
|
|
|
|
} else {
|
2020-02-13 08:35:09 +01:00
|
|
|
const nextMoonTimes = SunCalc.getMoonTimes(now.clone().add(1, "day"), this.config.lat, this.config.lon);
|
2020-02-09 21:59:51 -08:00
|
|
|
moonSet = nextMoonTimes.set;
|
|
|
|
}
|
|
|
|
const isVisible = now.isBetween(moonRise, moonSet) || moonTimes.alwaysUp === true;
|
2020-03-08 16:23:27 +01:00
|
|
|
const illuminatedFractionString = Math.round(moonIllumination.fraction * 100) + "%";
|
|
|
|
moonWrapper.innerHTML = "<span class=\"" + (isVisible ? "bright" : "") + "\"><i class=\"fa fa-moon-o\" aria-hidden=\"true\"></i> " + illuminatedFractionString + "</span>" +
|
|
|
|
"<span><i class=\"fa fa-arrow-up\" aria-hidden=\"true\"></i> " + (moonRise ? formatTime(this.config, moonRise) : "...") + "</span>"+
|
|
|
|
"<span><i class=\"fa fa-arrow-down\" aria-hidden=\"true\"></i> " + (moonSet ? formatTime(this.config, moonSet) : "...") + "</span>";
|
2020-01-17 21:52:04 -08:00
|
|
|
}
|
|
|
|
|
2016-07-08 17:16:51 -06:00
|
|
|
/****************************************************************
|
|
|
|
* Create wrappers for ANALOG clock, only if specified in config
|
|
|
|
*/
|
|
|
|
|
2020-04-20 22:16:23 +02:00
|
|
|
if (this.config.displayType !== "digital") {
|
2016-07-08 17:16:51 -06:00
|
|
|
// If it isn't 'digital', then an 'analog' clock was also requested
|
2016-07-09 16:29:25 -06:00
|
|
|
|
|
|
|
// Calculate the degree offset for each hand of the clock
|
2016-10-24 23:53:34 -03:00
|
|
|
if (this.config.timezone) {
|
|
|
|
now.tz(this.config.timezone);
|
|
|
|
}
|
|
|
|
var second = now.seconds() * 6,
|
2016-07-08 17:16:51 -06:00
|
|
|
minute = now.minute() * 6 + second / 60,
|
|
|
|
hour = ((now.hours() % 12) / 12) * 360 + 90 + minute / 12;
|
|
|
|
|
|
|
|
// Create wrappers
|
|
|
|
var clockCircle = document.createElement("div");
|
|
|
|
clockCircle.className = "clockCircle";
|
|
|
|
clockCircle.style.width = this.config.analogSize;
|
|
|
|
clockCircle.style.height = this.config.analogSize;
|
|
|
|
|
2019-06-05 09:32:10 +02:00
|
|
|
if (this.config.analogFace !== "" && this.config.analogFace !== "simple" && this.config.analogFace !== "none") {
|
2016-07-09 16:29:25 -06:00
|
|
|
clockCircle.style.background = "url("+ this.data.path + "faces/" + this.config.analogFace + ".svg)";
|
2016-07-08 17:16:51 -06:00
|
|
|
clockCircle.style.backgroundSize = "100%";
|
2017-01-15 19:38:46 +01:00
|
|
|
|
|
|
|
// The following line solves issue: https://github.com/MichMich/MagicMirror/issues/611
|
2019-01-05 17:04:33 +00:00
|
|
|
// clockCircle.style.border = "1px solid black";
|
|
|
|
clockCircle.style.border = "rgba(0, 0, 0, 0.1)"; //Updated fix for Issue 611 where non-black backgrounds are used
|
2017-01-15 19:41:42 +01:00
|
|
|
|
2019-06-05 09:32:10 +02:00
|
|
|
} else if (this.config.analogFace !== "none") {
|
2016-07-09 16:29:25 -06:00
|
|
|
clockCircle.style.border = "2px solid white";
|
2016-07-08 17:16:51 -06:00
|
|
|
}
|
|
|
|
var clockFace = document.createElement("div");
|
|
|
|
clockFace.className = "clockFace";
|
|
|
|
|
|
|
|
var clockHour = document.createElement("div");
|
|
|
|
clockHour.id = "clockHour";
|
|
|
|
clockHour.style.transform = "rotate(" + hour + "deg)";
|
|
|
|
clockHour.className = "clockHour";
|
|
|
|
var clockMinute = document.createElement("div");
|
|
|
|
clockMinute.id = "clockMinute";
|
|
|
|
clockMinute.style.transform = "rotate(" + minute + "deg)";
|
|
|
|
clockMinute.className = "clockMinute";
|
|
|
|
|
|
|
|
// Combine analog wrappers
|
|
|
|
clockFace.appendChild(clockHour);
|
|
|
|
clockFace.appendChild(clockMinute);
|
2016-07-09 16:29:25 -06:00
|
|
|
|
2016-07-08 18:57:23 -06:00
|
|
|
if (this.config.displaySeconds) {
|
2016-07-09 16:29:25 -06:00
|
|
|
var clockSecond = document.createElement("div");
|
|
|
|
clockSecond.id = "clockSecond";
|
|
|
|
clockSecond.style.transform = "rotate(" + second + "deg)";
|
|
|
|
clockSecond.className = "clockSecond";
|
|
|
|
clockSecond.style.backgroundColor = this.config.secondsColor;
|
2016-07-08 18:57:23 -06:00
|
|
|
clockFace.appendChild(clockSecond);
|
|
|
|
}
|
2016-07-08 17:16:51 -06:00
|
|
|
clockCircle.appendChild(clockFace);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*******************************************
|
|
|
|
* Combine wrappers, check for .displayType
|
|
|
|
*/
|
|
|
|
|
2016-12-01 19:48:53 -03:00
|
|
|
if (this.config.displayType === "digital") {
|
2016-07-08 17:16:51 -06:00
|
|
|
// Display only a digital clock
|
|
|
|
wrapper.appendChild(dateWrapper);
|
|
|
|
wrapper.appendChild(timeWrapper);
|
2020-01-17 21:52:04 -08:00
|
|
|
wrapper.appendChild(sunWrapper);
|
|
|
|
wrapper.appendChild(moonWrapper);
|
2017-03-28 22:02:30 +02:00
|
|
|
wrapper.appendChild(weekWrapper);
|
2016-12-01 19:48:53 -03:00
|
|
|
} else if (this.config.displayType === "analog") {
|
2016-07-08 17:16:51 -06:00
|
|
|
// Display only an analog clock
|
2017-03-28 22:02:30 +02:00
|
|
|
|
|
|
|
if (this.config.showWeek) {
|
|
|
|
weekWrapper.style.paddingBottom = "15px";
|
|
|
|
} else {
|
|
|
|
dateWrapper.style.paddingBottom = "15px";
|
|
|
|
}
|
|
|
|
|
2016-12-01 19:48:53 -03:00
|
|
|
if (this.config.analogShowDate === "top") {
|
2016-07-20 13:31:46 -06:00
|
|
|
wrapper.appendChild(dateWrapper);
|
2017-03-28 22:02:30 +02:00
|
|
|
wrapper.appendChild(weekWrapper);
|
2016-07-20 13:31:46 -06:00
|
|
|
wrapper.appendChild(clockCircle);
|
2016-12-01 19:48:53 -03:00
|
|
|
} else if (this.config.analogShowDate === "bottom") {
|
2016-07-20 13:31:46 -06:00
|
|
|
wrapper.appendChild(clockCircle);
|
|
|
|
wrapper.appendChild(dateWrapper);
|
2017-03-28 22:02:30 +02:00
|
|
|
wrapper.appendChild(weekWrapper);
|
2016-07-20 13:31:46 -06:00
|
|
|
} else {
|
|
|
|
wrapper.appendChild(clockCircle);
|
|
|
|
}
|
2016-07-08 17:16:51 -06:00
|
|
|
} else {
|
|
|
|
// Both clocks have been configured, check position
|
|
|
|
var placement = this.config.analogPlacement;
|
|
|
|
|
|
|
|
analogWrapper = document.createElement("div");
|
|
|
|
analogWrapper.id = "analog";
|
|
|
|
analogWrapper.style.cssFloat = "none";
|
|
|
|
analogWrapper.appendChild(clockCircle);
|
|
|
|
digitalWrapper = document.createElement("div");
|
|
|
|
digitalWrapper.id = "digital";
|
|
|
|
digitalWrapper.style.cssFloat = "none";
|
|
|
|
digitalWrapper.appendChild(dateWrapper);
|
|
|
|
digitalWrapper.appendChild(timeWrapper);
|
2020-01-17 21:52:04 -08:00
|
|
|
digitalWrapper.appendChild(sunWrapper);
|
|
|
|
digitalWrapper.appendChild(moonWrapper);
|
2017-03-28 22:02:30 +02:00
|
|
|
digitalWrapper.appendChild(weekWrapper);
|
2016-07-08 17:16:51 -06:00
|
|
|
|
2017-02-07 23:51:13 +01:00
|
|
|
var appendClocks = function(condition, pos1, pos2) {
|
2017-02-08 00:05:28 +01:00
|
|
|
var padding = [0,0,0,0];
|
|
|
|
padding[(placement === condition) ? pos1 : pos2] = "20px";
|
|
|
|
analogWrapper.style.padding = padding.join(" ");
|
|
|
|
if (placement === condition) {
|
|
|
|
wrapper.appendChild(analogWrapper);
|
|
|
|
wrapper.appendChild(digitalWrapper);
|
|
|
|
} else {
|
|
|
|
wrapper.appendChild(digitalWrapper);
|
|
|
|
wrapper.appendChild(analogWrapper);
|
|
|
|
}
|
2017-02-08 00:10:44 +01:00
|
|
|
};
|
2017-02-07 23:51:13 +01:00
|
|
|
|
2016-12-01 19:48:53 -03:00
|
|
|
if (placement === "left" || placement === "right") {
|
2016-07-08 17:16:51 -06:00
|
|
|
digitalWrapper.style.display = "inline-block";
|
|
|
|
digitalWrapper.style.verticalAlign = "top";
|
|
|
|
analogWrapper.style.display = "inline-block";
|
2017-02-07 23:51:13 +01:00
|
|
|
|
|
|
|
appendClocks("left", 1, 3);
|
2016-07-08 17:16:51 -06:00
|
|
|
} else {
|
|
|
|
digitalWrapper.style.textAlign = "center";
|
2017-02-07 23:51:13 +01:00
|
|
|
|
2017-02-08 00:05:28 +01:00
|
|
|
appendClocks("top", 2, 0);
|
2016-07-08 17:16:51 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-24 17:19:32 +01:00
|
|
|
// Return the wrapper to the dom.
|
|
|
|
return wrapper;
|
|
|
|
}
|
2016-10-24 23:53:34 -03:00
|
|
|
});
|