Lots of small tweaks to pass jshint.

Author: photonstorm

README.md

@@ -184,6 +184,7 @@ Updates:
 * The Particle Emitter now remembers the frames given to it and resets it when a new particle is emitted.
 * Game.focusLoss and focusGain methods and onBlur and onFocus Signals added, allowing for more fine-grained control over game pause vs. focus loss.
 * Keyboard.removeKey method added (thanks qdrj, #550)
+* Key.event now stores the most recent DOM event that triggered it.
 
 
 Bug Fixes:

src/core/Game.js

@@ -615,7 +615,7 @@ Phaser.Game.prototype = {
             this.input.update();
             this.state.update();
             this.physics.update();
-            this.particles.update();            
+            this.particles.update();
             this.plugins.update();
 
             this.stage.postUpdate();

src/core/Group.js

@@ -916,7 +916,7 @@ Phaser.Group.prototype.preUpdate = function () {
         return false;
     }
 
-   var i = this.children.length;
+    var i = this.children.length;
 
     while (i--)
     {
@@ -1406,7 +1406,7 @@ Phaser.Group.prototype.removeBetween = function (startIndex, endIndex) {
 
         this.removeChild(this.children[i]);
 
-        if (this.cursor === child)
+        if (this.cursor === this.children[i])
         {
             this.cursor = null;
         }

src/core/Stage.js

@@ -76,7 +76,7 @@ Phaser.Stage = function (game, width, height) {
     * @property {number} _backgroundColor - Stage background color.
     * @private
     */
-    this._backgroundColor;
+    this._backgroundColor = 0x000000;
 
     if (game.config)
     {
@@ -261,19 +261,19 @@ Phaser.Stage.prototype.boot = function () {
 */
 Phaser.Stage.prototype.checkVisibility = function () {
 
-    if (document.webkitHidden != undefined)
+    if (document.webkitHidden !== undefined)
     {
         this._hiddenVar = 'webkitvisibilitychange';
     }
-    else if (document.mozHidden != undefined)
+    else if (document.mozHidden !== undefined)
     {
         this._hiddenVar = 'mozvisibilitychange';
     }
-    else if (document.msHidden != undefined)
+    else if (document.msHidden !== undefined)
     {
         this._hiddenVar = 'msvisibilitychange';
     }
-    else if (document.hidden != undefined)
+    else if (document.hidden !== undefined)
     {
         this._hiddenVar = 'visibilitychange';
     }

src/core/StateManager.js

@@ -141,7 +141,7 @@ Phaser.StateManager.prototype = {
             if (typeof this._pendingState === 'string')
             {
                 //  State was already added, so just start it
-                // this.start(this._pendingState, false, false);
+                this.start(this._pendingState, false, false);
             }
             else
             {

src/gameobjects/BitmapText.js

@@ -357,7 +357,7 @@ Object.defineProperty(Phaser.BitmapText.prototype, 'fontSize', {
 
     set: function(value) {
 
-        value = parseInt(value);
+        value = parseInt(value, 10);
 
         if (value !== this._fontSize)
         {

src/gameobjects/GameObjectCreator.js

@@ -168,7 +168,7 @@ Phaser.GameObjectCreator.prototype = {
     * @param {object} style - The style object containing style attributes like font, font size , etc.
     * @return {Phaser.Text} The newly created text object.
     */
-    text: function (x, y, text, style, group) {
+    text: function (x, y, text, style) {
 
         return new Phaser.Text(this.game, x, y, text, style);
 
@@ -189,7 +189,7 @@ Phaser.GameObjectCreator.prototype = {
     * @param {string|number} [upFrame] This is the frame or frameName that will be set when this button is in an up state. Give either a number to use a frame ID or a string for a frame name.
     * @return {Phaser.Button} The newly created button object.
     */
-    button: function (x, y, key, callback, callbackContext, overFrame, outFrame, downFrame, upFrame, group) {
+    button: function (x, y, key, callback, callbackContext, overFrame, outFrame, downFrame, upFrame) {
 
         return new Phaser.Button(this.game, x, y, key, callback, callbackContext, overFrame, outFrame, downFrame, upFrame);
 
@@ -201,10 +201,9 @@ Phaser.GameObjectCreator.prototype = {
     * @method Phaser.GameObjectCreator#graphics
     * @param {number} x - X position of the new graphics object.
     * @param {number} y - Y position of the new graphics object.
-    * @param {Phaser.Group} [group] - Optional Group to add the object to. If not specified it will be added to the World group.
     * @return {Phaser.Graphics} The newly created graphics object.
     */
-    graphics: function (x, y, group) {
+    graphics: function (x, y) {
 
         return new Phaser.Graphics(this.game, x, y);
 
@@ -264,7 +263,7 @@ Phaser.GameObjectCreator.prototype = {
     * @param {number} [size] - The size the font will be rendered in, in pixels.
     * @return {Phaser.BitmapText} The newly created bitmapText object.
     */
-    bitmapText: function (x, y, font, text, size, group) {
+    bitmapText: function (x, y, font, text, size) {
 
         return new Phaser.BitmapText(this.game, x, y, font, text, size);
 
@@ -326,7 +325,7 @@ Phaser.GameObjectCreator.prototype = {
     * @param {boolean} [addToCache=false] - Should this BitmapData be added to the Game.Cache? If so you can retrieve it with Cache.getBitmapData(key)
     * @return {Phaser.BitmapData} The newly created BitmapData object.
     */
-    bitmapData: function (width, height, addToCache) {
+    bitmapData: function (width, height, key, addToCache) {
 
         if (typeof addToCache === 'undefined') { addToCache = false; }
         if (typeof key === 'undefined' || key === '') { key = this.game.rnd.uuid(); }

src/gameobjects/GameObjectFactory.js

@@ -377,7 +377,7 @@ Phaser.GameObjectFactory.prototype = {
     * @param {boolean} [addToCache=false] - Should this BitmapData be added to the Game.Cache? If so you can retrieve it with Cache.getBitmapData(key)
     * @return {Phaser.BitmapData} The newly created BitmapData object.
     */
-    bitmapData: function (width, height, addToCache) {
+    bitmapData: function (width, height, key, addToCache) {
 
         if (typeof addToCache === 'undefined') { addToCache = false; }
         if (typeof key === 'undefined' || key === '') { key = this.game.rnd.uuid(); }

src/gameobjects/RetroFont.js

@@ -267,7 +267,7 @@ Phaser.RetroFont.TEXT_SET11 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ.,\"-+!?()':;0123456789
 * @param {number} width - Width in pixels of this RetroFont. Set to zero to disable and re-enable automatic resizing.
 * @param {string} [lineAlignment='left'] - Align the text within this width. Set to RetroFont.ALIGN_LEFT (default), RetroFont.ALIGN_RIGHT or RetroFont.ALIGN_CENTER.
 */
-Phaser.RetroFont.prototype.setFixedWidth = function (width, lineAlignment) { 
+Phaser.RetroFont.prototype.setFixedWidth = function (width, lineAlignment) {
 
     if (typeof lineAlignment === 'undefined') { lineAlignment = 'left'; }
 
@@ -352,7 +352,7 @@ Phaser.RetroFont.prototype.resize = function (width, height) {
 * @method Phaser.RetroFont#buildRetroFontText
 * @memberof Phaser.RetroFont
 */
-Phaser.RetroFont.prototype.buildRetroFontText = function () { 
+Phaser.RetroFont.prototype.buildRetroFontText = function () {
 
     var cx = 0;
     var cy = 0;
@@ -363,7 +363,7 @@ Phaser.RetroFont.prototype.buildRetroFontText = function () {
 
         if (this.fixedWidth > 0)
         {
-            this.resize(fixedWidth, (lines.length * (this.characterHeight + this.customSpacingY)) - this.customSpacingY);
+            this.resize(this.fixedWidth, (lines.length * (this.characterHeight + this.customSpacingY)) - this.customSpacingY);
         }
         else
         {
@@ -407,7 +407,7 @@ Phaser.RetroFont.prototype.buildRetroFontText = function () {
     {
         if (this.fixedWidth > 0)
         {
-            this.resize(fixedWidth, this.characterHeight);
+            this.resize(this.fixedWidth, this.characterHeight);
         }
         else
         {
@@ -448,7 +448,7 @@ Phaser.RetroFont.prototype.buildRetroFontText = function () {
 * @param {number} y - The y coordinate.
 * @param {number} customSpacingX - Custom X spacing.
 */
-Phaser.RetroFont.prototype.pasteLine = function (line, x, y, customSpacingX) { 
+Phaser.RetroFont.prototype.pasteLine = function (line, x, y, customSpacingX) {
 
     var p = new Phaser.Point();
 
@@ -457,7 +457,7 @@ Phaser.RetroFont.prototype.pasteLine = function (line, x, y, customSpacingX) {
         //  If it's a space then there is no point copying, so leave a blank space
         if (line.charAt(c) == " ")
         {
-            x += this.characterWidth + this.customSpacingX;
+            x += this.characterWidth + customSpacingX;
         }
         else
         {
@@ -468,7 +468,7 @@ Phaser.RetroFont.prototype.pasteLine = function (line, x, y, customSpacingX) {
                 p.set(x, y);
                 this.render(this.stamp, p, false);
 
-                x += this.characterWidth + this.customSpacingX;
+                x += this.characterWidth + customSpacingX;
 
                 if (x > this.width)
                 {
@@ -486,7 +486,7 @@ Phaser.RetroFont.prototype.pasteLine = function (line, x, y, customSpacingX) {
 * @memberof Phaser.RetroFont
 * @return {number} The length of the longest line of text.
 */
-Phaser.RetroFont.prototype.getLongestLine = function () { 
+Phaser.RetroFont.prototype.getLongestLine = function () {
 
     var longestLine = 0;
 
@@ -515,18 +515,18 @@ Phaser.RetroFont.prototype.getLongestLine = function () {
 * @param {boolean} [stripCR=true] - Should it strip carriage returns as well?
 * @return {string}  A clean version of the string.
 */
-Phaser.RetroFont.prototype.removeUnsupportedCharacters = function (stripCR) { 
+Phaser.RetroFont.prototype.removeUnsupportedCharacters = function (stripCR) {
 
     var newString = "";
 
     for (var c = 0; c < this._text.length; c++)
     {
-        var char = this._text[c];
-        var code = char.charCodeAt(0);
+        var aChar = this._text[c];
+        var code = aChar.charCodeAt(0);
 
-        if (this.grabData[code] >= 0 || (!stripCR && char === "\n"))
+        if (this.grabData[code] >= 0 || (!stripCR && aChar === "\n"))
         {
-            newString = newString.concat(char);
+            newString = newString.concat(aChar);
         }
     }
 

src/gameobjects/Text.js

@@ -25,7 +25,7 @@ Phaser.Text = function (game, x, y, text, style) {
     text = text || ' ';
     style = style || {};
 
-    if (text.length == 0)
+    if (text.length === 0)
     {
         text = ' ';
     }
@@ -327,27 +327,36 @@ Phaser.Text.prototype.updateText = function () {
 
     // word wrap
     // preserve original text
-    if(this.style.wordWrap)outputText = this.runWordWrap(this.text);
+    if (this.style.wordWrap)
+    {
+        outputText = this.runWordWrap(this.text);
+    }
 
     //split text into lines
     var lines = outputText.split(/(?:\r\n|\r|\n)/);
 
     //calculate text width
     var lineWidths = [];
     var maxLineWidth = 0;
+
     for (var i = 0; i < lines.length; i++)
     {
         var lineWidth = this.context.measureText(lines[i]).width;
         lineWidths[i] = lineWidth;
         maxLineWidth = Math.max(maxLineWidth, lineWidth);
     }
+
     this.canvas.width = maxLineWidth + this.style.strokeThickness;
 
     //calculate text height
     var lineHeight = this.determineFontHeight('font: ' + this.style.font  + ';') + this.style.strokeThickness + this._lineSpacing + this.style.shadowOffsetY;
+
     this.canvas.height = lineHeight * lines.length;
 
-    if(navigator.isCocoonJS) this.context.clearRect(0,0,this.canvas.width,this.canvas.height);
+    if (navigator.isCocoonJS)
+    {
+        this.context.clearRect(0,0,this.canvas.width,this.canvas.height);
+    }
 
     //set canvas text styles
     this.context.fillStyle = this.style.fill;
@@ -520,7 +529,7 @@ Object.defineProperty(Phaser.Text.prototype, 'fontSize', {
 
     set: function(value) {
 
-        value = parseInt(value);
+        value = parseInt(value, 10);
 
         if (value !== this._fontSize)
         {