Merge pull request #2359 from danielstorey/issue/2358

Resolves #2358 - allow rgba values to be set via ColourPicker input

Author: canstudios-nicolaw

frontend/src/modules/editor/themeEditor/views/editorThemingView.js

@@ -212,7 +212,7 @@ define(function(require) {
       }
       if (fieldView.schema.inputType === 'ColourPicker') {
         fieldView.setValue(value);
-      } else if (fieldView.schema.inputType.indexOf('Asset:') > -1) {
+      } else if (typeof fieldView.schema.inputType === 'string' && fieldView.schema.inputType.indexOf('Asset:') > -1) {
         fieldView.setValue(value);
         fieldView.render();
         $('div[data-editor-id*="' + key + '"]').append(fieldView.editor.$el);

frontend/src/modules/scaffold/views/scaffoldColourPickerView.js

@@ -24,7 +24,6 @@ define([
     postRender: function() {
       this.$el.spectrum({
         color: this.value,
-        showInput: true,
         showAlpha: true,
         showInitial: true,
         showInput: true,
@@ -50,8 +49,9 @@ define([
 
     getValue: function() {
       var colour = this.$el.spectrum('get');
-      if (colour) return colour.toHexString();
-      return '';
+      if (!colour) return '';
+
+      return (colour.getAlpha() < 1) ? colour.toRgbString() : colour.toHexString();
     },
 
     setValue: function(value) {