phaser-rails 2.1.0.0 → 2.1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cfbb58840f3c14fb16988c44ef347ae8be7883a
-  data.tar.gz: da43a0f22cae7a6989bc40e5140840b8d1eb2eac
+  metadata.gz: b98fb796d2dcc04c75fe5e466562fe711f07ce35
+  data.tar.gz: 8513510ce7ffd8cc1d68fff5235d320be57f3010
 SHA512:
-  metadata.gz: 7e2325f89367246cdf1e0863bc4303b13cf050ebd035fe73c1a10dade7a6fe6abb6b09dfa40212875881f347978b1aacaac5f6edca58f1cc88804dabf3b69625
-  data.tar.gz: 19b8cb7fb42e7ae7290f24b5ea9bf5658443a0a95a74b911dda88212d9fd08b513afac7b420acd54753faf36f35b96bceb048e61178ef61d78b8dbf075df5339
+  metadata.gz: 3f9ef3da5fe890e73ffe486d18f0e87f5b2cd1301847b7ce718b10ee50fb1e95e0f9f048a1ea0d60c3fc6a4eeea5ed6560c9d7e81e4d4e45858724e1826231c0
+  data.tar.gz: 7cd2fbf19913ff4c050d9ff49ca62f14c583809eea5656d9a717d281d462029d5cce3a575c4eedd35d5f1147720ed1981b0be548772fe0599f35a40f62df2904

data/lib/phaser/rails/version.rb

@@ -1,5 +1,5 @@
 module Phaser
   module Rails
-    VERSION = "2.1.0.0"
+    VERSION = "2.1.1.0"
   end
 end

data/vendor/assets/javascripts/phaser.js

@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.1.0 "Cairhien" - Built: Tue Sep 09 2014 15:35:45
+* v2.1.1 "Eianrod" - Built: Thu Sep 11 2014 10:37:16
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -11382,7 +11382,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
 *
 * Phaser - http://phaser.io
 *
-* v2.1.0 "Cairhien" - Built: Tue Sep 09 2014 15:35:44
+* v2.1.1 "Eianrod" - Built: Thu Sep 11 2014 10:37:16
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -11425,7 +11425,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
 */
 var Phaser = Phaser || {
 
-	VERSION: '2.1.0',
+	VERSION: '2.1.1',
 	GAMES: [],
 
     AUTO: 0,
@@ -16240,6 +16240,8 @@ Phaser.StateManager.prototype = {
 
             this.setCurrentState(this._pendingState);
 
+            this._pendingState = null;
+
             if (this.onPreloadCallback)
             {
                 this.game.load.reset();
@@ -16261,8 +16263,6 @@ Phaser.StateManager.prototype = {
                 //  No init? Then there was nothing to load either
                 this.loadComplete();
             }
-
-            this._pendingState = null;
         }
 
     },
@@ -20772,15 +20772,20 @@ Phaser.FlexGrid.prototype = {
      * @param {array} [children] - An array of children that are used to populate the FlexLayer.
      * @return {Phaser.FlexLayer} The Layer object.
      */
-    createFluidLayer: function (children) {
+    createFluidLayer: function (children, addToWorld) {
+
+        if (typeof addToWorld === 'undefined') { addToWorld = true; }
 
         var layer = new Phaser.FlexLayer(this, this.positionFluid, this.boundsFluid, this.scaleFluid);
 
-        this.game.world.add(layer);
+        if (addToWorld)
+        {
+            this.game.world.add(layer);
+        }
 
         this.layers.push(layer);
 
-        if (typeof children !== 'undefined')
+        if (typeof children !== 'undefined' && typeof children !== null)
         {
             layer.addMultiple(children);
         }
@@ -20844,15 +20849,19 @@ Phaser.FlexGrid.prototype = {
      */
     reset: function () {
 
-        for (var i = 0; i < this.layers.length; i++)
+        var i = this.layers.length;
+
+        while (i--)
         {
-            //  Remove references to this class
-            this.layers[i].position = null;
-            this.layers[i].scale = null;
+            if (!this.layers[i].persist)
+            {
+                //  Remove references to this class
+                this.layers[i].position = null;
+                this.layers[i].scale = null;
+                this.layers.slice(i, 1);
+            }
         }
 
-        this.layers.length = 0;
-
     },
 
     /**
@@ -20951,12 +20960,19 @@ Phaser.FlexLayer = function (manager, position, bounds, scale) {
     /**
     * @property {Phaser.ScaleManager} scale - A reference to the ScaleManager.
     */
-    this.manager = manager;
+    this.manager = manager.manager;
 
     /**
     * @property {Phaser.FlexGrid} grid - A reference to the FlexGrid that owns this layer.
     */
-    this.grid = manager.grid;
+    this.grid = manager;
+
+    /**
+     * Should the FlexLayer remain through a State swap?
+     *
+     * @type {boolean}
+     */
+    this.persist = false;
 
     //  Bound to the grid
     this.position = position;