Skip to content

Commit

Permalink
jshint passed all the p2 physics and fixed Debug.spriteBounds.
Browse files Browse the repository at this point in the history
  • Loading branch information
photonstorm committed Mar 13, 2014
1 parent b666874 commit c2d38fe
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 1,450 deletions.
2 changes: 1 addition & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"globals" : { "Phaser": false, "PIXI": false },
"globals" : { "Phaser": false, "PIXI": false, "p2": false },
// Ignore Environment Globals
"browser" : true, // Standard browser globals e.g. `window`, `document`.
"couch" : false,
Expand Down
1 change: 0 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ module.exports = function (grunt) {
'src/input/SinglePad.js',
'src/input/GamepadButton.js',
'src/input/InputHandler.js',
'src/input/Gestures.js',

'src/gameobjects/Events.js',
'src/gameobjects/GameObjectFactory.js',
Expand Down
1 change: 0 additions & 1 deletion build/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
<script src="$path/src/input/SinglePad.js"></script>
<script src="$path/src/input/GamepadButton.js"></script>
<script src="$path/src/input/InputHandler.js"></script>
<script src="$path/src/input/Gestures.js"></script>
<script src="$path/src/gameobjects/Events.js"></script>
<script src="$path/src/gameobjects/GameObjectCreator.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions src/input/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ Phaser.Input = function (game) {
/**
* @property {Phaser.Gestures} gestures - The Gestures manager.
*/
this.gestures = null;
// this.gestures = null;

/**
* @property {Phaser.Signal} onDown - A Signal that is dispatched each time a pointer is pressed down.
Expand Down Expand Up @@ -335,7 +335,7 @@ Phaser.Input.prototype = {
this.touch = new Phaser.Touch(this.game);
this.mspointer = new Phaser.MSPointer(this.game);
this.gamepad = new Phaser.Gamepad(this.game);
this.gestures = new Phaser.Gestures(this.game);
// this.gestures = new Phaser.Gestures(this.game);

this.onDown = new Phaser.Signal();
this.onUp = new Phaser.Signal();
Expand Down Expand Up @@ -376,7 +376,7 @@ Phaser.Input.prototype = {
this.touch.stop();
this.mspointer.stop();
this.gamepad.stop();
this.gestures.stop();
// this.gestures.stop();

this.moveCallback = null;

Expand Down Expand Up @@ -465,7 +465,7 @@ Phaser.Input.prototype = {

this._pollCounter = 0;

if (this.gestures.active) { this.gestures.update(); }
// if (this.gestures.active) { this.gestures.update(); }

},

Expand Down
Loading

0 comments on commit c2d38fe

Please sign in to comment.