[refactor] helper colour convert naming

Author: zombieFox

src/js/helper.js

@@ -659,13 +659,13 @@ var helper = (function(){
 };
 };
 
-varconvert={
+varconvertColor={
 rgb: {},
 hsl: {},
 hex: {}
 };
 
-convert.rgb.hsl=function(rgb){
+convertColor.rgb.hsl=function(rgb){
 constr=rgb[0]/255;
 constg=rgb[1]/255;
 constb=rgb[2]/255;
@@ -704,8 +704,8 @@ var helper = (function(){
 return[h,s*100,l*100];
 };
 
-convert.rgb.lab=function(rgb){
-constxyz=convert.rgb.xyz(rgb);
+convertColor.rgb.lab=function(rgb){
+constxyz=convertColor.rgb.xyz(rgb);
 letx=xyz[0];
 lety=xyz[1];
 letz=xyz[2];
@@ -725,7 +725,7 @@ var helper = (function(){
 return[l,a,b];
 };
 
-convert.rgb.xyz=function(rgb){
+convertColor.rgb.xyz=function(rgb){
 letr=rgb[0]/255;
 letg=rgb[1]/255;
 letb=rgb[2]/255;
@@ -742,7 +742,7 @@ var helper = (function(){
 return[x*100,y*100,z*100];
 };
 
-convert.rgb.hex=function(args){
+convertColor.rgb.hex=function(args){
 constinteger=((Math.round(args[0])&0xFF)<<16)+
 ((Math.round(args[1])&0xFF)<<8)+
 (Math.round(args[2])&0xFF);
@@ -751,7 +751,7 @@ var helper = (function(){
 return'000000'.substring(string.length)+string;
 };
 
-convert.hsl.rgb=function(hsl){
+convertColor.hsl.rgb=function(hsl){
 consth=hsl[0]/360;
 consts=hsl[1]/100;
 constl=hsl[2]/100;
@@ -799,7 +799,7 @@ var helper = (function(){
 returnrgb;
 };
 
-convert.hex.rgb=function(args){
+convertColor.hex.rgb=function(args){
 constmatch=args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
 if(!match){
 return[0,0,0];
@@ -821,7 +821,6 @@ var helper = (function(){
 return[r,g,b];
 };
 
-
 // exposed methods
 return{
 e: e,
@@ -850,7 +849,7 @@ var helper = (function(){
 ordinalNumber: ordinalNumber,
 isJsonString: isJsonString,
 isHexNumber: isHexNumber,
-convert: convert
+convertColor: convertColor
 };
 
 })();

src/js/theme.js

@@ -21,13 +21,13 @@ var theme = (function(){
 
 mod.color={
 hsl: function(){
-varhsl=helper.convert.rgb.hsl([state.get.current().theme.color.rgb.r,state.get.current().theme.color.rgb.g,state.get.current().theme.color.rgb.b]);
+varhsl=helper.convertColor.rgb.hsl([state.get.current().theme.color.rgb.r,state.get.current().theme.color.rgb.g,state.get.current().theme.color.rgb.b]);
 state.get.current().theme.color.hsl.h=parseInt(hsl[0],10);
 state.get.current().theme.color.hsl.s=parseInt(hsl[1],10);
 state.get.current().theme.color.hsl.l=parseInt(hsl[2],10);
 },
 rgb: function(){
-varrgb=helper.convert.hsl.rgb([state.get.current().theme.color.hsl.h,state.get.current().theme.color.hsl.s,state.get.current().theme.color.hsl.l]);
+varrgb=helper.convertColor.hsl.rgb([state.get.current().theme.color.hsl.h,state.get.current().theme.color.hsl.s,state.get.current().theme.color.hsl.l]);
 state.get.current().theme.color.rgb.r=parseInt(rgb[0],10);
 state.get.current().theme.color.rgb.g=parseInt(rgb[1],10);
 state.get.current().theme.color.rgb.b=parseInt(rgb[2],10);
@@ -133,7 +133,7 @@ var theme = (function(){
 varlMod=4;
 varhtml=helper.e("html");
 
-varhsl=helper.convert.rgb.hsl([state.get.current().theme.color.rgb.r,state.get.current().theme.color.rgb.g,state.get.current().theme.color.rgb.b]);
+varhsl=helper.convertColor.rgb.hsl([state.get.current().theme.color.rgb.r,state.get.current().theme.color.rgb.g,state.get.current().theme.color.rgb.b]);
 
 // base color
 html.style.setProperty("--theme-shade",state.get.current().theme.color.rgb.r+", "+state.get.current().theme.color.rgb.g+", "+state.get.current().theme.color.rgb.b);
@@ -142,7 +142,7 @@ var theme = (function(){
 varh=hsl[0];
 vars=(hsl[1]-(sMod*i));
 varl=(hsl[2]-(lMod*i));
-varrgb=helper.convert.hsl.rgb([h,s,l]);
+varrgb=helper.convertColor.hsl.rgb([h,s,l]);
 varnumber;
 if(i<10){
 number="0"+i;
@@ -156,7 +156,7 @@ var theme = (function(){
 varh=hsl[0];
 vars=(hsl[1]+(sMod*i));
 varl=(hsl[2]+(lMod*i));
-varrgb=helper.convert.hsl.rgb([h,s,l]);
+varrgb=helper.convertColor.hsl.rgb([h,s,l]);
 varnumber;
 if(i<10){
 number="0"+i;