Restore code removed on Merges on 2017-03-17

CHANGELOG.md

@@ -65,6 +65,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Module currentWeather: check if temperature received from api is defined.
 - Fix an issue with module hidden status changing to `true` although lock string prevented showing it
 - Fix newsfeed module bug (removeStartTags)
+- Fixed missing animation on `this.show(speed)` when module is alone in a region.
 
 ## [2.1.0] - 2016-12-31
 

js/app.js

@@ -69,14 +69,12 @@ var App = function() {
 		} catch (e) {
 			if (e.code == "ENOENT") {
 				console.error("WARNING! Could not find config file. Please create one. Starting with default configuration.");
-				callback(defaults);
 			} else if (e instanceof ReferenceError || e instanceof SyntaxError) {
 				console.error("WARNING! Could not validate config file. Please correct syntax errors. Starting with default configuration.");
-				callback(defaults);
 			} else {
 				console.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e);
-				callback(defaults);
 			}
+			callback(defaults);
 		}
 	};
 

js/main.js

@@ -245,10 +245,13 @@ var MM = (function() {
 			moduleWrapper.style.transition = "opacity " + speed / 1000 + "s";
 			// Restore the postition. See hideModule() for more info.
 			moduleWrapper.style.position = "static";
-			moduleWrapper.style.opacity = 1;
 
 			updateWrapperStates();
 
+			// Waiting for DOM-changes done in updateWrapperStates before we can start the animation.
+			var dummy = moduleWrapper.parentElement.parentElement.offsetHeight;
+			moduleWrapper.style.opacity = 1;
+
 			clearTimeout(module.showHideTimer);
 			module.showHideTimer = setTimeout(function() {
 				if (typeof callback === "function") { callback(); }

translations/id.json

@@ -0,0 +1,30 @@
+{
+	"LOADING": "Memuat …",
+
+	"TODAY": "Hari ini",
+	"TOMORROW": "Besok",
+	"DAYAFTERTOMORROW": "Lusa",
+	"RUNNING": "Berakhir dalam",
+	"EMPTY": "Tidak ada agenda",
+
+	"N": "U",
+	"NNE": "UUT",
+	"NE": "NE",
+	"ENE": "TUT",
+	"E": "T",
+	"ESE": "TST",
+	"SE": "ST",
+	"SSE": "SST",
+	"S": "S",
+	"SSW": "SSB",
+	"SW": "SB",
+	"WSW": "BSB",
+	"W": "B",
+	"WNW": "BUB",
+	"NW": "UB",
+	"NNW": "UUB",
+
+	"UPDATE_NOTIFICATION": "Update MagicMirror² tersedia.",
+	"UPDATE_NOTIFICATION_MODULE": "Update tersedia untuk modul MODULE_NAME.",
+	"UPDATE_INFO": "Instalasi saat ini tertinggal COMMIT_COUNT pada cabang BRANCH_NAME."
+}

translations/nb.json

@@ -3,6 +3,7 @@
 
 	"TODAY": "I dag",
 	"TOMORROW": "I morgen",
+	"DAYAFTERTOMORROW": "I overmorgen",
 	"RUNNING": "Slutter om",
 	"EMPTY": "Ingen kommende arrangementer.",
 
@@ -21,5 +22,9 @@
 	"W": "V",
 	"WNW": "VNV",
 	"NW": "NV",
-	"NNW": "NNV"
+	"NNW": "NNV",
+
+	"UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengelig.",
+	"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen MODULE_NAME.",
+	"UPDATE_INFO": "Nåværende installasjon er COMMIT_COUNT bak BRANCH_NAME grenen."
 }

translations/nn.json

@@ -3,6 +3,7 @@
 
 	"TODAY": "I dag",
 	"TOMORROW": "I morgon",
+	"DAYAFTERTOMORROW": "I overmorgon",
 	"RUNNING": "Sluttar om",
 	"EMPTY": "Ingen komande hendingar.",
 
@@ -21,5 +22,9 @@
 	"W": "V",
 	"WNW": "VNV",
 	"NW": "NV",
-	"NNW": "NNV"
+	"NNW": "NNV",
+
+	"UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.",
+	"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen MODULE_NAME.",
+	"UPDATE_INFO": "noverande installasjon er COMMIT_COUNT bak BRANCH_NAME greinen."
 }

translations/translations.js

@@ -18,6 +18,7 @@ var translations = {
 	"pt" : "translations/pt.json", // Português
 	"pt_br" : "translations/pt_br.json", // Português Brasileiro
 	"sv" : "translations/sv.json", // Svenska
+	"id" : "translations/id.json", // Indonesian
 	"it" : "translations/it.json", // Italian
 	"zh_cn" : "translations/zh_cn.json", // Simplified Chinese
 	"zh_tw" : "translations/zh_tw.json", // Traditional Chinese