Merge branch 'master' into gh-pages

This commit is contained in:
juliandescottes 2012-09-15 23:45:59 +02:00
commit b6d8768963

View File

@ -60,7 +60,7 @@
body.mouseup($.proxy(this.onMouseup_, this)); body.mouseup($.proxy(this.onMouseup_, this));
// Deactivate right click: // Deactivate right click:
this.container.contextmenu(this.onCanvasContextMenu_); body.contextmenu(this.onCanvasContextMenu_);
}; };
/** /**