Skip to content

Commit 167e04f

Browse files
committed
Bumping to v0.6.11
1 parent 7adbf8b commit 167e04f

File tree

7 files changed

+51
-16
lines changed

7 files changed

+51
-16
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v0.6.10
2+
* angularjs-color-picker v0.6.11
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2015 ruhley
66
*
7-
* 2015-11-10 08:35:04
7+
* 2015-11-19 08:25:57
88
*
99
*/
1010
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -96,9 +96,9 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
9696
};
9797

9898
$scope.hide = function () {
99-
$scope.log('Color Picker: Hide Event');
99+
if ($scope.visible || element[0].querySelector('.color-picker-panel').offsetParent !== null) {
100+
$scope.log('Color Picker: Hide Event');
100101

101-
if ($scope.visible) {
102102
$scope.visible = false;
103103
$scope.$apply();
104104
}

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

package.json

Lines changed: 3 additions & 3 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": "0.6.10",
4+
"version": "0.6.11",
55
"main": [
66
"angularjs-color-picker.js",
77
"angularjs-color-picker.css"
@@ -18,9 +18,9 @@
1818
"Benjamin Orozco <[email protected]>"
1919
],
2020
"devDependencies": {
21-
"glob": "~5.0.0",
21+
"glob": "~6.0.0",
2222
"grunt": "~0.4.5",
23-
"grunt-contrib-clean": "~0.6.0",
23+
"grunt-contrib-clean": "~0.7.0",
2424
"grunt-contrib-concat": "~0.5.1",
2525
"grunt-contrib-cssmin": "~0.14.0",
2626
"grunt-contrib-jshint": "~0.11.0",

0 commit comments

Comments
 (0)