Skip to content

Commit 7a824a2

Browse files
committed
Merge pull request #51 from aaronjoslyn/master
Don't attempt to hide colour picker if it's not visible
2 parents 678671a + d111b60 commit 7a824a2

File tree

8 files changed

+12
-14
lines changed

8 files changed

+12
-14
lines changed

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.

angularjs-color-picker.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v0.8.1
2+
* angularjs-color-picker v0.8.2
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2015 ruhley
66
*
7-
* 2016-01-11 08:39:01
7+
* 2016-01-28 08:06:38
88
*
99
*/
1010
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -95,7 +95,6 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
9595
if (!$scope.colorMouse && !$scope.hueMouse && !$scope.opacityMouse && $scope.find(event.target).length === 0) {
9696
$scope.log('Color Picker: Document Click Event');
9797
$scope.hide();
98-
$scope.$apply();
9998
// mouse event on color grid
10099
} else if ($scope.colorMouse) {
101100
$scope.colorUp(event);

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.

angularjs-color-picker.min.js

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

angularjs-color-picker.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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": "0.8.1",
4+
"version": "0.8.2",
55
"homepage": "https://github.com/ruhley/angular-color-picker",
66
"repository": {
77
"type": "git",

lib/scripts/directive.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
if (!$scope.colorMouse && !$scope.hueMouse && !$scope.opacityMouse && $scope.find(event.target).length === 0) {
7777
$scope.log('Color Picker: Document Click Event');
7878
$scope.hide();
79-
$scope.$apply();
8079
// mouse event on color grid
8180
} else if ($scope.colorMouse) {
8281
$scope.colorUp(event);

package.json

Lines changed: 1 addition & 1 deletion
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": "0.8.1",
4+
"version": "0.8.2",
55
"main": "angularjs-color-picker.js",
66
"dependencies": {
77
"angular": "^1.4.0",

0 commit comments

Comments
 (0)