fix tabs, remove extra spaces and lines.

This commit is contained in:
Rodrigo Ramírez Norambuena 2016-12-29 22:23:08 -03:00
parent 4237d0c7e3
commit 19d906c5e4
17 changed files with 75 additions and 77 deletions

View File

@ -23,7 +23,7 @@ To run StyleLint, use `grunt stylelint`.
### Submitting Issues ### Submitting Issues
Please only submit reproducible issues. Please only submit reproducible issues.
If you're not sure if it's a real bug or if it's just you, please open a topic on the forum: [https://forum.magicmirror.builders/category/15/bug-hunt](https://forum.magicmirror.builders/category/15/bug-hunt) If you're not sure if it's a real bug or if it's just you, please open a topic on the forum: [https://forum.magicmirror.builders/category/15/bug-hunt](https://forum.magicmirror.builders/category/15/bug-hunt)
Problems installing or configuring your MagicMirror? Check out: [https://forum.magicmirror.builders/category/10/troubleshooting](https://forum.magicmirror.builders/category/10/troubleshooting) Problems installing or configuring your MagicMirror? Check out: [https://forum.magicmirror.builders/category/10/troubleshooting](https://forum.magicmirror.builders/category/10/troubleshooting)

View File

@ -1,4 +1,4 @@
> Please send your pull requests the develop branch. > Please send your pull requests the develop branch.
> Don't forget to add the change to CHANGELOG.md. > Don't forget to add the change to CHANGELOG.md.
* Does the pull request solve a **related** issue? * Does the pull request solve a **related** issue?

View File

@ -49,7 +49,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Solve an issue where module margins would appear when the first module of a section was hidden. - Solve an issue where module margins would appear when the first module of a section was hidden.
- Solved visual display errors on chrome, if all modules in one of the right sections are hidden. - Solved visual display errors on chrome, if all modules in one of the right sections are hidden.
- Global and Module default config values are no longer modified when setting config values. - Global and Module default config values are no longer modified when setting config values.
- Hide a region if all modules in a region are hidden. Prevention unwanted margins. - Hide a region if all modules in a region are hidden. Prevention unwanted margins.
- Replaced `electron-prebuilt` package with `electron` in order to fix issues that would happen after 2017. - Replaced `electron-prebuilt` package with `electron` in order to fix issues that would happen after 2017.
- Documentation of alert module - Documentation of alert module

View File

@ -18,7 +18,7 @@ echo ' \$$$$$$ |'
echo ' \______/' echo ' \______/'
echo -e "\e[0m" echo -e "\e[0m"
# Define the tested version of Node.js. # Define the tested version of Node.js.
NODE_TESTED="v5.1.0" NODE_TESTED="v5.1.0"
#Determine which Pi is running. #Determine which Pi is running.
@ -49,19 +49,19 @@ if command_exists node; then
echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m" echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m"
echo -e "\e[0mInstalled Node version: \e[1m$NODE_CURRENT\e[0m" echo -e "\e[0mInstalled Node version: \e[1m$NODE_CURRENT\e[0m"
if version_gt $NODE_TESTED $NODE_CURRENT; then if version_gt $NODE_TESTED $NODE_CURRENT; then
echo -e "\e[96mNode should be upgraded.\e[0m" echo -e "\e[96mNode should be upgraded.\e[0m"
NODE_INSTALL=true NODE_INSTALL=true
#Check if a node process is currenlty running. #Check if a node process is currenlty running.
#If so abort installation. #If so abort installation.
if pgrep "node" > /dev/null; then if pgrep "node" > /dev/null; then
echo -e "\e[91mA Node process is currently running. Can't upgrade." echo -e "\e[91mA Node process is currently running. Can't upgrade."
echo "Please quit all Node processes and restart the installer." echo "Please quit all Node processes and restart the installer."
exit; exit;
fi fi
else else
echo -e "\e[92mNo Node.js upgrade nessecery.\e[0m" echo -e "\e[92mNo Node.js upgrade nessecery.\e[0m"
fi fi
else else
@ -116,27 +116,27 @@ fi
# Check if plymouth is installed (default with PIXEL desktop environment), then install custom splashscreen. # Check if plymouth is installed (default with PIXEL desktop environment), then install custom splashscreen.
echo -e "\e[96mCheck plymouth installation ...\e[0m" echo -e "\e[96mCheck plymouth installation ...\e[0m"
if command_exists plymouth; then if command_exists plymouth; then
THEME_DIR="/usr/share/plymouth/themes" THEME_DIR="/usr/share/plymouth/themes"
echo -e "\e[90mSplashscreen: Checking themes directory.\e[0m" echo -e "\e[90mSplashscreen: Checking themes directory.\e[0m"
if [ -d $THEME_DIR ]; then if [ -d $THEME_DIR ]; then
echo -e "\e[90mSplashscreen: Create theme directory if not exists.\e[0m" echo -e "\e[90mSplashscreen: Create theme directory if not exists.\e[0m"
if [ ! -d $THEME_DIR/MagicMirror ]; then if [ ! -d $THEME_DIR/MagicMirror ]; then
sudo mkdir $THEME_DIR/MagicMirror sudo mkdir $THEME_DIR/MagicMirror
fi fi
if sudo cp ~/MagicMirror/splashscreen/splash.png $THEME_DIR/MagicMirror/splash.png && sudo cp ~/MagicMirror/splashscreen/MagicMirror.plymouth $THEME_DIR/MagicMirror/MagicMirror.plymouth && sudo cp ~/MagicMirror/splashscreen/MagicMirror.script $THEME_DIR/MagicMirror/MagicMirror.script; then if sudo cp ~/MagicMirror/splashscreen/splash.png $THEME_DIR/MagicMirror/splash.png && sudo cp ~/MagicMirror/splashscreen/MagicMirror.plymouth $THEME_DIR/MagicMirror/MagicMirror.plymouth && sudo cp ~/MagicMirror/splashscreen/MagicMirror.script $THEME_DIR/MagicMirror/MagicMirror.script; then
echo -e "\e[90mSplashscreen: Theme copied successfully.\e[0m" echo -e "\e[90mSplashscreen: Theme copied successfully.\e[0m"
if sudo plymouth-set-default-theme -R MagicMirror; then if sudo plymouth-set-default-theme -R MagicMirror; then
echo -e "\e[92mSplashscreen: Changed theme to MagicMirror successfully.\e[0m" echo -e "\e[92mSplashscreen: Changed theme to MagicMirror successfully.\e[0m"
else else
echo -e "\e[91mSplashscreen: Couldn't change theme to MagicMirror!\e[0m" echo -e "\e[91mSplashscreen: Couldn't change theme to MagicMirror!\e[0m"
fi fi
else else
echo -e "\e[91mSplashscreen: Copying theme failed!\e[0m" echo -e "\e[91mSplashscreen: Copying theme failed!\e[0m"
fi fi
else else
echo -e "\e[91mSplashscreen: Themes folder doesn't exist!\e[0m" echo -e "\e[91mSplashscreen: Themes folder doesn't exist!\e[0m"
fi fi
else else
echo -e "\e[93mplymouth is not installed.\e[0m"; echo -e "\e[93mplymouth is not installed.\e[0m";
fi fi

View File

@ -79,7 +79,7 @@ function cloneObject(obj) {
var temp = obj.constructor(); // give temp the original obj's constructor var temp = obj.constructor(); // give temp the original obj's constructor
for (var key in obj) { for (var key in obj) {
temp[key] = cloneObject(obj[key]); temp[key] = cloneObject(obj[key]);
if (key === "lockStrings") { if (key === "lockStrings") {
Log.log(key); Log.log(key);
} }

View File

@ -12,7 +12,7 @@ var defaults = {
kioskmode: false, kioskmode: false,
electronOptions: {}, electronOptions: {},
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
language: "en", language: "en",
timeFormat: 24, timeFormat: 24,
units: "metric", units: "metric",

View File

@ -18,15 +18,15 @@ const BrowserWindow = electron.BrowserWindow;
let mainWindow; let mainWindow;
function createWindow() { function createWindow() {
var electronOptionsDefaults = { var electronOptionsDefaults = {
width: 800, width: 800,
height: 600, height: 600,
x: 0, x: 0,
y: 0, y: 0,
darkTheme: true, darkTheme: true,
webPreferences: { webPreferences: {
nodeIntegration: false, nodeIntegration: false,
zoomFactor: config.zoom zoomFactor: config.zoom
} }
} }

View File

@ -41,7 +41,7 @@ var Server = function(config, callback) {
app.get("/version", function(req,res) { app.get("/version", function(req,res) {
res.send(global.version); res.send(global.version);
}); });
app.get("/", function(req, res) { app.get("/", function(req, res) {
var html = fs.readFileSync(path.resolve(__dirname + "/../index.html"), {encoding: "utf8"}); var html = fs.readFileSync(path.resolve(__dirname + "/../index.html"), {encoding: "utf8"});
html = html.replace("#VERSION#", global.version); html = html.replace("#VERSION#", global.version);

View File

@ -82,11 +82,11 @@ Any properties defined in the defaults object, will be merged with the module co
*Introduced in version: 2.1.0.* *Introduced in version: 2.1.0.*
A string that defines the minimum version of the MagicMirror framework. If it is set, the system compares the required version with the users version. If the version of the user is out of date, it won't run the module. Make sure to also set this value in the Node helper. A string that defines the minimum version of the MagicMirror framework. If it is set, the system compares the required version with the users version. If the version of the user is out of date, it won't run the module. Make sure to also set this value in the Node helper.
**Note:** Since this check is introduced in version 2.1.0, this check will not be run in older versions. Keep this in mind if you get issue reports on your module. **Note:** Since this check is introduced in version 2.1.0, this check will not be run in older versions. Keep this in mind if you get issue reports on your module.
Example: Example:
````javascript ````javascript
requiresVersion: "2.1.0", requiresVersion: "2.1.0",
```` ````
@ -117,7 +117,7 @@ The getScripts method is called to request any additional scripts that need to b
getScripts: function() { getScripts: function() {
return [ return [
'script.js', // will try to load it from the vendor folder, otherwise it will load is from the module folder. 'script.js', // will try to load it from the vendor folder, otherwise it will load is from the module folder.
'moment.js', // this file is available in the vendor folder, so it doesn't need to be available in the module folder. 'moment.js', // this file is available in the vendor folder, so it doesn't need to be available in the module folder.
this.file('anotherfile.js'), // this file will be loaded straight from the module folder. this.file('anotherfile.js'), // this file will be loaded straight from the module folder.
'https://code.jquery.com/jquery-2.2.3.min.js', // this file will be loaded from the jquery servers. 'https://code.jquery.com/jquery-2.2.3.min.js', // this file will be loaded from the jquery servers.
] ]
@ -339,7 +339,7 @@ Visiblity locking helps the module system to prevent unwanted hide/show actions.
````javascript ````javascript
moduleA.hide(0, {lockString: "module_b_identifier"}); moduleA.hide(0, {lockString: "module_b_identifier"});
```` ````
Module A is now hidden, and has an lock array with the following strings: Module A is now hidden, and has an lock array with the following strings:
````javascript ````javascript
moduleA.lockStrings == ["module_b_identifier"] moduleA.lockStrings == ["module_b_identifier"]
moduleA.hidden == true moduleA.hidden == true
@ -474,7 +474,7 @@ A string that defines the minimum version of the MagicMirror framework. If it is
**Note:** Since this check is introduced in version 2.1.0, this check will not be run in older versions. Keep this in mind if you get issue reports on your module. **Note:** Since this check is introduced in version 2.1.0, this check will not be run in older versions. Keep this in mind if you get issue reports on your module.
Example: Example:
````javascript ````javascript
requiresVersion: "2.1.0", requiresVersion: "2.1.0",
```` ````

View File

@ -35,7 +35,6 @@ Module.register("alert",{
}, },
show_notification: function(message) { show_notification: function(message) {
if (this.config.effect == "slide") {this.config.effect = this.config.effect + "-" + this.config.position;} if (this.config.effect == "slide") {this.config.effect = this.config.effect + "-" + this.config.position;}
msg = ""; msg = "";
if (message.title) { if (message.title) {
msg += "<span class='thin' style='line-height: 35px; font-size:24px' color='#4A4A4A'>" + message.title + "</span>"; msg += "<span class='thin' style='line-height: 35px; font-size:24px' color='#4A4A4A'>" + message.title + "</span>";
@ -46,7 +45,7 @@ Module.register("alert",{
} }
msg += "<span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>"; msg += "<span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>";
} }
new NotificationFx({ new NotificationFx({
message: msg, message: msg,
layout: "growl", layout: "growl",

View File

@ -109,7 +109,7 @@ The following properties can be configured:
<code> <code>
titleReplace: {'Birthday of ' : '', 'foo':'bar'} titleReplace: {'Birthday of ' : '', 'foo':'bar'}
</code> </code>
<br><b>Default value:</b> <br><b>Default value:</b>
<code> <code>
{ {
"De verjaardag van ": "", "De verjaardag van ": "",
@ -158,7 +158,7 @@ The following properties can be configured:
<td><code>broadcastEvents</code></td> <td><code>broadcastEvents</code></td>
<td>If this property is set to true, the calendar will broadcast all the events to all other modules with the notification message: <code>CALENDAR_EVENTS</code>. The event objects are stored in an array and contain the following fields: <code>title</code>, <code>startDate</code>, <code>endDate</code>, <code>fullDayEvent</code>, <code>location</code> and <code>geo</code>.<br> <td>If this property is set to true, the calendar will broadcast all the events to all other modules with the notification message: <code>CALENDAR_EVENTS</code>. The event objects are stored in an array and contain the following fields: <code>title</code>, <code>startDate</code>, <code>endDate</code>, <code>fullDayEvent</code>, <code>location</code> and <code>geo</code>.<br>
<br><b>Possible values:</b> <code>true</code>, <code>false</code> <br> <br><b>Possible values:</b> <code>true</code>, <code>false</code> <br>
<br><b>Default value:</b> <code>true</code> <br><b>Default value:</b> <code>true</code>
</td> </td>
</tr> </tr>
<tr> <tr>

View File

@ -220,7 +220,7 @@ Module.register("clock",{
wrapper.appendChild(digitalWrapper); wrapper.appendChild(digitalWrapper);
} else { } else {
analogWrapper.style.padding = "20px 0 0 0"; analogWrapper.style.padding = "20px 0 0 0";
wrapper.appendChild(digitalWrapper); wrapper.appendChild(digitalWrapper);
wrapper.appendChild(analogWrapper); wrapper.appendChild(analogWrapper);
} }
} }

View File

@ -57,7 +57,7 @@ The following properties can be configured:
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>remoteFile</code></td> <td><code>remoteFile</code></td>
<td>External file from which to load the compliments<br> <td>External file from which to load the compliments<br>
<br><b>Possible values:</b>Path to a JSON file containing compliments, configured <br><b>Possible values:</b>Path to a JSON file containing compliments, configured
as per the value of the <i>compliments configuration</i> (see below). An object with three arrays: as per the value of the <i>compliments configuration</i> (see below). An object with three arrays:
@ -136,7 +136,7 @@ config: {
### External Compliment File ### External Compliment File
You may specify an external file that contains the three compliment arrays. This is particularly useful if you have a You may specify an external file that contains the three compliment arrays. This is particularly useful if you have a
large number of compliments and do not wish to crowd your `config.js` file with a large array of compliments. large number of compliments and do not wish to crowd your `config.js` file with a large array of compliments.
Adding the `remoteFile` variable will override an array you specify in the configuration file. Adding the `remoteFile` variable will override an array you specify in the configuration file.
This file must be straight JSON. Note that the array names need quotes This file must be straight JSON. Note that the array names need quotes
around them ("morning", "afternoon", "evening", "snow", "rain", etc.). around them ("morning", "afternoon", "evening", "snow", "rain", etc.).

View File

@ -37,7 +37,7 @@ Module.register("currentweather",{
onlyTemp: false, onlyTemp: false,
roundTemp: false, roundTemp: false,
iconTable: { iconTable: {
"01d": "wi-day-sunny", "01d": "wi-day-sunny",
"02d": "wi-day-cloudy", "02d": "wi-day-cloudy",

View File

@ -113,13 +113,13 @@ The following properties can be configured:
removeEndTags: false, removeEndTags: false,
startTags: [], startTags: [],
endTags: [] endTags: []
<tr> <tr>
<td><code>removeStartTags</code></td> <td><code>removeStartTags</code></td>
<td>Some newsfeeds feature tags at the <B>beginning</B> of their titles or descriptions, such as <em>[VIDEO]</em>. <td>Some newsfeeds feature tags at the <B>beginning</B> of their titles or descriptions, such as <em>[VIDEO]</em>.
This setting allows for the removal of specified tags from the beginning of an item's description and/or title.<br> This setting allows for the removal of specified tags from the beginning of an item's description and/or title.<br>
<br><b>Possible values:</b><code>'title'</code>, <code>'description'</code>, <code>'both'</code> <br><b>Possible values:</b><code>'title'</code>, <code>'description'</code>, <code>'both'</code>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -131,7 +131,7 @@ The following properties can be configured:
<tr> <tr>
<td><code>removeEndTags</code></td> <td><code>removeEndTags</code></td>
<td>Remove specified tags from the <B>end</B> of an item's description and/or title.<br> <td>Remove specified tags from the <B>end</B> of an item's description and/or title.<br>
<br><b>Possible values:</b><code>'title'</code>, <code>'description'</code>, <code>'both'</code> <br><b>Possible values:</b><code>'title'</code>, <code>'description'</code>, <code>'both'</code>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -173,7 +173,7 @@ The `feeds` property contains an array with multiple objects. These objects have
<td>The encoding of the news feed.<br> <td>The encoding of the news feed.<br>
<br>This property is optional. <br>This property is optional.
<br><b>Possible values:</b><code>'UTF-8'</code>, <code>'ISO-8859-1'</code>, etc ... <br><b>Possible values:</b><code>'UTF-8'</code>, <code>'ISO-8859-1'</code>, etc ...
<br><b>Default value:</b> <code>'UTF-8'</code> <br><b>Default value:</b> <code>'UTF-8'</code>
</td> </td>
</tr> </tr>

View File

@ -29,7 +29,7 @@ Module.register("newsfeed",{
removeEndTags: "", removeEndTags: "",
startTags: [], startTags: [],
endTags: [] endTags: []
}, },
// Define required scripts. // Define required scripts.
@ -112,17 +112,17 @@ Module.register("newsfeed",{
//Remove selected tags from the beginning of rss feed items (title or description) //Remove selected tags from the beginning of rss feed items (title or description)
if (this.config.removeStartTags == "title" || "both") { if (this.config.removeStartTags == "title" || "both") {
for (f=0; f<this.config.startTags.length;f++) { for (f=0; f<this.config.startTags.length;f++) {
if (this.newsItems[this.activeItem].title.slice(0,this.config.startTags[f].length) == this.config.startTags[f]) { if (this.newsItems[this.activeItem].title.slice(0,this.config.startTags[f].length) == this.config.startTags[f]) {
this.newsItems[this.activeItem].title = this.newsItems[this.activeItem].title.slice(this.config.startTags[f].length,this.newsItems[this.activeItem].title.length); this.newsItems[this.activeItem].title = this.newsItems[this.activeItem].title.slice(this.config.startTags[f].length,this.newsItems[this.activeItem].title.length);
} }
} }
} }
if (this.config.removeStartTags == "description" || "both") { if (this.config.removeStartTags == "description" || "both") {
if (this.config.showDescription) { if (this.config.showDescription) {
for (f=0; f<this.config.startTags.length;f++) { for (f=0; f<this.config.startTags.length;f++) {
if (this.newsItems[this.activeItem].description.slice(0,this.config.startTags[f].length) == this.config.startTags[f]) { if (this.newsItems[this.activeItem].description.slice(0,this.config.startTags[f].length) == this.config.startTags[f]) {
@ -130,9 +130,9 @@ Module.register("newsfeed",{
} }
} }
} }
} }
//Remove selected tags from the end of rss feed items (title or description) //Remove selected tags from the end of rss feed items (title or description)
if (this.config.removeEndTags) { if (this.config.removeEndTags) {
@ -141,7 +141,7 @@ Module.register("newsfeed",{
this.newsItems[this.activeItem].title = this.newsItems[this.activeItem].title.slice(0,-this.config.endTags[f].length); this.newsItems[this.activeItem].title = this.newsItems[this.activeItem].title.slice(0,-this.config.endTags[f].length);
} }
} }
if (this.config.showDescription) { if (this.config.showDescription) {
for (f=0; f<this.config.endTags.length;f++) { for (f=0; f<this.config.endTags.length;f++) {
if (this.newsItems[this.activeItem].description.slice(-this.config.endTags[f].length)==this.config.endTags[f]) { if (this.newsItems[this.activeItem].description.slice(-this.config.endTags[f].length)==this.config.endTags[f]) {
@ -149,14 +149,14 @@ Module.register("newsfeed",{
} }
} }
} }
} }
var title = document.createElement("div"); var title = document.createElement("div");
title.className = "bright medium light"; title.className = "bright medium light";
title.innerHTML = this.newsItems[this.activeItem].title; title.innerHTML = this.newsItems[this.activeItem].title;
wrapper.appendChild(title); wrapper.appendChild(title);
if (this.config.showDescription) { if (this.config.showDescription) {
var description = document.createElement("div"); var description = document.createElement("div");
description.className = "small light"; description.className = "small light";

View File

@ -35,7 +35,7 @@ Module.register("weatherforecast",{
calendarClass: "calendar", calendarClass: "calendar",
roundTemp: false, roundTemp: false,
iconTable: { iconTable: {
"01d": "wi-day-sunny", "01d": "wi-day-sunny",
"02d": "wi-day-cloudy", "02d": "wi-day-cloudy",
@ -191,15 +191,15 @@ Module.register("weatherforecast",{
} }
if (notification === "CALENDAR_EVENTS") { if (notification === "CALENDAR_EVENTS") {
var senderClasses = sender.data.classes.toLowerCase().split(" "); var senderClasses = sender.data.classes.toLowerCase().split(" ");
if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) { if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
var lastEvent = this.firstEvent; var lastEvent = this.firstEvent;
this.firstEvent = false; this.firstEvent = false;
for (e in payload) { for (e in payload) {
var event = payload[e]; var event = payload[e];
if (event.location || event.geo) { if (event.location || event.geo) {
this.firstEvent = event; this.firstEvent = event;
//Log.log("First upcoming event with location: ", event); //Log.log("First upcoming event with location: ", event);
break; break;
} }
} }
@ -355,4 +355,3 @@ Module.register("weatherforecast",{
return parseFloat(temperature).toFixed(decimals); return parseFloat(temperature).toFixed(decimals);
} }
}); });