From f88c792bfb4a0efd2fc3ac8efa2ef6e6fd92f1cb Mon Sep 17 00:00:00 2001 From: Nick Hodge Date: Fri, 17 Jan 2014 17:28:42 +1100 Subject: [PATCH 1/2] modify jquery css head insert --- iotas/www/apps/colorwheel/colorwheel.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iotas/www/apps/colorwheel/colorwheel.js b/iotas/www/apps/colorwheel/colorwheel.js index f98931a..0d9653a 100755 --- a/iotas/www/apps/colorwheel/colorwheel.js +++ b/iotas/www/apps/colorwheel/colorwheel.js @@ -20,7 +20,8 @@ function colorwheel() { function appStart() { console.log("colorwheel.appStart"); - $("head").append(''); + var cssPathFromBase = $('head base').attr('href') + "colorwheel.css"; + $("head").append(''); setCanvasImage() } From 67d915d5afe9a01701d9b1c14e5369d08c9b1cf9 Mon Sep 17 00:00:00 2001 From: Nick Hodge Date: Fri, 17 Jan 2014 17:44:50 +1100 Subject: [PATCH 2/2] -ms-touch-action css for ie10 --- iotas/www/apps/colorwheel/colorwheel.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iotas/www/apps/colorwheel/colorwheel.js b/iotas/www/apps/colorwheel/colorwheel.js index 0d9653a..cba610b 100755 --- a/iotas/www/apps/colorwheel/colorwheel.js +++ b/iotas/www/apps/colorwheel/colorwheel.js @@ -38,6 +38,8 @@ function colorwheel() { var wh = $('.selector').innerWidth(); $('#canvas').attr('width', wh); $('#canvas').attr('height', wh); + $('#canvas').css('-touch-action','none'); + $('#canvas').css('-ms-touch-action','none'); theApp.context.drawImage(canvasImage, x, y, wh, wh); }; canvasImage.src="colorwheel.png";