diff --git a/panels/clock/background.png b/panels/clock/background.png new file mode 100644 index 0000000000000000000000000000000000000000..8c6e0be971749afdfbc2ff59be1398f76fc9a945 Binary files /dev/null and b/panels/clock/background.png differ diff --git a/panels/clock/script.js b/panels/clock/script.js index 0d8919034994051cecbeec52b2dc4a41301af6df..955df314ee7083929c6dc3f187a8b29fc0fc696d 100644 --- a/panels/clock/script.js +++ b/panels/clock/script.js @@ -5,7 +5,7 @@ this.loaded = function(panel, config) { var DigitalCanvasClock = function() { var me = this, - analBGFile = "panels/clock/background.svg", + analBGFile = "panels/clock/background.png", analBGImg = new Image(), analogFactor = 0.9, useBackground = true, @@ -57,10 +57,12 @@ this.loaded = function(panel, config) { smlFontPost = "time-medium"; // width * 18.75% init = function() { + if (fontsReady) { digiBackground = document.createElement('canvas'); analBackground = document.createElement('canvas'); me.resize($(panel).width(), $(panel).height()); + loop(); } else { setTimeout(init,0); @@ -119,8 +121,10 @@ this.loaded = function(panel, config) { } calc = function() { + if (!!digiClock) calcDigital(); if (!!analClock) calcAnalog(); + } calcDigital = function() { @@ -165,6 +169,7 @@ this.loaded = function(panel, config) { } calcAnalog = function() { + analogWidth = $(analClock).width(); analogHeight = $(analClock).height(); // clock size @@ -183,6 +188,7 @@ this.loaded = function(panel, config) { analBackground.height = analogHeight; abgc = analBackground.getContext("2d"); abgc.translate(analogX, analogY); + renderAnalBackground(); } @@ -279,7 +285,9 @@ this.loaded = function(panel, config) { abgc.fillStyle = bgColor; abgc.fillRect(-analogX, -analogY, analogWidth, analogHeight); abgc.fillStyle = "black"; + console.log(analBGImg); abgc.drawImage(analBGImg, -analogRad, -analogRad, analogRad * 2, analogRad * 2); + } analBGImg.onload = function() {