phaser-rails 2.4.1.0 → 2.4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bad103d73f34b7f1c466951e4071ec6ac42f68f0
-  data.tar.gz: 5a228a7ff5449c4fdfc5046e649f69f419ca7fc2
+  metadata.gz: ce2956d2d3560e2aee2e3063ac99ed1ba31ab122
+  data.tar.gz: a394622b8b7d9ed5bef6fa8db74b95a765f2b2eb
 SHA512:
-  metadata.gz: 85e3995cba0c1a6b2a3b180e1be1a0cab9b42580b471a7110a8a186ddbeb653d37714e26e55dc35b52bdfe2a7b9260d9c86117af15ae033a040f6586c2e6dad1
-  data.tar.gz: ab0c10c4b8117d9fb1485e1bba93492c0d2523a6afc51ed83a4edb4525c17a8b9bfa8fa843593580a57804090089c83aff5bfee4bc5012c2467b1f0e6646f59d
+  metadata.gz: 1f43760791a793dd235d92be40eda4405e937ea266a927eebbe36867cc65486ec9c7a4858534bfcf5354d830737b1bf734149fb44ca3f6ac1dad426434da0343
+  data.tar.gz: 5d38ae63d1f96b490dc7161bbaf5f625c2432b29b99fc952f3b4d71c8ace625342d1fee750b5d48a179553c461a0211be6b2ea8ecb3e8f18ec8f102d5269aeba

data/lib/phaser/rails/version.rb

@@ -1,5 +1,5 @@
 module Phaser
   module Rails
-    VERSION = "2.4.1.0"
+    VERSION = "2.4.2.0"
   end
 end

data/vendor/assets/javascripts/phaser.js

@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.4.1 "Ionin Spring" - Built: Fri Jul 24 2015 13:26:30
+* v2.4.2 "Altara" - Built: Wed Jul 29 2015 14:59:16
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -13690,7 +13690,7 @@ PIXI.CANVAS_RENDERER = 1;
  */
 PIXI.VERSION = "v2.2.8";
 
-// used to create uids for various pixi objects..
+// used to create uids for various pixi objects.
 PIXI._UID = 0;
 
 if (typeof(Float32Array) != 'undefined')
@@ -23996,7 +23996,7 @@ var Phaser = Phaser || {
     * @constant
     * @type {string}
     */
-    VERSION: '2.4.1',
+    VERSION: '2.4.2',
 
     /**
     * An array of Phaser game instances.
@@ -41261,9 +41261,12 @@ Phaser.DeviceButton.prototype = {
         this.event = event;
         this.value = value;
 
-        this.altKey = event.altKey;
-        this.shiftKey = event.shiftKey;
-        this.ctrlKey = event.ctrlKey;
+        if (event)
+        {
+            this.altKey = event.altKey;
+            this.shiftKey = event.shiftKey;
+            this.ctrlKey = event.ctrlKey;
+        }
 
         this.onDown.dispatch(this, value);
 
@@ -41292,9 +41295,12 @@ Phaser.DeviceButton.prototype = {
         this.event = event;
         this.value = value;
 
-        this.altKey = event.altKey;
-        this.shiftKey = event.shiftKey;
-        this.ctrlKey = event.ctrlKey;
+        if (event)
+        {
+            this.altKey = event.altKey;
+            this.shiftKey = event.shiftKey;
+            this.ctrlKey = event.ctrlKey;
+        }
 
         this.onUp.dispatch(this, value);
 
@@ -41832,6 +41838,94 @@ Phaser.Pointer.prototype = {
 
     },
 
+    /**
+    * Called by updateButtons.
+    * 
+    * @method Phaser.Pointer#processButtonsDown
+    * @private
+    * @param {integer} buttons - The DOM event.buttons property.
+    * @param {MouseEvent} event - The DOM event.
+    */
+    processButtonsDown: function (buttons, event) {
+
+        //  Note: These are bitwise checks, not booleans
+
+        if (Phaser.Pointer.LEFT_BUTTON & buttons)
+        {
+            this.leftButton.start(event);
+        }
+
+        if (Phaser.Pointer.RIGHT_BUTTON & buttons)
+        {
+            this.rightButton.start(event);
+        }
+                
+        if (Phaser.Pointer.MIDDLE_BUTTON & buttons)
+        {
+            this.middleButton.start(event);
+        }
+
+        if (Phaser.Pointer.BACK_BUTTON & buttons)
+        {
+            this.backButton.start(event);
+        }
+
+        if (Phaser.Pointer.FORWARD_BUTTON & buttons)
+        {
+            this.forwardButton.start(event);
+        }
+
+        if (Phaser.Pointer.ERASER_BUTTON & buttons)
+        {
+            this.eraserButton.start(event);
+        }
+
+    },
+
+    /**
+    * Called by updateButtons.
+    * 
+    * @method Phaser.Pointer#processButtonsUp
+    * @private
+    * @param {integer} buttons - The DOM event.buttons property.
+    * @param {MouseEvent} event - The DOM event.
+    */
+    processButtonsUp: function (button, event) {
+
+        //  Note: These are bitwise checks, not booleans
+
+        if (button === Phaser.Mouse.LEFT_BUTTON)
+        {
+            this.leftButton.stop(event);
+        }
+
+        if (button === Phaser.Mouse.RIGHT_BUTTON)
+        {
+            this.rightButton.stop(event);
+        }
+                
+        if (button === Phaser.Mouse.MIDDLE_BUTTON)
+        {
+            this.middleButton.stop(event);
+        }
+
+        if (button === Phaser.Mouse.BACK_BUTTON)
+        {
+            this.backButton.stop(event);
+        }
+
+        if (button === Phaser.Mouse.FORWARD_BUTTON)
+        {
+            this.forwardButton.stop(event);
+        }
+
+        if (button === 5)
+        {
+            this.eraserButton.stop(event);
+        }
+
+    },
+
     /**
     * Called when the event.buttons property changes from zero.
     * Contains a button bitmask.
@@ -41844,73 +41938,23 @@ Phaser.Pointer.prototype = {
 
         this.button = event.button;
 
-        //  This is tested back to IE9, but possibly some browsers may report this differently.
-        //  If you find one, please tell us!
-        var buttons = event.buttons;
+        var down = (event.type.toLowerCase().substr(-4) === 'down');
 
-        if (buttons !== undefined)
+        if (event.buttons !== undefined)
         {
-            //  Note: These are bitwise checks, not booleans
-
-            if (Phaser.Pointer.LEFT_BUTTON & buttons)
-            {
-                this.leftButton.start(event);
-            }
-            else
-            {
-                this.leftButton.stop(event);
-            }
-
-            if (Phaser.Pointer.RIGHT_BUTTON & buttons)
-            {
-                this.rightButton.start(event);
-            }
-            else
-            {
-                this.rightButton.stop(event);
-            }
-                    
-            if (Phaser.Pointer.MIDDLE_BUTTON & buttons)
-            {
-                this.middleButton.start(event);
-            }
-            else
-            {
-                this.middleButton.stop(event);
-            }
-
-            if (Phaser.Pointer.BACK_BUTTON & buttons)
-            {
-                this.backButton.start(event);
-            }
-            else
-            {
-                this.backButton.stop(event);
-            }
-
-            if (Phaser.Pointer.FORWARD_BUTTON & buttons)
+            if (down)
             {
-                this.forwardButton.start(event);
+                this.processButtonsDown(event.buttons, event);
             }
             else
             {
-                this.forwardButton.stop(event);
-            }
-
-            if (Phaser.Pointer.ERASER_BUTTON & buttons)
-            {
-                this.eraserButton.start(event);
-            }
-            else
-            {
-                this.eraserButton.stop(event);
+                this.processButtonsUp(event.button, event);
             }
         }
         else
         {
             //  No buttons property (like Safari on OSX when using a trackpad)
-
-            if (event.type === 'mousedown')
+            if (down)
             {
                 this.leftButton.start(event);
             }
@@ -41923,6 +41967,7 @@ Phaser.Pointer.prototype = {
 
         //  On OS X (and other devices with trackpads) you have to press CTRL + the pad
         //  to initiate a right-click event, so we'll check for that here
+
         if (event.ctrlKey && this.leftButton.isDown)
         {
             this.rightButton.start(event);
@@ -41946,6 +41991,8 @@ Phaser.Pointer.prototype = {
     */
     start: function (event) {
 
+        // console.log(event);
+
         if (event['pointerId'])
         {
             this.pointerId = event.pointerId;
@@ -42076,7 +42123,7 @@ Phaser.Pointer.prototype = {
             this.button = event.button;
         }
 
-        if (fromClick)
+        if (fromClick && this.isMouse)
         {
             this.updateButtons(event);
         }
@@ -57442,6 +57489,8 @@ Phaser.Text.fontPropertiesContext = Phaser.Text.fontPropertiesCanvas.getContext(
 * For most use cases it is recommended to use XML. If you wish to use JSON, the formatting should be equal to the result of
 * converting a valid XML file through the popular X2JS library. An online tool for conversion can be found here: http://codebeautify.org/xmltojson
 *
+* If you were using an older version of Phaser (< 2.4) and using the DOMish parser hack, please remove this. It isn't required any longer.
+*
 * @class Phaser.BitmapText
 * @constructor
 * @extends PIXI.DisplayObjectContainer
@@ -60324,7 +60373,7 @@ Phaser.Device.canPlayVideo = function (type) {
     {
         return true;
     }
-    else if (type === 'ogg' && this.oggVideo)
+    else if ((type === 'ogg' || type === 'ogv') && this.oggVideo)
     {
         return true;
     }
@@ -70522,11 +70571,14 @@ Phaser.Cache.prototype = {
     *
     * @method Phaser.Cache#getFrame
     * @param {string} key - Asset key of the frame data to retrieve from the Cache.
+    * @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
     * @return {Phaser.Frame} The frame data.
     */
-    getFrame: function (key) {
+    getFrame: function (key, cache) {
+
+        if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
 
-        return this.getItem(key, Phaser.Cache.IMAGE, 'getFrame', 'frame');
+        return this.getItem(key, cache, 'getFrame', 'frame');
 
     },
 
@@ -70535,11 +70587,12 @@ Phaser.Cache.prototype = {
     *
     * @method Phaser.Cache#getFrameCount
     * @param {string} key - Asset key of the FrameData you want.
+    * @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
     * @return {number} Then number of frames. 0 if the image is not found.
     */
-    getFrameCount: function (key) {
+    getFrameCount: function (key, cache) {
 
-        var data = this.getFrameData(key);
+        var data = this.getFrameData(key, cache);
 
         if (data)
         {
@@ -70561,11 +70614,14 @@ Phaser.Cache.prototype = {
     *
     * @method Phaser.Cache#getFrameData
     * @param {string} key - Asset key of the frame data to retrieve from the Cache.
+    * @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
     * @return {Phaser.FrameData} The frame data.
     */
-    getFrameData: function (key) {
+    getFrameData: function (key, cache) {
 
-        return this.getItem(key, Phaser.Cache.IMAGE, 'getFrameData', 'frameData');
+        if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
+
+        return this.getItem(key, cache, 'getFrameData', 'frameData');
 
     },
 
@@ -70574,11 +70630,14 @@ Phaser.Cache.prototype = {
     *
     * @method Phaser.Cache#hasFrameData
     * @param {string} key - Asset key of the frame data to retrieve from the Cache.
+    * @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
     * @return {boolean} True if the given key has frameData in the cache, otherwise false.
     */
-    hasFrameData: function (key) {
+    hasFrameData: function (key, cache) {
+
+        if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
 
-        return (this.getItem(key, Phaser.Cache.IMAGE, '', 'frameData') !== null);
+        return (this.getItem(key, cache, '', 'frameData') !== null);
 
     },
 
@@ -70607,11 +70666,12 @@ Phaser.Cache.prototype = {
     * @method Phaser.Cache#getFrameByIndex
     * @param {string} key - Asset key of the frame data to retrieve from the Cache.
     * @param {number} index - The index of the frame you want to get.
+    * @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
     * @return {Phaser.Frame} The frame object.
     */
-    getFrameByIndex: function (key, index) {
+    getFrameByIndex: function (key, index, cache) {
 
-        var data = this.getFrameData(key);
+        var data = this.getFrameData(key, cache);
 
         if (data)
         {
@@ -70630,11 +70690,12 @@ Phaser.Cache.prototype = {
     * @method Phaser.Cache#getFrameByName
     * @param {string} key - Asset key of the frame data to retrieve from the Cache.
     * @param {string} name - The name of the frame you want to get.
+    * @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
     * @return {Phaser.Frame} The frame object.
     */
-    getFrameByName: function (key, name) {
+    getFrameByName: function (key, name, cache) {
 
-        var data = this.getFrameData(key);
+        var data = this.getFrameData(key, cache);
 
         if (data)
         {
@@ -70814,6 +70875,10 @@ Phaser.Cache.prototype = {
     /**
     * Removes a sound from the cache.
     *
+    * If any `Phaser.Sound` objects use the audio file in the cache that you remove with this method, they will
+    * _automatically_ destroy themselves. If you wish to have full control over when Sounds are destroyed then
+    * you must finish your house-keeping and destroy them all yourself first, before calling this method.
+    *
     * Note that this only removes it from the Phaser.Cache. If you still have references to the data elsewhere
     * then it will persist in memory.
     *
@@ -74753,6 +74818,12 @@ Phaser.Sound.prototype = {
     */
     update: function () {
 
+        if (!this.game.cache.checkSoundKey(this.key))
+        {
+            this.destroy();
+            return;
+        }
+
         if (this.isDecoded && !this._onDecodedEventDispatched)
         {
             this.onDecoded.dispatch(this);
@@ -91499,8 +91570,6 @@ Phaser.TilemapLayer.prototype.render = function () {
         return;
     }
 
-    this.context.save();
-
     if (this.dirty || this.layer.dirty)
     {
         this.layer.dirty = false;
@@ -91526,6 +91595,8 @@ Phaser.TilemapLayer.prototype.render = function () {
         return;
     }
 
+    this.context.save();
+    
     mc.scrollX = scrollX;
     mc.scrollY = scrollY;