Merge branch 'develop'

joestrong · Oct 22, 2015 · 1cc0a31 · 1cc0a31
2 parents 36b9d2f + 120a856
commit 1cc0a31
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dist/triangle-background.js b/dist/triangle-background.js
@@ -255,7 +255,7 @@ function TriangleBackground(source, options) {
     window.addEventListener('resize', this.resize.bind(this));
 
     if(!options || options.mouseHoverHighlight !== false) {
-        this.containerElement.addEventListener('mousemove', this.mouseMove.bind(this));
+        window.addEventListener('mousemove', this.mouseMove.bind(this));
     }
 }
 
@@ -283,7 +283,7 @@ TriangleBackground.prototype.resize = function() {
 
 TriangleBackground.prototype.mouseMove = function(event) {
     if (this.nodeManager) {
-        this.nodeManager.setMousePosition(event.offsetX, event.offsetY);
+        this.nodeManager.setMousePosition(event.clientX, event.clientY);
     }
 };
 

diff --git a/dist/triangle-background.min.js b/dist/triangle-background.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "triangle-background",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Creates a web page background of tesselating triangles with hover effect",
   "main": "dist/triangle-background.js",
   "scripts": {

diff --git a/src/triangle-background.js b/src/triangle-background.js
@@ -32,7 +32,7 @@ function TriangleBackground(source, options) {
     window.addEventListener('resize', this.resize.bind(this));
 
     if(!options || options.mouseHoverHighlight !== false) {
-        this.containerElement.addEventListener('mousemove', this.mouseMove.bind(this));
+        window.addEventListener('mousemove', this.mouseMove.bind(this));
     }
 }
 
@@ -60,7 +60,7 @@ TriangleBackground.prototype.resize = function() {
 
 TriangleBackground.prototype.mouseMove = function(event) {
     if (this.nodeManager) {
-        this.nodeManager.setMousePosition(event.offsetX, event.offsetY);
+        this.nodeManager.setMousePosition(event.clientX, event.clientY);
     }
 };