Skip to content

Commit a140406

Browse files
ruhleyruhley
committed
Merge pull request #17 from mqamhieh/support-internet-explorer
Support internet explorer
2 parents 2eb824e + 18a770c commit a140406

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angular-color-picker v0.5.0
2+
* angular-color-picker v0.6.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2015 ruhley
66
*
7-
* 2015-06-04 14:13:50
7+
* 2015-06-15 15:07:39
88
*
99
*/
1010
(function() {
@@ -427,11 +427,11 @@ angular.module('color.picker').run(['$templateCache', function($templateCache) {
427427
'<div class="color-picker-wrapper" ng-class="{\'color-picker-swatch-only\': config.swatchOnly}">\n' +
428428
' <div ng-class="{\'input-group\': config.swatchBootstrap}">\n' +
429429
' <span ng-if="config.swatchPos === \'left\'" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}">\n' +
430-
' <span class="color-picker-swatch-color" style="background-color: {{swatchColor}};"></span>\n' +
430+
' <span class="color-picker-swatch-color" ng-attr-style="background-color: {{swatchColor}};"></span>\n' +
431431
' </span>\n' +
432432
' <input class="color-picker-input form-control" type="text" ng-model="ngModel" size="7" ng-focus="show()" ng-class="{\'color-picker-input-swatch\': config.swatch && !config.swatchOnly && config.swatchPos === \'left\'}">\n' +
433433
' <span ng-if="config.swatchPos === \'right\'" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}">\n' +
434-
' <span class="color-picker-swatch-color" style="background-color: {{swatchColor}};"></span>\n' +
434+
' <span class="color-picker-swatch-color" ng-attr-style="background-color: {{swatchColor}};"></span>\n' +
435435
' </span>\n' +
436436
' </div>\n' +
437437
' <div class="color-picker-panel" ng-show="visible" ng-class="{\n' +
@@ -441,14 +441,14 @@ angular.module('color.picker').run(['$templateCache', function($templateCache) {
441441
' \'color-picker-panel-bottom color-picker-panel-left\': config.pos === \'bottom left\',\n' +
442442
' }">\n' +
443443
' <div class="color-picker-hue color-picker-sprite" ng-click="hueChange($event, true)" ng-mousemove="hueChange($event, false)" ng-mousedown="hueDown()" ng-mouseup="hueUp()">\n' +
444-
' <div class="color-picker-slider" style="top: {{huePos}}%;"></div>\n' +
444+
' <div class="color-picker-slider" ng-attr-style="top: {{huePos}}%;"></div>\n' +
445445
' </div>\n' +
446446
' <div class="color-picker-opacity color-picker-sprite" ng-show="config.alpha" ng-click="opacityChange($event, true)" ng-mousemove="opacityChange($event, false)" ng-mousedown="opacityDown()" ng-mouseup="opacityUp()">\n' +
447-
' <div class="color-picker-slider" style="top: {{opacityPos}}%;"></div>\n' +
447+
' <div class="color-picker-slider" ng-attr-style="top: {{opacityPos}}%;"></div>\n' +
448448
' </div>\n' +
449-
' <div class="color-picker-grid color-picker-sprite" style="background-color: {{grid}};" ng-click="colorChange($event, true)" ng-mousemove="colorChange($event, false)" ng-mousedown="colorDown()" ng-mouseup="colorUp()">\n' +
449+
' <div class="color-picker-grid color-picker-sprite" ng-attr-style="background-color: {{grid}};" ng-click="colorChange($event, true)" ng-mousemove="colorChange($event, false)" ng-mousedown="colorDown()" ng-mouseup="colorUp()">\n' +
450450
' <div class="color-picker-grid-inner"></div>\n' +
451-
' <div class="color-picker-picker" style="top: {{lightnessPos}}%; left: {{saturationPos}}%;">\n' +
451+
' <div class="color-picker-picker" ng-attr-style="top: {{lightnessPos}}%; left: {{saturationPos}}%;">\n' +
452452
' <div></div>\n' +
453453
' </div>\n' +
454454
' </div>\n' +

‎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.

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

‎lib/scripts/template.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ angular.module('color.picker').run(['$templateCache', function($templateCache) {
33
'<div class="color-picker-wrapper" ng-class="{\'color-picker-swatch-only\': config.swatchOnly}">\n' +
44
' <div ng-class="{\'input-group\': config.swatchBootstrap}">\n' +
55
' <span ng-if="config.swatchPos === \'left\'" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}">\n' +
6-
' <span class="color-picker-swatch-color" style="background-color: {{swatchColor}};"></span>\n' +
6+
' <span class="color-picker-swatch-color" ng-attr-style="background-color: {{swatchColor}};"></span>\n' +
77
' </span>\n' +
88
' <input class="color-picker-input form-control" type="text" ng-model="ngModel" size="7" ng-focus="show()" ng-class="{\'color-picker-input-swatch\': config.swatch && !config.swatchOnly && config.swatchPos === \'left\'}">\n' +
99
' <span ng-if="config.swatchPos === \'right\'" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}">\n' +
10-
' <span class="color-picker-swatch-color" style="background-color: {{swatchColor}};"></span>\n' +
10+
' <span class="color-picker-swatch-color" ng-attr-style="background-color: {{swatchColor}};"></span>\n' +
1111
' </span>\n' +
1212
' </div>\n' +
1313
' <div class="color-picker-panel" ng-show="visible" ng-class="{\n' +
@@ -17,14 +17,14 @@ angular.module('color.picker').run(['$templateCache', function($templateCache) {
1717
' \'color-picker-panel-bottom color-picker-panel-left\': config.pos === \'bottom left\',\n' +
1818
' }">\n' +
1919
' <div class="color-picker-hue color-picker-sprite" ng-click="hueChange($event, true)" ng-mousemove="hueChange($event, false)" ng-mousedown="hueDown()" ng-mouseup="hueUp()">\n' +
20-
' <div class="color-picker-slider" style="top: {{huePos}}%;"></div>\n' +
20+
' <div class="color-picker-slider" ng-attr-style="top: {{huePos}}%;"></div>\n' +
2121
' </div>\n' +
2222
' <div class="color-picker-opacity color-picker-sprite" ng-show="config.alpha" ng-click="opacityChange($event, true)" ng-mousemove="opacityChange($event, false)" ng-mousedown="opacityDown()" ng-mouseup="opacityUp()">\n' +
23-
' <div class="color-picker-slider" style="top: {{opacityPos}}%;"></div>\n' +
23+
' <div class="color-picker-slider" ng-attr-style="top: {{opacityPos}}%;"></div>\n' +
2424
' </div>\n' +
25-
' <div class="color-picker-grid color-picker-sprite" style="background-color: {{grid}};" ng-click="colorChange($event, true)" ng-mousemove="colorChange($event, false)" ng-mousedown="colorDown()" ng-mouseup="colorUp()">\n' +
25+
' <div class="color-picker-grid color-picker-sprite" ng-attr-style="background-color: {{grid}};" ng-click="colorChange($event, true)" ng-mousemove="colorChange($event, false)" ng-mousedown="colorDown()" ng-mouseup="colorUp()">\n' +
2626
' <div class="color-picker-grid-inner"></div>\n' +
27-
' <div class="color-picker-picker" style="top: {{lightnessPos}}%; left: {{saturationPos}}%;">\n' +
27+
' <div class="color-picker-picker" ng-attr-style="top: {{lightnessPos}}%; left: {{saturationPos}}%;">\n' +
2828
' <div></div>\n' +
2929
' </div>\n' +
3030
' </div>\n' +

‎package.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.5.0",
4+
"version": "0.6.0",
55
"dependencies": {},
66
"repository": {
77
"type": "git",

0 commit comments

Comments
 (0)