Merge pull request #11 from IPdotSetAF/10-daylight-saving-bug

10 daylight saving bug

Author: IPdotSetAF

README.md

@@ -21,8 +21,8 @@ Click on each preview to watch live
 </p>
 <p>
    <a href="https://ipdotsetaf.github.io/NeoMatrix/?preset=eyJjb250cm9sbGVycyI6e30sImZvbGRlcnMiOnsiUmFpbiI6eyJjb250cm9sbGVycyI6eyJNYXRyaXggU3BlZWQiOjI0LCJUcmFpbCBMZW5ndGgiOjAuODYsIkRyb3AgQ291bnQvQ29sdW1uIjoxLCJJbml0aWFsIEFuaW1hdGlvbiI6IjEifSwiZm9sZGVycyI6e319LCJDb2xvciI6eyJjb250cm9sbGVycyI6eyJDb2xvciBNb2RlIjoiMCIsIk1hdHJpeCBDb2xvciI6IiMwMGZmMDAiLCJDb2xvciBBbmltYXRpb24gU3BlZWQiOjAuNSwiSGlnaGxpZ2h0IEZpcnN0IENoYXJhY3RlciI6dHJ1ZX0sImZvbGRlcnMiOnt9fSwiQ2hhcmFjdGVycyI6eyJjb250cm9sbGVycyI6eyJDaGFyIHNldCI6IjMiLCJDdXN0b20gQ2hhciBTZXQiOiIwMTIzNDU2Nzg5QUJDREVGIn0sImZvbGRlcnMiOnt9fSwiRm9udCI6eyJjb250cm9sbGVycyI6eyJGb250IFNpemUiOjE1LCJGb250IjoiMyIsIkN1c3RvbSBGb250IjoibW9ub3NwYWNlIn0sImZvbGRlcnMiOnt9fSwiQXVkaW8gKG5vdCBhdmFpbGFibGUgaW4gd2ViIHZlcnNpb24pIjp7ImNvbnRyb2xsZXJzIjp7fSwiZm9sZGVycyI6e319LCJMb2dvIjp7ImNvbnRyb2xsZXJzIjp7IkxvZ28iOiI4IiwiQ3VzdG9tIExvZ28gVVJMIChTVkcvUE5HKSI6IiIsIlByZXNlcnZlIExvZ28gQ29sb3IiOnRydWUsIlNjYWxlIjowLjh9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOjAsIlkiOi0xMjV9LCJmb2xkZXJzIjp7fX19fSwiQ2xvY2siOnsiY29udHJvbGxlcnMiOnsiQ2xvY2siOiIxIiwiMjQgSG91ciBmb3JtYXQiOnRydWUsIkRheS1saWdodCBTYXZpbmciOjAsIlNjYWxlIjoyfSwiZm9sZGVycyI6eyJQb3NpdGlvbiI6eyJjb250cm9sbGVycyI6eyJYIjowLCJZIjoxNH0sImZvbGRlcnMiOnt9fX19LCJNZXNzYWdlIjp7ImNvbnRyb2xsZXJzIjp7Ik1lc3NhZ2UiOmZhbHNlLCJNZXNzYWdlIFRleHQiOiJUSEUgTUFUUklYIiwiU2NhbGUiOjF9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOjAsIlkiOjB9LCJmb2xkZXJzIjp7fX19fSwiT3RoZXIiOnsiY29udHJvbGxlcnMiOnsiQ29kZXMgKENvbW1hIHNlcGFyYXRlZCkiOiJUSEUgTUFUUklYLElQLkFGIn0sImZvbGRlcnMiOnt9fX19"><img src="images/preview4.gif" width=270px height=270px/></a>
-   <a href="https://ipdotsetaf.github.io/NeoMatrix/?preset=eyJjb250cm9sbGVycyI6e30sImZvbGRlcnMiOnsiUmFpbiI6eyJjb250cm9sbGVycyI6eyJNYXRyaXggU3BlZWQiOjI0LCJUcmFpbCBMZW5ndGgiOjAuODIsIkRyb3AgQ291bnQvQ29sdW1uIjoxLCJJbml0aWFsIEFuaW1hdGlvbiI6IjEifSwiZm9sZGVycyI6e319LCJDb2xvciI6eyJjb250cm9sbGVycyI6eyJDb2xvciBNb2RlIjoiMyIsIk1hdHJpeCBDb2xvciI6IiMwMGZmMDAiLCJDb2xvciBBbmltYXRpb24gU3BlZWQiOjAuMTQsIkhpZ2hsaWdodCBGaXJzdCBDaGFyYWN0ZXIiOmZhbHNlfSwiZm9sZGVycyI6e319LCJDaGFyYWN0ZXJzIjp7ImNvbnRyb2xsZXJzIjp7IkNoYXIgc2V0IjoiMyIsIkN1c3RvbSBDaGFyIFNldCI6IjAxMjM0NTY3ODlBQkNERUYifSwiZm9sZGVycyI6e319LCJGb250Ijp7ImNvbnRyb2xsZXJzIjp7IkZvbnQgU2l6ZSI6MTUsIkZvbnQiOiIzIiwiQ3VzdG9tIEZvbnQiOiJtb25vc3BhY2UifSwiZm9sZGVycyI6e319LCJBdWRpbyAobm90IGF2YWlsYWJsZSBpbiB3ZWIgdmVyc2lvbikiOnsiY29udHJvbGxlcnMiOnt9LCJmb2xkZXJzIjp7fX0sIkxvZ28iOnsiY29udHJvbGxlcnMiOnsiTG9nbyI6IjIiLCJDdXN0b20gTG9nbyBVUkwgKFNWRy9QTkcpIjoiIiwiUHJlc2VydmUgTG9nbyBDb2xvciI6ZmFsc2UsIlNjYWxlIjowLjl9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOi03MCwiWSI6LTg3fSwiZm9sZGVycyI6e319fX0sIkNsb2NrIjp7ImNvbnRyb2xsZXJzIjp7IkNsb2NrIjoiMSIsIjI0IEhvdXIgZm9ybWF0Ijp0cnVlLCJEYXktbGlnaHQgU2F2aW5nIjowLCJTY2FsZSI6Mn0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6LTUsIlkiOjE4fSwiZm9sZGVycyI6e319fX0sIkRheSI6eyJjb250cm9sbGVycyI6eyJEYXkiOiIyIiwiQWxsIENBUFMiOnRydWUsIlZlcnRpY2FsIE9yaWVudGF0aW9uIjpmYWxzZSwiU2NhbGUiOjB9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOjYsIlkiOjI1fSwiZm9sZGVycyI6e319fX0sIkRhdGUiOnsiY29udHJvbGxlcnMiOnsiRGF5Ijp0cnVlLCJZZWFyIjoiMSIsIk9yZGVyIjoiMCIsIk1vbnRoIE5hbWUiOnRydWUsIkFsbCBDQVBTIjp0cnVlLCJEZWxpbWl0ZXIiOiIyIiwiVmVydGljYWwgT3JpZW50YXRpb24iOmZhbHNlLCJTY2FsZSI6MH0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6LTIsIlkiOjI1fSwiZm9sZGVycyI6e319fX0sIk1lc3NhZ2UiOnsiY29udHJvbGxlcnMiOnsiTWVzc2FnZSI6dHJ1ZSwiTWVzc2FnZSBUZXh0IjoiSVxcblBcXG5BXFxuRiIsIlNjYWxlIjoyfSwiZm9sZGVycyI6eyJQb3NpdGlvbiI6eyJjb250cm9sbGVycyI6eyJYIjoyMiwiWSI6MH0sImZvbGRlcnMiOnt9fX19LCJPdGhlciI6eyJjb250cm9sbGVycyI6eyJDb2RlcyAoQ29tbWEgc2VwYXJhdGVkKSI6IklQLkFGIn0sImZvbGRlcnMiOnt9fX19"><img src="images/preview5.gif" width=270px height=270px/></a>
-   <a href="https://ipdotsetaf.github.io/NeoMatrix/?preset=eyJjb250cm9sbGVycyI6e30sImZvbGRlcnMiOnsiUmFpbiI6eyJjb250cm9sbGVycyI6eyJNYXRyaXggU3BlZWQiOjIwLCJUcmFpbCBMZW5ndGgiOjAuNzUsIkRyb3AgQ291bnQvQ29sdW1uIjoyLCJJbml0aWFsIEFuaW1hdGlvbiI6IjIifSwiZm9sZGVycyI6e319LCJDb2xvciI6eyJjb250cm9sbGVycyI6eyJDb2xvciBNb2RlIjoiMyIsIk1hdHJpeCBDb2xvciI6IiMwMGZmMDAiLCJDb2xvciBBbmltYXRpb24gU3BlZWQiOjAuMTIsIkhpZ2hsaWdodCBGaXJzdCBDaGFyYWN0ZXIiOmZhbHNlfSwiZm9sZGVycyI6e319LCJDaGFyYWN0ZXJzIjp7ImNvbnRyb2xsZXJzIjp7IkNoYXIgc2V0IjoiMyIsIkN1c3RvbSBDaGFyIFNldCI6IjAxMjM0NTY3ODlBQkNERUYifSwiZm9sZGVycyI6e319LCJGb250Ijp7ImNvbnRyb2xsZXJzIjp7IkZvbnQgU2l6ZSI6MTQsIkZvbnQiOiIzIiwiQ3VzdG9tIEZvbnQiOiJtb25vc3BhY2UifSwiZm9sZGVycyI6e319LCJBdWRpbyAobm90IGF2YWlsYWJsZSBpbiB3ZWIgdmVyc2lvbikiOnsiY29udHJvbGxlcnMiOnt9LCJmb2xkZXJzIjp7fX0sIkxvZ28iOnsiY29udHJvbGxlcnMiOnsiTG9nbyI6IjAiLCJDdXN0b20gTG9nbyBVUkwgKFNWRy9QTkcpIjoiIiwiUHJlc2VydmUgTG9nbyBDb2xvciI6ZmFsc2UsIlNjYWxlIjoxfSwiZm9sZGVycyI6eyJQb3NpdGlvbiI6eyJjb250cm9sbGVycyI6eyJYIjowLCJZIjowfSwiZm9sZGVycyI6e319fX0sIkNsb2NrIjp7ImNvbnRyb2xsZXJzIjp7IkNsb2NrIjoiMSIsIjI0IEhvdXIgZm9ybWF0Ijp0cnVlLCJEYXktbGlnaHQgU2F2aW5nIjowLCJTY2FsZSI6MH0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6MCwiWSI6Mn0sImZvbGRlcnMiOnt9fX19LCJEYXkiOnsiY29udHJvbGxlcnMiOnsiRGF5IjoiMiIsIkFsbCBDQVBTIjpmYWxzZSwiVmVydGljYWwgT3JpZW50YXRpb24iOmZhbHNlLCJTY2FsZSI6MH0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6MCwiWSI6NH0sImZvbGRlcnMiOnt9fX19LCJEYXRlIjp7ImNvbnRyb2xsZXJzIjp7IkRheSI6dHJ1ZSwiWWVhciI6IjIiLCJPcmRlciI6IjAiLCJNb250aCBOYW1lIjpmYWxzZSwiQWxsIENBUFMiOmZhbHNlLCJEZWxpbWl0ZXIiOiI0IiwiVmVydGljYWwgT3JpZW50YXRpb24iOmZhbHNlLCJTY2FsZSI6MH0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6MCwiWSI6Mn0sImZvbGRlcnMiOnt9fX19LCJNZXNzYWdlIjp7ImNvbnRyb2xsZXJzIjp7Ik1lc3NhZ2UiOnRydWUsIk1lc3NhZ2UgVGV4dCI6IklQLkFGIFByZXNlbnRzXFxuICBORU8gTUFUUklYIiwiU2NhbGUiOjB9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOjAsIlkiOi0xfSwiZm9sZGVycyI6e319fX0sIk90aGVyIjp7ImNvbnRyb2xsZXJzIjp7IkNvZGVzIChDb21tYSBzZXBhcmF0ZWQpIjoiIn0sImZvbGRlcnMiOnt9fX19"><img src="images/preview6.gif" width=270px height=270px/></a>
+   <a href="https://ipdotsetaf.github.io/NeoMatrix/?preset=eyJjb250cm9sbGVycyI6e30sImZvbGRlcnMiOnsiUmFpbiI6eyJjb250cm9sbGVycyI6eyJNYXRyaXggU3BlZWQiOjI0LCJUcmFpbCBMZW5ndGgiOjAuODIsIkRyb3AgQ291bnQvQ29sdW1uIjoxLCJJbml0aWFsIEFuaW1hdGlvbiI6IjEifSwiZm9sZGVycyI6e319LCJDb2xvciI6eyJjb250cm9sbGVycyI6eyJDb2xvciBNb2RlIjoiMyIsIk1hdHJpeCBDb2xvciI6IiMwMGZmMDAiLCJDb2xvciBBbmltYXRpb24gU3BlZWQiOjAuMTQsIkhpZ2hsaWdodCBGaXJzdCBDaGFyYWN0ZXIiOmZhbHNlfSwiZm9sZGVycyI6e319LCJDaGFyYWN0ZXJzIjp7ImNvbnRyb2xsZXJzIjp7IkNoYXIgc2V0IjoiMyIsIkN1c3RvbSBDaGFyIFNldCI6IjAxMjM0NTY3ODlBQkNERUYifSwiZm9sZGVycyI6e319LCJGb250Ijp7ImNvbnRyb2xsZXJzIjp7IkZvbnQgU2l6ZSI6MTUsIkZvbnQiOiIzIiwiQ3VzdG9tIEZvbnQiOiJtb25vc3BhY2UifSwiZm9sZGVycyI6e319LCJBdWRpbyAobm90IGF2YWlsYWJsZSBpbiB3ZWIgdmVyc2lvbikiOnsiY29udHJvbGxlcnMiOnt9LCJmb2xkZXJzIjp7fX0sIkxvZ28iOnsiY29udHJvbGxlcnMiOnsiTG9nbyI6IjIiLCJDdXN0b20gTG9nbyBVUkwgKFNWRy9QTkcpIjoiIiwiUHJlc2VydmUgTG9nbyBDb2xvciI6ZmFsc2UsIlNjYWxlIjowLjl9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOi03MCwiWSI6LTg3fSwiZm9sZGVycyI6e319fX0sIkNsb2NrIjp7ImNvbnRyb2xsZXJzIjp7IkNsb2NrIjoiMSIsIjI0IEhvdXIgZm9ybWF0Ijp0cnVlLCJEYXktbGlnaHQgU2F2aW5nIjowLCJTY2FsZSI6Mn0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6LTUsIlkiOjE4fSwiZm9sZGVycyI6e319fX0sIkRheSI6eyJjb250cm9sbGVycyI6eyJEYXkiOiIyIiwiQWxsIENBUFMiOnRydWUsIlZlcnRpY2FsIE9yaWVudGF0aW9uIjpmYWxzZSwiU2NhbGUiOjB9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOjYsIlkiOjI1fSwiZm9sZGVycyI6e319fX0sIkRhdGUiOnsiY29udHJvbGxlcnMiOnsiRGF0ZSI6dHJ1ZSwiWWVhciI6IjEiLCJPcmRlciI6IjAiLCJNb250aCBOYW1lIjp0cnVlLCJBbGwgQ0FQUyI6dHJ1ZSwiRGVsaW1pdGVyIjoiMiIsIlZlcnRpY2FsIE9yaWVudGF0aW9uIjpmYWxzZSwiU2NhbGUiOjB9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOi0yLCJZIjoyNX0sImZvbGRlcnMiOnt9fX19LCJNZXNzYWdlIjp7ImNvbnRyb2xsZXJzIjp7Ik1lc3NhZ2UiOnRydWUsIk1lc3NhZ2UgVGV4dCI6IklcXG5QXFxuQVxcbkYiLCJTY2FsZSI6Mn0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6MjIsIlkiOjB9LCJmb2xkZXJzIjp7fX19fSwiT3RoZXIiOnsiY29udHJvbGxlcnMiOnsiQ29kZXMgKENvbW1hIHNlcGFyYXRlZCkiOiJJUC5BRiJ9LCJmb2xkZXJzIjp7fX19fQ%3D%3D"><img src="images/preview5.gif" width=270px height=270px/></a>
+   <a href="https://ipdotsetaf.github.io/NeoMatrix/?preset=eyJjb250cm9sbGVycyI6e30sImZvbGRlcnMiOnsiUmFpbiI6eyJjb250cm9sbGVycyI6eyJNYXRyaXggU3BlZWQiOjIwLCJUcmFpbCBMZW5ndGgiOjAuNzUsIkRyb3AgQ291bnQvQ29sdW1uIjoyLCJJbml0aWFsIEFuaW1hdGlvbiI6IjIifSwiZm9sZGVycyI6e319LCJDb2xvciI6eyJjb250cm9sbGVycyI6eyJDb2xvciBNb2RlIjoiMyIsIk1hdHJpeCBDb2xvciI6IiMwMGZmMDAiLCJDb2xvciBBbmltYXRpb24gU3BlZWQiOjAuMTIsIkhpZ2hsaWdodCBGaXJzdCBDaGFyYWN0ZXIiOmZhbHNlfSwiZm9sZGVycyI6e319LCJDaGFyYWN0ZXJzIjp7ImNvbnRyb2xsZXJzIjp7IkNoYXIgc2V0IjoiMyIsIkN1c3RvbSBDaGFyIFNldCI6IjAxMjM0NTY3ODlBQkNERUYifSwiZm9sZGVycyI6e319LCJGb250Ijp7ImNvbnRyb2xsZXJzIjp7IkZvbnQgU2l6ZSI6MTQsIkZvbnQiOiIzIiwiQ3VzdG9tIEZvbnQiOiJtb25vc3BhY2UifSwiZm9sZGVycyI6e319LCJBdWRpbyAobm90IGF2YWlsYWJsZSBpbiB3ZWIgdmVyc2lvbikiOnsiY29udHJvbGxlcnMiOnt9LCJmb2xkZXJzIjp7fX0sIkxvZ28iOnsiY29udHJvbGxlcnMiOnsiTG9nbyI6IjAiLCJDdXN0b20gTG9nbyBVUkwgKFNWRy9QTkcpIjoiIiwiUHJlc2VydmUgTG9nbyBDb2xvciI6ZmFsc2UsIlNjYWxlIjoxfSwiZm9sZGVycyI6eyJQb3NpdGlvbiI6eyJjb250cm9sbGVycyI6eyJYIjowLCJZIjowfSwiZm9sZGVycyI6e319fX0sIkNsb2NrIjp7ImNvbnRyb2xsZXJzIjp7IkNsb2NrIjoiMSIsIjI0IEhvdXIgZm9ybWF0Ijp0cnVlLCJEYXktbGlnaHQgU2F2aW5nIjowLCJTY2FsZSI6MH0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6MCwiWSI6Mn0sImZvbGRlcnMiOnt9fX19LCJEYXkiOnsiY29udHJvbGxlcnMiOnsiRGF5IjoiMiIsIkFsbCBDQVBTIjpmYWxzZSwiVmVydGljYWwgT3JpZW50YXRpb24iOmZhbHNlLCJTY2FsZSI6MH0sImZvbGRlcnMiOnsiUG9zaXRpb24iOnsiY29udHJvbGxlcnMiOnsiWCI6MCwiWSI6NH0sImZvbGRlcnMiOnt9fX19LCJEYXRlIjp7ImNvbnRyb2xsZXJzIjp7IkRhdGUiOnRydWUsIlllYXIiOiIyIiwiT3JkZXIiOiIwIiwiTW9udGggTmFtZSI6ZmFsc2UsIkFsbCBDQVBTIjpmYWxzZSwiRGVsaW1pdGVyIjoiNCIsIlZlcnRpY2FsIE9yaWVudGF0aW9uIjpmYWxzZSwiU2NhbGUiOjB9LCJmb2xkZXJzIjp7IlBvc2l0aW9uIjp7ImNvbnRyb2xsZXJzIjp7IlgiOjAsIlkiOjJ9LCJmb2xkZXJzIjp7fX19fSwiTWVzc2FnZSI6eyJjb250cm9sbGVycyI6eyJNZXNzYWdlIjp0cnVlLCJNZXNzYWdlIFRleHQiOiJJUC5BRiBQcmVzZW50c1xcbiAgTkVPIE1BVFJJWCIsIlNjYWxlIjowfSwiZm9sZGVycyI6eyJQb3NpdGlvbiI6eyJjb250cm9sbGVycyI6eyJYIjowLCJZIjotMX0sImZvbGRlcnMiOnt9fX19LCJPdGhlciI6eyJjb250cm9sbGVycyI6eyJDb2RlcyAoQ29tbWEgc2VwYXJhdGVkKSI6IiJ9LCJmb2xkZXJzIjp7fX19fQ%3D%3D"><img src="images/preview6.gif" width=270px height=270px/></a>
 </p>
 
 ##

index.js

@@ -189,7 +189,7 @@ window.onload = function () {
             dayFolder.close();
 
             const dateFolder = gui.addFolder("Date");
-            dateFolder.add(options, "ui_date_date").name("Day").onChange(updateMask);
+            dateFolder.add(options, "ui_date_date").name("Date").onChange(updateMask);
             dateFolder.add(options, "ui_date_year", optionsToDict(config.general.properties.ui_date_year.options)).name("Year").onChange(updateMask);
             dateFolder.add(options, "ui_date_order", optionsToDict(config.general.properties.ui_date_order.options)).name("Order").onChange(updateMask);
             dateFolder.add(options, "ui_date_monthName").name("Month Name").onChange(updateMask);
@@ -462,20 +462,15 @@ window.onload = function () {
     }, 60000);
 
     function updateTime() {
-        let today = new Date();
+        var today = new Date();
+        today.setHours(today.getHours() + options.ui_clock_dayLightSaving);
         year = today.getFullYear();
         month = today.getMonth();
         date = today.getDate();
         day = today.getDay();
         hour = today.getHours();
         minute = today.getMinutes();
 
-        hour += options.ui_clock_dayLightSaving;
-        if (hour < 0)
-            hour = 23;
-        if (hour > 23)
-            hour = 0;
-
         if (!options.ui_clock_24HourFormat && hour > 12) {
             hour = hour % 12;
             if (hour == 0)