Changing Case type

BoldGrid · Nov 15, 2017 · fad3e9d · fad3e9d
1 parent 069dbf7
commit fad3e9d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 69 deletions.
diff --git a/.eslintcache b/.eslintcache
diff --git a/src/controls/color/js/config.js b/src/controls/color/js/config.js
@@ -44,7 +44,7 @@ export class Config {
 			config.palettes = config.palettes.concat( presetPalettes );
 		}
 
-		config.palettes[0]['is_active'] = true;
+		config.palettes[0].isActive = true;
 		config['color-palette-size'] = config.palettes[0].colors.length;
 		config['palette_formats'] = [ 'palette-primary' ];
 
@@ -79,8 +79,8 @@ export class Config {
 	createPalette( colors ) {
 		let paletteConfig = _.defaults( colors, {
 			default: true,
-			copy_on_mod: true,
-			is_active: false,
+			copyOnMod: true,
+			isActive: false,
 			format: 'palette-primary',
 			colors: this.material.getPalette( this.defaultColor )
 		} );
@@ -119,7 +119,7 @@ export class Config {
 
 		// Set the active palette.
 		// @todo: correctly identify if the active palette is one of the default palettes.
-		palette['is_active'] = true;
+		palette.isActive = true;
 		palette.default = false;
 		config.palettes[0] = this.createPalette( palette );
 
@@ -140,7 +140,7 @@ export class Config {
 			*/
 
 			formattedPalette.default = false;
-			formattedPalette['copy_on_mod'] = false;
+			formattedPalette.copyOnMod = false;
 			config['saved_palettes'].push( formattedPalette );
 		}
 
@@ -160,7 +160,7 @@ export class Config {
 	 */
 	_createDefault( color ) {
 		return this.createPalette( {
-			is_active: false,
+			isActive: false,
 			colors: this.material.getPalette( color ),
 			'neutral-color': 'white'
 		} );

diff --git a/src/controls/color/js/renderer.js b/src/controls/color/js/renderer.js
@@ -1,7 +1,6 @@
 var $ = window.jQuery;
 
 import '../scss/control.scss';
-import SampleConfig from './sampleConfig.js';
 import './control.js';
 import { Config } from './config.js';
 import { Button as ButtonColors } from './button.js';

diff --git a/src/controls/color/js/sampleConfig.js b/src/controls/color/js/sampleConfig.js
diff --git a/src/controls/color/template.html b/src/controls/color/template.html
@@ -10,9 +10,9 @@ <h3>Active Palette</h3>
 	<div data-palette-wrapper='true'>
 		<ul class='boldgrid-inactive-palette'
 			 data-is-default="<%= ~~palette.default %>"
-			 data-is-active="<%= ~~palette.is_active %>"
+			 data-is-active="<%= ~~palette.isActive %>"
 			 data-color-palette-format="<%=palette.format %>"
-			 data-copy-on-mod="<%= ~~palette.copy_on_mod %>"
+			 data-copy-on-mod="<%= ~~palette.copyOnMod %>"
 			 data-palette-id="<%=palette.palette_id %>"
 			 <% if ( palette['neutral-color'] ) { %>
 				 data-neutral-color="<%= palette['neutral-color'] %>"