fix FF

choos301 · Apr 28, 2015 · aa71130 · aa71130
2 parents af1b1f6 + d987634
commit aa71130
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 .idea/
 node_modules/
 test/coverage
-js/*.html
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+v3.0.14 - Mon, 21 Apr 2015 (jakubsikora)
+---------------------------------------
+
+- [37faabf62b55962f28959981085662cb407f2a48] scrolling fix
+
 v3.0.13 - Fri, 27 Mar 2015 (ste2425)
 ---------------------------------------
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-colorpicker",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "main": [ 
 		"js/bootstrap-colorpicker-module.js",
 		"css/colorpicker.css"

diff --git a/css/colorpicker.min.css b/css/colorpicker.min.css
diff --git a/js/bootstrap-colorpicker-module.js b/js/bootstrap-colorpicker-module.js
@@ -221,8 +221,8 @@ angular.module('colorpicker.module', [])
           slider.top = event.pageY - targetOffset.top - window.pageYOffset + targetOffset.scrollY;
 
           pointer = {
-            left: event.pageX - (event.offsetX ? event.offsetX : event.layerX) - slider.left,
-            top: event.pageY - (event.offsetY ? event.offsetY : event.layerY) - slider.top
+            left: event.pageX - ((event.offsetX ? event.offsetX : event.layerX) - slider.left),
+            top: event.pageY - ((event.offsetY ? event.offsetY : event.layerY) - slider.top)
           };
         },
         setSaturation: function(event, fixedPosition) {

diff --git a/js/bootstrap-colorpicker-module.min.js b/js/bootstrap-colorpicker-module.min.js
diff --git a/package.json b/package.json
@@ -1,24 +1,24 @@
 {
   "name": "angular-bootstrap-colorpicker",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "description": "Native AngularJS colorpicker directive",
   "main": "js/bootstrap-colorpicker-module.js",
   "directories": {
     "test": "test"
   },
   "devDependencies": {
-    "gulp": "^3.8.10",
-    "gulp-jshint": "^1.9.0",
-    "gulp-less": "^2.0.1",
-    "gulp-minify-css": "^0.3.11",
-    "gulp-rename": "^1.2.0",
-    "gulp-uglify": "^1.0.2",
-    "jasmine-core": "^2.1.3",
-    "karma": "^0.12.28",
-    "karma-coverage": "^0.2.7",
-    "karma-chrome-launcher": "^0.1.7",
+    "gulp": "^3.8.11",
+    "gulp-jshint": "^1.10.0",
+    "gulp-less": "^3.0.3",
+    "gulp-minify-css": "^1.1.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^1.2.0",
+    "jasmine-core": "^2.2.0",
+    "karma": "^0.12.32",
+    "karma-coverage": "^0.3.1",
+    "karma-chrome-launcher": "^0.1.8",
     "karma-cli": "0.0.4",
-    "karma-jasmine": "^0.3.2"
+    "karma-jasmine": "^0.3.5"
   },
   "scripts": {
     "test": "karma start test/karma.conf.js"

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -1,12 +1,12 @@
 module.exports = function(config){
   config.set({
-    basePath : '',
+    basePath : '../',
     files : [
-      'libs/jquery-1.10.1.min.js',
-      'libs/angular.min.js',
-      'libs/angular-mocks.js',
-      '../js/**/*.js',
-      'unit/**/*.js'
+      'test/libs/jquery-1.10.1.min.js',
+      'test/libs/angular.min.js',
+      'test/libs/angular-mocks.js',
+      'js/**/bootstrap-colorpicker-module.js',
+      'test/unit/**/*.js'
     ],
     singleRun: true,
     frameworks: ['jasmine'],
@@ -19,10 +19,10 @@ module.exports = function(config){
     reporters: ['dots', 'coverage'],
     coverageReporter: {
       type: 'html',
-      dir: 'coverage/',
+      dir: 'test/coverage/'
     },
     preprocessors: {
-      '../**/js/**/*.js': 'coverage'
+      'js/bootstrap-colorpicker-module.js': 'coverage'
     }
   });
 };