Skip to content

Commit 824f4c7

Browse files
committed
Bumping to v1.1.3
1 parent b61c286 commit 824f4c7

8 files changed

+22
-20
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-color-picker",
33
"description": "Color Picker Directive For AngularJS",
4-
"version": "1.1.2",
4+
"version": "1.1.3",
55
"homepage": "https://github.com/ruhley/angular-color-picker",
66
"repository": {
77
"type": "git",

dist/angularjs-color-picker.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angularjs-color-picker.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v1.1.2
2+
* angularjs-color-picker v1.1.3
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-18 10:16:06
7+
* 2016-06-07 08:36:56
88
*
99
*/
1010
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -19,7 +19,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
1919

2020
(function() {
2121
'use strict';
22-
22+
console.log();
2323
var colorPicker = function ($document, $timeout) {
2424
return {
2525
restrict: 'E',
@@ -42,6 +42,8 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
4242
link: function ($scope, element, attrs, control) {
4343
$scope.onChangeValue = null;
4444
$scope.updateModel = true;
45+
$scope.chrome = Boolean(window.chrome);
46+
$scope.android_version = parseFloat(window.navigator.userAgent.match(/Android\s([0-9\.]*)/i)[1]);
4547

4648
$scope.init = function () {
4749
// if no color provided
@@ -676,7 +678,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
676678
docElem = doc.documentElement;
677679

678680
// hack for small chrome screens not position the clicks properly when the page is scrolled
679-
if (window.chrome && screen.width <= 768) {
681+
if ($scope.chrome && $scope.android_version < 6 && screen.width <= 768) {
680682
return {
681683
top: rect.top - docElem.clientTop,
682684
left: rect.left - docElem.clientLeft

dist/angularjs-color-picker.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angularjs-color-picker.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/themes/angularjs-color-picker-bootstrap.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v1.1.2
2+
* angularjs-color-picker v1.1.3
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-18 10:16:06
7+
* 2016-06-07 08:36:56
88
*
99
*/
1010
.color-picker-wrapper .color-picker-input-wrapper {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*!
2-
* angularjs-color-picker v1.1.2
2+
* angularjs-color-picker v1.1.3
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-18 10:16:06
7+
* 2016-06-07 08:36:56
88
*
99
*/.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}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angularjs-color-picker",
33
"description": "Color Picker Directive For AngularJS",
4-
"version": "1.1.2",
4+
"version": "1.1.3",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {
@@ -27,7 +27,7 @@
2727
"grunt-contrib-jshint": "~1.0.0",
2828
"grunt-contrib-less": "~1.3.0",
2929
"grunt-contrib-uglify": "~1.0.0",
30-
"grunt-karma": "~1.0.0",
30+
"grunt-karma": "~2.0.0",
3131
"grunt-notify": "~0.4.1",
3232
"load-grunt-tasks": "~3.5.0",
3333
"time-grunt": "~1.3.0"

0 commit comments

Comments
 (0)