Merge pull request #2 from lmccart/master

pull from lmccart:master

Author: hrishit

lib/addons/p5.dom.js

@@ -585,9 +585,18 @@ var p5DOM = (function(){
       }
       // set diff for cnv vs normal div
       if (this.elt instanceof HTMLCanvasElement) {
+        var j = {};
+        var k  = this.elt.getContext('2d');        
+        for (var prop in k) {
+          j[prop] = k[prop];
+        }
         this.elt.setAttribute('width', aW * this._pInst._pixelDensity);
         this.elt.setAttribute('height', aH * this._pInst._pixelDensity);
         this.elt.setAttribute('style', 'width:' + aW + 'px !important; height:' + aH + 'px !important;');
+        this._pInst.scale(this._pInst._pixelDensity, this._pInst._pixelDensity);
+        for (var prop in j) {
+          this.elt.getContext('2d')[prop] = j[prop];
+        }
       } else {
         this.elt.style.width = aW+'px';
         this.elt.style.height = aH+'px';

src/input/touch.js

@@ -62,7 +62,7 @@ define(function (require) {
    */
   p5.prototype.ontouchstart = function(e) {
     var context = this._isGlobal ? window : this;
-    context.setTouchPoints(e);
+    this.setTouchPoints(e);
     if(typeof context.touchStarted === 'function') {
       e.preventDefault();
       context.touchStarted(e);