enable hidpi canvas in main app

3 files changed, 24 insertions, 18 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index eceda3c..5a9b592 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -56,9 +56,9 @@ Map.Draw = function(map, opt){
 		}
 
 		var canvas = document.createElement("canvas")
-		ctx = canvas.getContext('2d')
 		canvas.width = thumbnail_width
 		canvas.height = thumbnail_height
+		ctx = canvas.getContext('2d')
 		
 		draw.clear()
 
diff --git a/public/assets/javascripts/ui/lib/LabColorPicker.js b/public/assets/javascripts/ui/lib/LabColorPicker.js
index 7ddcdd5..2c8fb90 100644
--- a/public/assets/javascripts/ui/lib/LabColorPicker.js
+++ b/public/assets/javascripts/ui/lib/LabColorPicker.js
@@ -1,9 +1,12 @@
 var LabColorPicker = function (parent, w, h) {
   var base = this
   var canvas = this.canvas = document.createElement('canvas')
-  var ctx = this.ctx = canvas.getContext('2d')
-  var imageData = ctx.createImageData(w,h)
-  var data = imageData.data
+  canvas.width = w
+  canvas.height = h
+  var ctx = this.ctx = canvas.getContext('2d-lodpi')
+//  canvas.className = "colorPicker"
+//   var imageData = ctx.createImageData(w, h)
+//   var data = imageData.data
 
   var cursor = this.cursor = document.createElement("div")
   cursor.className = "colorPickerCursor"
@@ -15,10 +18,6 @@ var LabColorPicker = function (parent, w, h) {
 	brightnessControl.setAttribute("max", "110")
 	brightnessControl.setAttribute("value", "0")
 
-  canvas.width = w
-  canvas.height = h
-  canvas.className = "colorPicker"
-
   var ww = w-1
   var hh = h-1
   
@@ -84,11 +83,14 @@ var LabColorPicker = function (parent, w, h) {
   }
   this.paint = function() {
     val = clamp(val, L_range[0], L_range[1])
-    var x, y, t
-    for (var i = 0; i < w; i++) {
-      for (var j = 0; j < h; j++) {
-        x = mix( i/ww, a_range[0], a_range[1] )
-        y = mix( j/hh, b_range[0], b_range[1] )
+		var imageData = ctx.createImageData(canvas.width, canvas.height)
+		var data = imageData.data
+    var x, y, t, cw = imageData.width, ch = imageData.height
+    var cww = cw-1, chh = ch-1
+    for (var i = 0; i < cw; i++) {
+      for (var j = 0; j < ch; j++) {
+        x = mix( i/cww, a_range[0], a_range[1] )
+        y = mix( j/chh, b_range[0], b_range[1] )
         t = (j*w + i) * 4
         rgb = xyz2rgb(hunterlab2xyz(val, x, y))
         data[t] = Math.round( rgb[0] )
diff --git a/public/assets/javascripts/ui/reader/Tracker.js b/public/assets/javascripts/ui/reader/Tracker.js
index ce32c59..d2dec39 100644
--- a/public/assets/javascripts/ui/reader/Tracker.js
+++ b/public/assets/javascripts/ui/reader/Tracker.js
@@ -1,8 +1,12 @@
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
+if (window.location.host.indexOf("lvh.me") === -1) {
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+}
+else {
+	ga = function(){}
+}
 ga('create', 'UA-56883705-1', 'auto');
 ga('send', 'pageview');