Skip to content

Commit

Permalink
fixed #40
Browse files Browse the repository at this point in the history
  • Loading branch information
easylogic committed Jul 25, 2020
1 parent fb3cb13 commit c3caebc
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 8 deletions.
3 changes: 2 additions & 1 deletion addon/codemirror-colorpicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
position: relative;
width: 10px;
height: 12px;
padding: 0px; }
padding: 0px;
background-color: transparent; }
.codemirror-colorpicker .colorpicker-body .arrow-button:before {
content: "";
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion addon/codemirror-colorpicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9378,7 +9378,7 @@ var excluded_token = ['comment', 'builtin', 'qualifier'];
function onChange(cm, evt) {
if (evt.origin == 'setValue') {
// if content is changed by setValue method, it initialize markers
cm.state.colorpicker.close_color_picker();
// cm.state.colorpicker.close_color_picker();
cm.state.colorpicker.init_color_update();
cm.state.colorpicker.style_color_update();
} else {
Expand Down
3 changes: 2 additions & 1 deletion dist/codemirror-colorpicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
position: relative;
width: 10px;
height: 12px;
padding: 0px; }
padding: 0px;
background-color: transparent; }
.codemirror-colorpicker .colorpicker-body .arrow-button:before {
content: "";
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion dist/codemirror-colorpicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9512,7 +9512,7 @@ var excluded_token = ['comment', 'builtin', 'qualifier'];
function onChange(cm, evt) {
if (evt.origin == 'setValue') {
// if content is changed by setValue method, it initialize markers
cm.state.colorpicker.close_color_picker();
// cm.state.colorpicker.close_color_picker();
cm.state.colorpicker.init_color_update();
cm.state.colorpicker.style_color_update();
} else {
Expand Down
2 changes: 1 addition & 1 deletion dist/codemirror-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": "codemirror-colorpicker",
"version": "1.9.71",
"version": "1.9.72",
"description": "simple colorpicker used anywhere",
"main": "./dist/codemirror-colorpicker.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/extension/codemirror/colorview.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let excluded_token = ['comment', 'builtin', 'qualifier'];

function onChange(cm, evt) {
if (evt.origin == 'setValue') { // if content is changed by setValue method, it initialize markers
cm.state.colorpicker.close_color_picker();
// cm.state.colorpicker.close_color_picker();
cm.state.colorpicker.init_color_update();
cm.state.colorpicker.style_color_update();
} else {
Expand Down
1 change: 1 addition & 0 deletions src/scss/component/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
width: 10px;
height: 12px;
padding: 0px;
background-color: transparent;

&:before {
content: "";
Expand Down
2 changes: 1 addition & 1 deletion src/scss/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

@import './colorview';
@import './colorpicker';

0 comments on commit c3caebc

Please sign in to comment.