Skip to content

Commit

Permalink
Fix ContextMenu on Intro
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent Thibault committed May 7, 2015
1 parent f538820 commit 0769999
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 0 additions & 2 deletions src/Controls/MapControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ define(function( require )
.on('drop', onDrop.bind(this));

jQuery(window)
.on('contextmenu', function(){ return false; })
.on('mousedown.map', onMouseDown.bind(this))
.on('mouseup.map', onMouseUp.bind(this));
};
Expand Down Expand Up @@ -234,7 +233,6 @@ define(function( require )
function onDrop( event )
{
var item, data;
var MapEngine = this;

try {
data = JSON.parse(
Expand Down
7 changes: 6 additions & 1 deletion src/Renderer/Renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,12 @@ define(function( require )

this.gl = WebGL.getContext( this.canvas, param );

jQuery(window).resize(this.onResize.bind(this));
jQuery(window)
.resize(this.onResize.bind(this))
.on('contextmenu',function(){
return false;
});

this.render(null);
this.resize();
}
Expand Down

0 comments on commit 0769999

Please sign in to comment.