kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10 from MichMich/v2-beta

Browse Source 
Update V2 beta from master
This commit is contained in:
Paul-Vincent Roll 2016-04-01 12:18:04 +02:00
commit eb0446bfe1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -14,6 +14,9 @@ This version of the Magic Mirror software focusses on a modular plugin system. B
##Todo ##Todo
Things that still have to be implemented or changed. Things that still have to be implemented or changed.
####Main
- Allow show/hide animations to animate the height. This way the other modules won't jump around.
####Documentation ####Documentation
- Write all the documentation. :) - Write all the documentation. :)

6
js/main.js
View File

@ -422,10 +422,8 @@ var MM = (function() {
* argument callback function - Called when the animation is done. * argument callback function - Called when the animation is done.
*/ */
hideModule: function(module, speed, callback) { hideModule: function(module, speed, callback) {
hideModule(module, speed, function() { module.hidden = true;
module.hidden = true; hideModule(module, speed, callback);
if (typeof callback === 'function') { callback(); }
});
}, },
/* showModule(module, speed, callback) /* showModule(module, speed, callback)

2
modules/compliments/compliments.js
View File

@ -113,7 +113,7 @@ Module.register('compliments',{
var compliment = document.createTextNode(complimentText); var compliment = document.createTextNode(complimentText);
var wrapper = document.createElement("div"); var wrapper = document.createElement("div");
wrapper.className = 'thin xlarge'; wrapper.className = 'thin xlarge bright';
wrapper.appendChild(compliment); wrapper.appendChild(compliment);
return wrapper; return wrapper;