Skip to content

Commit

Permalink
v.3.4.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
evoluteur committed Jul 10, 2021
1 parent 24d4792 commit c445e68
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "evol-colorpicker",
"version": "3.4.2",
"version": "3.4.3",
"description": "jQuery UI widget for web color picking which looks like the one in Microsoft Office 2010.",
"homepage": "http://evoluteur.github.io/colorpicker/",
"main": "js/evol-colorpicker.min.js",
Expand Down
2 changes: 1 addition & 1 deletion css/demo.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
evol-colorpicker 3.4.2
evol-colorpicker 3.4.3
(c) 2021 Olivier Giulieri
http://evoluteur.github.io/colorpicker/
*/
Expand Down
2 changes: 1 addition & 1 deletion css/evol-colorpicker.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
evol-colorpicker 3.4.2
evol-colorpicker 3.4.3
(c) 2021 Olivier Giulieri
http://evoluteur.github.io/colorpicker/
*/
Expand Down
32 changes: 16 additions & 16 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="icon" type="image/png" href="favicon.gif" />
<link id="jquiCSS" rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.css" type="text/css" media="all">
<link href="css/demo.css" rel="stylesheet" />
<link href="css/demo.css" rel="stylesheet" />
<link href="css/evol-colorpicker.min.css" rel="stylesheet" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js" type="text/javascript"></script>
Expand All @@ -18,8 +18,8 @@

<body>
<header>
<h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
<div id="github">
<h1 id="title">Evol-ColorPicker <span>v3.4.3</span></h1>
<div id="github">
<iframe src="https://ghbtns.com/github-btn.html?user=evoluteur&type=star&count=true&size=small&repo=colorpicker" frameborder="0" scrolling="0" width="100px" height="30px"></iframe>
</div>
</header>
Expand All @@ -29,7 +29,7 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>

<p>
It can be used inline or as a popup bound to a text box.
It comes with several color palettes, can track selection history and supports "transparent" color.
It comes with several color palettes, can track selection history and supports "transparent" color.
It is a full jQuery UI widget, supporting various configurations and themes.
</p>

Expand Down Expand Up @@ -58,12 +58,12 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
<a href="#" id="enable2">Enable</a>
<a href="#" id="disable2">Disable</a>
<a href="#" id="destroy2">Destroy</a>
</div>
</div>
</div>

<div class="demoPanel">
Inline with "web" default palette:<br/><br/>
<div id="cpInline2"></div>
<div id="cpInline2"></div>
</div>

<div class="demoPanel ui-widget ui-widget-content ui-corner-all" style="width:130px">
Expand All @@ -76,7 +76,7 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
<input id="cpBoth" value="#b7dde8" />
<label><a href="#" id="show">link</a></label>
<input id="cpOther" value="#d7e3bc" />
<br/>
<br/>
<i>Using "showOn" option.</i>
</div>

Expand All @@ -86,7 +86,7 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
<div>
<div id="cpb" class="demoPanel" style="width:170px;">
Methods:<br/><br/>
<input id="cp1"/><br/>
<input id="cp1"/><br/>
<div id="tests" class="demo-links">
<a href="#" id="getVal">Get Value</a>
<a href="#" id="setVal">Set Value</a><br/>
Expand All @@ -100,13 +100,13 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
<div id="cpEvent" class="demoPanel" style="width:170px;background-color:#ebf1dd;">
Event binding:
<br/><br/>
<input id="cpBinding"/><br/>
<input id="cpBinding"/><br/>
<i>Using "change.color" and "mouseover.color" events.</i>
</div>

<div class="demoPanel">
Custom Palette:<br/>
<br/>
<br/>
<div id="customTheme" value="#92cddc" ></div><br/>
<i>Using the "customTheme" option you can provide your own list of colors.</i>
</div>
Expand All @@ -126,13 +126,13 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>

<div class="demoPanel ui-widget ui-widget-content ui-corner-all" style="width:130px;">
No color indicator on the palette:<br/>
<br/>
<br/>
<input id="noIndColor" value="#92cddc" />
</div>

<div class="demoPanel ui-widget ui-widget-content ui-corner-all" style="width:130px;">
In French:<br/>
<br/>
<br/>
<input id="frenchColor" value="#92cddc" /><br/>
<i>Using the "strings" option you can translate the colorpicker.</i>
</div>
Expand All @@ -153,7 +153,7 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
$('.css').removeClass('sel');
$(this).addClass('sel');
});

// Events demo
function setColor(evt, color){
if(color){
Expand All @@ -167,7 +167,7 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
})
.on('change.color', setColor)
.on('mouseover.color', setColor);

// Methods demo
$('#getVal').on('click', function(){
alert('Selected color = "' + $('#cp1').colorpicker("val") + '"');
Expand Down Expand Up @@ -203,7 +203,7 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
$('#destroy2').on('click', function(){
$('#cpInline').colorpicker("destroy");
});

// Instanciate colorpickers
$('#cp1').colorpicker({
color:'#ff9800',
Expand All @@ -229,7 +229,7 @@ <h1 id="title">Evol-ColorPicker <span>v3.4.2</span></h1>
evt.stopImmediatePropagation();
$('#cpOther').colorpicker("showPalette");
});

// With transparent color
$('#transColor').colorpicker({
transparentColor: true
Expand Down
26 changes: 13 additions & 13 deletions js/evol-colorpicker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
evol-colorpicker 3.4.2
evol-colorpicker 3.4.3
ColorPicker widget for jQuery UI
https://github.com/evoluteur/colorpicker
Expand Down Expand Up @@ -69,7 +69,7 @@ var _idx=0,
$.widget( "evol.colorpicker", {

version: '3.4.0',

options: {
color: null, // example:'#31859B'
customTheme: null, // example: ["#ff0000", "#00ff00", "blue"],
Expand Down Expand Up @@ -217,7 +217,7 @@ $.widget( "evol.colorpicker", {
} else {
oTD+='#';
// base theme colors
for(i=0;i<10;i++){
for(i=0;i<10;i++){
h+=oTD+baseThemeColors[i]+cTD;
}
h+='</tr>';
Expand All @@ -226,17 +226,17 @@ $.widget( "evol.colorpicker", {
}
h+='<tr class="top">';
// theme colors
for(i=0;i<10;i++){
for(i=0;i<10;i++){
h+=oTD+subThemeColors[i]+cTD;
}
for(var r=1;r<4;r++){
h+='</tr><tr class="in">';
for(i=0;i<10;i++){
for(i=0;i<10;i++){
h+=oTD+subThemeColors[r*10+i]+cTD;
}
}
h+='</tr><tr class="bottom">';
for(i=40;i<50;i++){
for(i=40;i<50;i++){
h+=oTD+subThemeColors[i]+cTD;
}
h+='</tr>'+oTRTH;
Expand All @@ -246,12 +246,12 @@ $.widget( "evol.colorpicker", {
}
h+=labels[1]+'</th></tr><tr>';
// standard colors
for(i=0;i<10;i++){
for(i=0;i<10;i++){
h+=oTD+standardColors[i]+cTD;
}
}
h+='</tr></table>';
return h;
return h;
},

_paletteHTML2: function() {
Expand All @@ -266,7 +266,7 @@ $.widget( "evol.colorpicker", {
for(var r=0,rMax=webColors.length;r<rMax;r++){
h+=oTableTR;
var cs=webColors[r];
for(i=0,iMax=cs.length;i<iMax;i++){
for(i=0,iMax=cs.length;i<iMax;i++){
h+=oTD+cs[i]+cTD;
}
h+=cTableTR;
Expand All @@ -286,8 +286,8 @@ $.widget( "evol.colorpicker", {

_switchPalette: function(link) {
if(this._enabled){
var idx,
content,
var idx,
content,
label,
opts=this.options,
labels=opts.strings.split(',');
Expand Down Expand Up @@ -516,7 +516,7 @@ $.widget( "evol.colorpicker", {
e.removeAttr('disabled');
}else{
e.css({
'opacity': '1',
'opacity': '1',
'pointer-events': 'auto'
});
}
Expand All @@ -535,7 +535,7 @@ $.widget( "evol.colorpicker", {
}else{
this.hidePalette();
e.css({
'opacity': '0.3',
'opacity': '0.3',
'pointer-events': 'none'
});
}
Expand Down
4 changes: 2 additions & 2 deletions js/evol-colorpicker.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "evol-colorpicker",
"version": "3.4.2",
"version": "3.4.3",
"description": "jQuery UI widget for web color picking which looks like the one in Microsoft Office 2010.",
"copyright": "(c) 2021 Olivier Giulieri",
"homepage": "http://evoluteur.github.io/colorpicker/",
Expand Down

0 comments on commit c445e68

Please sign in to comment.