Skip to content

Don't attempt to hide colour picker if it's not visible #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2016
Merged

Don't attempt to hide colour picker if it's not visible #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c492f35
Don't trigger digest cycle as $scope.hide already triggers one
Jan 27, 2016
d111b60
Bumping to v0.8.2
Jan 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions angularjs-color-picker.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions angularjs-color-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* angularjs-color-picker v0.8.1
* angularjs-color-picker v0.8.2
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2015 ruhley
*
* 2016-01-11 08:39:01
* 2016-01-28 08:06:38
*
*/
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
Expand Down Expand Up @@ -95,7 +95,6 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
if (!$scope.colorMouse && !$scope.hueMouse && !$scope.opacityMouse && $scope.find(event.target).length === 0) {
$scope.log('Color Picker: Document Click Event');
$scope.hide();
$scope.$apply();
// mouse event on color grid
} else if ($scope.colorMouse) {
$scope.colorUp(event);
Expand Down
4 changes: 2 additions & 2 deletions angularjs-color-picker.min.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions angularjs-color-picker.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion angularjs-color-picker.min.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angular-color-picker",
"description": "Color Picker Directive For AngularJS",
"version": "0.8.1",
"version": "0.8.2",
"homepage": "https://github.com/ruhley/angular-color-picker",
"repository": {
"type": "git",
Expand Down
1 change: 0 additions & 1 deletion lib/scripts/directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
if (!$scope.colorMouse && !$scope.hueMouse && !$scope.opacityMouse && $scope.find(event.target).length === 0) {
$scope.log('Color Picker: Document Click Event');
$scope.hide();
$scope.$apply();
// mouse event on color grid
} else if ($scope.colorMouse) {
$scope.colorUp(event);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angularjs-color-picker",
"description": "Color Picker Directive For AngularJS",
"version": "0.8.1",
"version": "0.8.2",
"main": "angularjs-color-picker.js",
"dependencies": {
"angular": "^1.4.0",
Expand Down