From 385dc017b65cbd7cd94b16e86a8368320d4274ea Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 13:10:08 -0400
Subject: adding prefixfree, bower install

---
 bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bower.json')

diff --git a/bower.json b/bower.json
index ee8f9ba..faffbfb 100644
--- a/bower.json
+++ b/bower.json
@@ -7,6 +7,7 @@
     "momentjs": "~2.5.1",
     "lodash": "",
     "fiber": "",
-    "jquery-jsonview": "1.2.0"
+    "jquery-jsonview": "1.2.0",
+    "prefixfree": ""
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 1dae6e5dfce901cdadeebd2e191927dbc5a326f6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 6 Oct 2014 16:07:21 -0400
Subject: bower: adding marked

---
 bower.json                                                   |  3 ++-
 public/assets/javascripts/defaults.js                        |  7 +++++++
 public/assets/javascripts/mx/primitives/mx.text.js           |  8 ++++----
 .../javascripts/rectangles/engine/scenery/types/text.js      |  2 +-
 public/assets/javascripts/ui/editor/MediaEditor.js           | 10 ++++++----
 public/assets/javascripts/ui/editor/TextEditor.js            |  6 ++++--
 public/assets/stylesheets/app.css                            | 12 +++++++++++-
 views/partials/scripts.ejs                                   |  1 +
 8 files changed, 36 insertions(+), 13 deletions(-)

(limited to 'bower.json')

diff --git a/bower.json b/bower.json
index faffbfb..5f35d6c 100644
--- a/bower.json
+++ b/bower.json
@@ -8,6 +8,7 @@
     "lodash": "",
     "fiber": "",
     "jquery-jsonview": "1.2.0",
-    "prefixfree": ""
+    "prefixfree": "",
+    "marked": "0.3.2"
   }
 }
diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index 038a882..c779233 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -12,3 +12,10 @@ app.defaults = {
     ceiling: [255,255,255],
 	},
 }
+
+marked.setOptions({
+  gfm: true,
+  breaks: true,
+  sanitize: true,
+  smartypants: true,
+})
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index 7b8e595..b4089f3 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -26,11 +26,11 @@ MX.Text = MX.Object3D.extend({
 		
 		ops.className && this.el.classList.add(ops.className)
 		this.backface && this.el.classList.add("backface-visible")
-		this.el.classList.add("text")
+		this.el.classList.add("mx-text")
 		this.el.classList.add("mx-scenery")
 		
 		this.inner = document.createElement("div")
-		this.inner.style.width = "100%"
+		this.inner.classList.add("inner")
 		this.el.appendChild(this.inner)
 		
 		this.load(ops)
@@ -41,11 +41,11 @@ MX.Text = MX.Object3D.extend({
     if (ops.fontFamily) this.el.style.fontFamily = "'" + ops.fontFamily + "',sans-serif";
     if (ops.fontSize) this.el.style.fontSize = ops.fontSize + "px";
 
-    this.inner.innerHTML = ops.media.description || ""
+    this.inner.innerHTML = marked( ops.media.description || "" )
   },
   
   setText: function(text){
-    this.inner.innerHTML = text
+    this.inner.innerHTML = marked( text || "" )
   },
 
 })
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
index 16c7a5c..20e9883 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/text.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
@@ -47,7 +47,7 @@ Scenery.types.text = Scenery.types.base.extend(function(base){
 		
 		setText: function(text){
       this.media.description = text
-      this.mx.setText(text)
+      this.mx.setText( text )
 		},
 
 		serialize: function(){
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 0a4d894..9b81db1 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -160,10 +160,12 @@ var MediaEditor = FormView.extend({
 	},
 	
 	unbind: function(){
-	  if (this.scenery && this.tainted) {
-      this.scenery.media.title = this.$name.val()
-      this.scenery.media.description = this.$description.val()
-      Minotaur.watch( app.router.editorView.settings )
+	  if (this.scenery) {
+	    if (this.tainted) {
+        this.scenery.media.title = this.$name.val()
+        this.scenery.media.description = this.$description.val()
+        Minotaur.watch( app.router.editorView.settings )
+      }
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
         this.scenery.mx.el.classList.remove("picked")
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0d082ca..3d3124b 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -55,8 +55,10 @@ var TextEditor = FormView.extend({
 	},
 	
 	unbind: function(){
-	  if (this.scenery && this.tainted) {
-      Minotaur.watch( app.router.editorView.settings )
+	  if (this.scenery) {
+      if (this.tainted) {
+        Minotaur.watch( app.router.editorView.settings )
+      }
 
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e746cad..02bbe6a 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -698,6 +698,16 @@ iframe.embed {
 .mx-object3d video {
 	pointer-events: none;
 }
+.mx-text {
+  overflow: hidden;
+}
+.mx-text .inner {
+  width: 100%;
+  pointer-events: none;
+}
+.mx-text p {
+  margin-bottom: 1em;
+}
 #keyhint {
 	position: fixed;
 	bottom:0;
@@ -2117,7 +2127,7 @@ a[data-role="forgot-password"] {
   background: white;
   padding: 10px;
   margin: 20px auto;
-position: relative;
+  position: relative;
 }
 
 .collaborators button {
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 35dd782..f768160 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -3,6 +3,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 7da20303ba24f40366e94586b45efd2f04734338 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 3 Feb 2015 13:45:31 -0500
Subject: hidpi canvas polyfill

---
 bower.json                         | 3 ++-
 public/assets/test/bg.html         | 1 +
 public/assets/test/intersect.html  | 5 +++--
 public/assets/test/intersect2.html | 7 ++++---
 public/assets/test/intersect3.html | 7 ++++---
 public/assets/test/surface.html    | 5 +++--
 6 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'bower.json')

diff --git a/bower.json b/bower.json
index 5f35d6c..c78310d 100644
--- a/bower.json
+++ b/bower.json
@@ -9,6 +9,7 @@
     "fiber": "",
     "jquery-jsonview": "1.2.0",
     "prefixfree": "",
-    "marked": "0.3.2"
+    "marked": "0.3.2",
+    "hidpi-canvas": "~1.0.9"
   }
 }
diff --git a/public/assets/test/bg.html b/public/assets/test/bg.html
index fecf811..65dd5d9 100644
--- a/public/assets/test/bg.html
+++ b/public/assets/test/bg.html
@@ -5,6 +5,7 @@
 <div id="cursor" style="width:30px;height:30px;background:blue;display:inline-block;"></div>
 </div>
 <script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/vendor/loader.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
diff --git a/public/assets/test/intersect.html b/public/assets/test/intersect.html
index 4e5b0bb..92f1d5d 100644
--- a/public/assets/test/intersect.html
+++ b/public/assets/test/intersect.html
@@ -2,6 +2,7 @@
 <div id="hud"></div>
 
 <script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
@@ -10,11 +11,11 @@
 <script src="/assets/javascripts/vendor/canvasutilities.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-
 var w = canvas.width = 600
 var h = canvas.height = 400
 
+var ctx = canvas.getContext('2d')
+
 var vec_a = new Rect( 100, 120, 50, 100 )
 var vec_b = new Rect( 20, 200, 120, 120 )
 var vecs = [ vec_a, vec_b ]
diff --git a/public/assets/test/intersect2.html b/public/assets/test/intersect2.html
index 9a6deb2..553e2f7 100644
--- a/public/assets/test/intersect2.html
+++ b/public/assets/test/intersect2.html
@@ -8,6 +8,7 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/util.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/polyfill.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
@@ -30,12 +31,12 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/vendor/canvasutilities.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-var scene = new MX.Scene()
-
 var w = canvas.width = window.innerWidth
 var h = canvas.height = window.innerHeight
 
+var ctx = canvas.getContext('2d')
+var scene = new MX.Scene()
+
 var cursor = new Rect( 150, 250, 150, 250 )
 var wall_vec = new Rect ( 0, 0, 0, 0 )
 var points = [ cursor.x, cursor.y ]
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
index 0db85f0..b8f9a0d 100644
--- a/public/assets/test/intersect3.html
+++ b/public/assets/test/intersect3.html
@@ -8,6 +8,7 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/util.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/polyfill.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
@@ -30,12 +31,12 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/vendor/canvasutilities.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-var scene = new MX.Scene()
-
 var w = canvas.width = window.innerWidth
 var h = canvas.height = window.innerHeight
 
+var ctx = canvas.getContext('2d')
+var scene = new MX.Scene()
+
 var cursor = new Rect( new vec2(400, 200), new vec2(800, 500) )
 var wall_vec = new Rect ( 0, 0, 0, 0 )
 var points = [ cursor.x, cursor.y ]
diff --git a/public/assets/test/surface.html b/public/assets/test/surface.html
index 02be479..02b473d 100644
--- a/public/assets/test/surface.html
+++ b/public/assets/test/surface.html
@@ -1,6 +1,7 @@
 <canvas id="canvas"></canvas>
 
 <script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/vendor/tube.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
@@ -9,11 +10,11 @@
 <script src="/assets/javascripts/rectangles/models/surface.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-
 var w = canvas.width = 600
 var h = canvas.height = 400
 
+var ctx = canvas.getContext('2d')
+
 var surface = new Surface ()
 surface.add( new Rect( new vec2(10, 100), new vec2(0, 400) ) )
 surface.add( new Rect( new vec2(100, 300), new vec2(200, 400) ) )
-- 
cgit v1.2.3-70-g09d2


From 673cd38ccb8a9c6ba7ec0a879fc96dcc580b046c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 3 Feb 2015 14:46:16 -0500
Subject: enable hidpi canvas in main app

---
 Gruntfile.js                                       |  1 +
 bower.json                                         |  2 +-
 .../javascripts/rectangles/engine/map/draw.js      |  2 +-
 public/assets/javascripts/ui/lib/LabColorPicker.js | 26 ++++++++++++----------
 public/assets/javascripts/ui/reader/Tracker.js     | 14 +++++++-----
 public/assets/test/surface.html                    |  2 +-
 views/controls/editor/color-control.ejs            |  2 +-
 views/partials/scripts.ejs                         |  1 +
 8 files changed, 29 insertions(+), 21 deletions(-)

(limited to 'bower.json')

diff --git a/Gruntfile.js b/Gruntfile.js
index f7af106..70a8b13 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,7 @@ module.exports = function(grunt) {
           "public/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js",
           "public/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js",
           "public/assets/javascripts/vendor/bower_components/marked/lib/marked.js",
+          "public/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js",
           "public/assets/javascripts/vendor/tube.js",
           "public/assets/javascripts/vendor/loader.js",
           "public/assets/javascripts/vendor/polyfill.js",
diff --git a/bower.json b/bower.json
index c78310d..e3e83ca 100644
--- a/bower.json
+++ b/bower.json
@@ -10,6 +10,6 @@
     "jquery-jsonview": "1.2.0",
     "prefixfree": "",
     "marked": "0.3.2",
-    "hidpi-canvas": "~1.0.9"
+    "hidpi-canvas": "git://github.com/julescarbon/hidpi-canvas-polyfill.git#master"
   }
 }
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');
 
diff --git a/public/assets/test/surface.html b/public/assets/test/surface.html
index 02b473d..9e6abe8 100644
--- a/public/assets/test/surface.html
+++ b/public/assets/test/surface.html
@@ -2,7 +2,7 @@
 
 <script src="/assets/javascripts/util.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
-<script src="/assets/javascripts/vendor/vendor/tube.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index c035e24..bcc955d 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox colorcontrol">
+<div class="vvbox colorcontrol active">
 	<h4>Edit Room Colors</h4>
 
   <div class="colors">
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index a58eca1..011644b 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -5,6 +5,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <!-- <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script> -->
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
-- 
cgit v1.2.3-70-g09d2