[refactor] switch to improved colour conversion helper

Author: zombieFox

src/js/background.js

@@ -127,10 +127,10 @@ var background = (function(){
 helper.e(".control-background-image-file").value="";
 },
 picker: function(){
-helper.e(".control-background-color-by-picker").value=helper.rgbToHex(state.get.current().background.color.custom);
+helper.e(".control-background-color-by-picker").value=helper.convertColor.rgb.hex(state.get.current().background.color.custom);
 },
 hex: function(){
-helper.e(".control-background-color-by-hex").value=helper.rgbToHex(state.get.current().background.color.custom);
+helper.e(".control-background-color-by-hex").value=helper.convertColor.rgb.hex(state.get.current().background.color.custom);
 }
 };
 

src/js/control.js

@@ -2594,8 +2594,8 @@ var control = (function(){
 func: function(){
 theme.mod.color.hsl();
 theme.render.color.shade();
-theme.render.color.range.hsl();
-theme.render.color.range.rgb();
+theme.render.color.input.range.hsl();
+theme.render.color.input.range.rgb();
 theme.render.color.input.hex();
 theme.render.color.input.picker();
 }
@@ -2606,8 +2606,8 @@ var control = (function(){
 func: function(){
 theme.mod.color.hsl();
 theme.render.color.shade();
-theme.render.color.range.hsl();
-theme.render.color.range.rgb();
+theme.render.color.input.range.hsl();
+theme.render.color.input.range.rgb();
 theme.render.color.input.hex();
 theme.render.color.input.quick();
 }
@@ -2619,8 +2619,8 @@ var control = (function(){
 func: function(){
 theme.mod.color.hsl();
 theme.render.color.shade();
-theme.render.color.range.hsl();
-theme.render.color.range.rgb();
+theme.render.color.input.range.hsl();
+theme.render.color.input.range.rgb();
 theme.render.color.input.picker();
 theme.render.color.input.quick();
 }
@@ -2951,7 +2951,7 @@ var control = (function(){
 returnparseInt(object.element.value,10);
 },
 color: function(object){
-returnhelper.hexToRgb(object.element.value);
+returnhelper.convertColor.hex.rgb(object.element.value);
 }
 };
 varvalueMod={
@@ -2962,7 +2962,7 @@ var control = (function(){
 returnvalue/100;
 },
 hexTextString: function(value,object){
-returnhelper.hexToRgb(value);
+returnhelper.convertColor.hex.rgb(value);
 }
 };
 varchangeValue=function(object){
@@ -2978,10 +2978,10 @@ var control = (function(){
 path: object.path,
 newValue: newValue
 });
-// console.log("state set", object.path, helper.getObject({
-//  object: state.get.current(),
-//  path: object.path
-// }));
+console.log("state set",object.path,helper.getObject({
+object: state.get.current(),
+path: object.path
+}));
 };
 };
 varbindControl=function(object){
@@ -3947,7 +3947,7 @@ var control = (function(){
 returnvalue*100;
 },
 hexTextString: function(value,element){
-returnhelper.rgbToHex(value);
+returnhelper.convertColor.rgb.hex(value);
 }
 };
 varsetValue={
@@ -4006,7 +4006,7 @@ var control = (function(){
 object.element.value=newValue;
 },
 color: function(object){
-object.element.value=helper.rgbToHex(helper.getObject({
+object.element.value=helper.convertColor.rgb.hex(helper.getObject({
 object: state.get.current(),
 path: object.path
 }));

src/js/helper.js

@@ -195,90 +195,6 @@ var helper = (function(){
 };
 };
 
-varhslToRgb=function(hslObject){
-if(hslObject==undefined){
-returnnull;
-};
-
-varchroma=(1-Math.abs((2*hslObject.l)-1))*hslObject.s;
-varhuePrime=hslObject.h/60;
-varsecondComponent=chroma*(1-Math.abs((huePrime%2)-1));
-
-huePrime=Math.floor(huePrime);
-varred;
-vargreen;
-varblue;
-
-if(huePrime===0||huePrime===6){
-red=chroma;
-green=secondComponent;
-blue=0;
-}elseif(huePrime===1){
-red=secondComponent;
-green=chroma;
-blue=0;
-}elseif(huePrime===2){
-red=0;
-green=chroma;
-blue=secondComponent;
-}elseif(huePrime===3){
-red=0;
-green=secondComponent;
-blue=chroma;
-}elseif(huePrime===4){
-red=secondComponent;
-green=0;
-blue=chroma;
-}elseif(huePrime===5){
-red=chroma;
-green=0;
-blue=secondComponent;
-};
-
-varlightnessAdjustment=hslObject.l-(chroma/2);
-red+=lightnessAdjustment;
-green+=lightnessAdjustment;
-blue+=lightnessAdjustment;
-
-varresult={
-r: Math.round(red*255),
-g: Math.round(green*255),
-b: Math.round(blue*255)
-};
-
-returnresult;
-};
-
-varhexToRgb=function(hex){
-if(hex==undefined){
-returnnull;
-};
-varresult=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-if(result){
-result={
-r: parseInt(result[1],16),
-g: parseInt(result[2],16),
-b: parseInt(result[3],16)
-};
-};
-returnresult;
-};
-
-varrgbToHex=function(rgbObject){
-if(rgbObject==undefined){
-returnnull;
-};
-varcomponentToHex=function(hexPart){
-hexPart=hexPart.toString(16);
-if(hexPart.length==1){
-hexPart="0"+hexPart
-};
-returnhexPart;
-};
-varresult="#"+componentToHex(rgbObject.r)+componentToHex(rgbObject.g)+componentToHex(rgbObject.b);
-returnresult;
-};
-
 varmakeNode=function(override){
 varoptions={
 tag: null,
@@ -666,9 +582,9 @@ var helper = (function(){
 };
 
 convertColor.rgb.hsl=function(rgb){
-varr=rgb[0]/255;
-varg=rgb[1]/255;
-varb=rgb[2]/255;
+varr=rgb.r/255;
+varg=rgb.g/255;
+varb=rgb.b/255;
 varmin=Math.min(r,g,b);
 varmax=Math.max(r,g,b);
 vardelta=max-min;
@@ -701,36 +617,44 @@ var helper = (function(){
 s=delta/(2-max-min);
 };
 
-return[h,s*100,l*100];
+return{
+h: h,
+s: s*100,
+l: l*100
+};
 };
 
 convertColor.rgb.hex=function(args){
-varinteger=((Math.round(args[0])&0xFF)<<16)+
-((Math.round(args[1])&0xFF)<<8)+
-(Math.round(args[2])&0xFF);
+varinteger=((Math.round(args.r)&0xFF)<<16)+
+((Math.round(args.g)&0xFF)<<8)+
+(Math.round(args.b)&0xFF);
 
-varstring=integer.toString(16).toUpperCase();
-return"000000".substring(string.length)+string;
+varstring=integer.toString(16);
+return"#"+"000000".substring(string.length)+string;
 };
 
 convertColor.hsl.rgb=function(hsl){
-varh=hsl[0]/360;
-vars=hsl[1]/100;
-varl=hsl[2]/100;
+varh=hsl.h/360;
+vars=hsl.s/100;
+varl=hsl.l/100;
 vart2;
 vart3;
 varval;
 
 if(s===0){
 val=l*255;
-return[val,val,val];
-}
+return{
+r: val,
+g: val,
+b: val
+};
+};
 
 if(l<0.5){
 t2=l*(1+s);
 }else{
 t2=l+s-l*s;
-}
+};
 
 vart1=2*l-t2;
 
@@ -739,11 +663,11 @@ var helper = (function(){
 t3=h+1/3*-(i-1);
 if(t3<0){
 t3++;
-}
+};
 
 if(t3>1){
 t3--;
-}
+};
 
 if(6*t3<1){
 val=t1+(t2-t1)*6*t3;
@@ -753,34 +677,46 @@ var helper = (function(){
 val=t1+(t2-t1)*(2/3-t3)*6;
 }else{
 val=t1;
-}
+};
 
 rgb[i]=val*255;
-}
+};
 
-returnrgb;
+return{
+r: rgb[0],
+g: rgb[1],
+b: rgb[2]
+};
 };
 
 convertColor.hex.rgb=function(args){
 varmatch=args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
 if(!match){
-return[0,0,0];
-}
+return{
+r: 0,
+g: 0,
+b: 0
+};
+};
 
 varcolorString=match[0];
 
 if(match[0].length===3){
 colorString=colorString.split("").map(function(char){
 returnchar+char;
 }).join("");
-}
+};
 
 varinteger=parseInt(colorString,16);
 varr=(integer>>16)&0xFF;
 varg=(integer>>8)&0xFF;
 varb=integer&0xFF;
 
-return[r,g,b];
+return{
+r: r,
+g: g,
+b: b
+};
 };
 
 // exposed methods
@@ -796,9 +732,6 @@ var helper = (function(){
 getDateTime: getDateTime,
 sortObject: sortObject,
 applyOptions: applyOptions,
-hexToRgb: hexToRgb,
-rgbToHex: rgbToHex,
-hslToRgb: hslToRgb,
 makeNode: makeNode,
 node: node,
 setObject: setObject,