Fixed test errors

devopseze · Dec 12, 2019 · 8ed94b2 · 8ed94b2
1 parent 450a57c
commit 8ed94b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/editors/colorpicker.js b/src/editors/colorpicker.js
@@ -9,13 +9,19 @@ import { StringEditor } from './string'
 import { $extend } from '../utilities'
 
 export var ColorEditor = StringEditor.extend({
+ postBuild: function () {
+ if (window.Picker) this.input.type = 'text'
+ },
  setValue: function (value, initial, fromTemplate) {
  var res = this._super(value, initial, fromTemplate)
  if (this.picker_instance && this.picker_instance.domElement && res && res.changed) {
  this.picker_instance.setColor(res.value, true)
  }
  return res
  },
+ getNumColumns: function () {
+ return 2
+ },
  afterInputReady: function () {
  this._super()
  this.createPicker(true)
@@ -70,7 +76,6 @@ export var ColorEditor = StringEditor.extend({
  if (!options.popup && typeof options.onChange !== 'function') options.onChange = updateHandler
  else if (options.popup && typeof options.onDone !== 'function') options.onDone = updateHandler
 
- this.input.type = 'text'
  this.picker_instance = new window.Picker(options)
  // this.picker_instance.openHandler()
  if (!options.popup) { // use inline colorPicker

diff --git a/tests/pages/colorpicker-use-vanilla-picker.html b/tests/pages/colorpicker-use-vanilla-picker.html
@@ -25,7 +25,7 @@
  "colorpicker": {
  "type": "string",
  "format": "color",
- "default": "#000000",
+ "default": "rgba(0,0,0,1)",
  "options": {
  "colorpicker": {
  "alpha": true,