Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

README.md

@@ -1,4 +1,4 @@
-Pixi Renderer [![Build Status](https://travis-ci.org/GoodBoyDigital/pixi.js.png?branch=dev)](https://travis-ci.org/GoodBoyDigital/pixi.js)
+Pixi Renderer 
 =============
 
 ![pixi.js logo](http://www.goodboydigital.com/pixijs/logo_small.png)

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "pixi.js",
-    "version": "1.4.3",
+    "version": "1.5.0",
 
     "main": "bin/pixi.js",
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixi.js",
-    "version": "1.4.3",
+    "version": "1.5.0",
     "description": "Pixi.js is a fast lightweight 2D library that works across all devices.",
 
     "author": "Mat Groves",

src/pixi/InteractionManager.js

@@ -89,7 +89,7 @@ PIXI.InteractionManager = function(stage)
      * The css style of the cursor that is being used
      * @property currentCursorStyle
      * @type String
-     * 
+     *
      */
     this.currentCursorStyle = 'inherit';
 
@@ -97,7 +97,7 @@ PIXI.InteractionManager = function(stage)
      * Is set to true when the mouse is moved out of the canvas
      * @property mouseOut
      * @type Boolean
-     * 
+     *
      */
     this.mouseOut = false;
 };
@@ -270,9 +270,6 @@ PIXI.InteractionManager.prototype.update = function()
 
     // loop through interactive objects!
     var length = this.interactiveItems.length;
-
-    
-
     var cursor = 'inherit';
     var over = false;
 
@@ -298,7 +295,6 @@ PIXI.InteractionManager.prototype.update = function()
 
             if(!item.__isOver)
             {
-
                 if(item.mouseover)item.mouseover(this.mouse);
                 item.__isOver = true;
             }
@@ -319,7 +315,6 @@ PIXI.InteractionManager.prototype.update = function()
         this.currentCursorStyle = cursor;
         this.interactionDOMElement.style.cursor = cursor;
     }
-
 };
 
 /**
@@ -717,4 +712,4 @@ PIXI.InteractionManager.prototype.onTouchEnd = function(event)
         this.pool.push(touchData);
         this.touchs[touchEvent.identifier] = null;
     }
-};
+};