Skip to content

Commit 8133384

Browse files
committed
Bumping to v1.0.7
1 parent 513961d commit 8133384

8 files changed

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

dist/angularjs-color-picker.css

Lines changed: 8 additions & 14 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: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v1.0.6
2+
* angularjs-color-picker v1.0.7
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-04-27 13:11:08
7+
* 2016-04-29 08:36:22
88
*
99
*/
1010
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -27,7 +27,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
2727
scope: {
2828
ngModel: '=',
2929
colorPickerDisabled: '=',
30-
colorPickerAlpha: '=?',
30+
colorPickerAlpha: '=',
3131
colorPickerCase: '=',
3232
colorPickerFormat: '=',
3333
colorPickerPos: '=',
@@ -316,19 +316,8 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
316316
}
317317
});
318318

319-
$scope.$watch('colorPickerFormat', function (newValue, oldValue) {
320-
if (newValue !== undefined && newValue !== oldValue) {
321-
if (newValue === 'hex') {
322-
$scope.colorPickerAlpha = false;
323-
}
324-
325-
$scope.initConfig();
326-
$scope.update();
327-
}
328-
});
329-
330319
$scope.$watchGroup(
331-
['colorPickerAlpha', 'colorPickerCase'],
320+
['colorPickerFormat', 'colorPickerAlpha', 'colorPickerCase'],
332321
function (newValue, oldValue) {
333322
if (newValue !== undefined) {
334323
$scope.initConfig();
@@ -688,18 +677,18 @@ angular.module('color.picker').run(['$templateCache', function($templateCache) {
688677
' \'color-picker-panel-bottom color-picker-panel-right\': config.pos === \'bottom right\',\n' +
689678
' \'color-picker-panel-bottom color-picker-panel-left\': config.pos === \'bottom left\',\n' +
690679
' }">\n' +
691-
' <div class="color-picker-hue color-picker-sprite">\n' +
692-
' <div class="color-picker-slider"></div>\n' +
693-
' </div>\n' +
694-
' <div class="color-picker-opacity color-picker-sprite" ng-show="config.alpha">\n' +
695-
' <div class="color-picker-slider"></div>\n' +
696-
' </div>\n' +
697680
' <div class="color-picker-grid color-picker-sprite">\n' +
698681
' <div class="color-picker-grid-inner"></div>\n' +
699682
' <div class="color-picker-picker">\n' +
700683
' <div></div>\n' +
701684
' </div>\n' +
702685
' </div>\n' +
686+
' <div class="color-picker-hue color-picker-sprite">\n' +
687+
' <div class="color-picker-slider"></div>\n' +
688+
' </div>\n' +
689+
' <div class="color-picker-opacity color-picker-sprite" ng-show="config.alpha && config.format !== \'hex\'">\n' +
690+
' <div class="color-picker-slider"></div>\n' +
691+
' </div>\n' +
703692
' </div>\n' +
704693
'</div>'
705694
);

dist/angularjs-color-picker.min.css

Lines changed: 3 additions & 3 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.0.6
2+
* angularjs-color-picker v1.0.7
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-04-27 13:11:08
7+
* 2016-04-29 08:36:22
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.0.6
2+
* angularjs-color-picker v1.0.7
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-04-27 13:11:08
7+
* 2016-04-29 08:36:22
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: 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": "1.0.6",
4+
"version": "1.0.7",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)