Bumping to v2.4.8

Author: ruhley

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v2.4.8
+
+#### Breaking Changes
+  * None
+
+#### New Features
+  * None
+
+#### Bug Fixes
+  * Bug #115 - Touch events not getting proper position
+
 ## v2.4.7
 
 #### Breaking Changes

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "homepage": "https://github.com/ruhley/angular-color-picker",
   "repository": {
     "type": "git",

dist/angularjs-color-picker.css

@@ -1,10 +1,10 @@
 /*!
- * angularjs-color-picker v2.4.7
+ * angularjs-color-picker v2.4.8
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-09-20 08:25:47
+ * 2016-09-26 08:41:56
  *
  */
 
@@ -714,7 +714,9 @@ var AngularColorPickerController = function () {
             event.preventDefault();
 
             var el = this.find('.color-picker-hue');
-            this.hue = (1 - (event.pageY - this.offset(el).top) / el.prop('offsetHeight')) * 360;
+            var eventPos = this.getEventPos(event);
+
+            this.hue = (1 - (eventPos.pageY - this.offset(el).top) / el.prop('offsetHeight')) * 360;
 
             if (this.hue > 360) {
                 this.hue = 360;
@@ -768,7 +770,9 @@ var AngularColorPickerController = function () {
             event.preventDefault();
 
             var el = this.find('.color-picker-opacity');
-            this.opacity = (1 - (event.pageY - this.offset(el).top) / el.prop('offsetHeight')) * 100;
+            var eventPos = this.getEventPos(event);
+
+            this.opacity = (1 - (eventPos.pageY - this.offset(el).top) / el.prop('offsetHeight')) * 100;
 
             if (this.opacity > 100) {
                 this.opacity = 100;
@@ -820,11 +824,12 @@ var AngularColorPickerController = function () {
             event.preventDefault();
 
             var el = this.find('.color-picker-grid-inner');
+            var eventPos = this.getEventPos(event);
             var offset = this.offset(el);
 
             if (this.options.round) {
-                var dx = (event.pageX - offset.left) * 2.0 / el.prop('offsetWidth') - 1.0;
-                var dy = -((event.pageY - offset.top) * 2.0 / el.prop('offsetHeight')) + 1.0;
+                var dx = (eventPos.pageX - offset.left) * 2.0 / el.prop('offsetWidth') - 1.0;
+                var dy = -((eventPos.pageY - offset.top) * 2.0 / el.prop('offsetHeight')) + 1.0;
 
                 var tmpSaturation = Math.sqrt(dx * dx + dy * dy);
                 var tmpHue = Math.atan2(dy, dx);
@@ -837,8 +842,8 @@ var AngularColorPickerController = function () {
                 this.hue = degHue;
                 this.lightness = 100;
             } else {
-                this.saturation = (event.pageX - offset.left) / el.prop('offsetWidth') * 100;
-                this.lightness = (1 - (event.pageY - offset.top) / el.prop('offsetHeight')) * 100;
+                this.saturation = (eventPos.pageX - offset.left) / el.prop('offsetWidth') * 100;
+                this.lightness = (1 - (eventPos.pageY - offset.top) / el.prop('offsetHeight')) * 100;
 
                 if (this.saturation > 100) {
                     this.saturation = 100;
@@ -914,6 +919,11 @@ var AngularColorPickerController = function () {
         // helper functions
         //---------------------------
 
+    }, {
+        key: 'getEventPos',
+        value: function getEventPos(event) {
+            return event.type.search('touch') === 0 ? event.changedTouches[0] : event;
+        }
     }, {
         key: 'eventApiDispatch',
         value: function eventApiDispatch(name, args) {

dist/angularjs-color-picker.js

@@ -1,10 +1,10 @@
 /*!
- * angularjs-color-picker v2.4.7
+ * angularjs-color-picker v2.4.8
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-09-20 08:25:49
+ * 2016-09-26 08:41:59
  *
  */
 .color-picker-wrapper .color-picker-input-wrapper {

dist/angularjs-color-picker.min.css

@@ -1,9 +1,9 @@
 /*!
- * angularjs-color-picker v2.4.7
+ * angularjs-color-picker v2.4.8
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-09-20 08:25:49
+ * 2016-09-26 08:41:59
  *
  */.color-picker-wrapper .color-picker-input-wrapper{width:100%}.color-picker-wrapper .color-picker-swatch:not(.input-group-addon){height:28px}.color-picker-wrapper.color-picker-swatch-only .input-group .input-group-addon{border-radius:4px}

dist/angularjs-color-picker.min.js

@@ -1,7 +1,7 @@
 {
   "name": "angularjs-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "license": "MIT",
   "main": "dist/angularjs-color-picker.min.js",
   "dependencies": {