Skip to content

Various fixes for new ts, strictNullChecks etc. #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/color-picker.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ export class ColorPickerDirective implements OnInit, OnChanges {
this.compiler.compileModuleAndAllComponentsAsync(DynamicCpModule)
.then(factory => {
const compFactory = factory.componentFactories.find(x => x.componentType === DialogComponent);

if (!compFactory) {
throw new Error(`no comp factory`);
}

const injector = ReflectiveInjector.fromResolvedProviders([], this.vcRef.parentInjector);
const cmpRef = this.vcRef.createComponent(compFactory, 0, injector, []);
cmpRef.instance.setDialog(this, this.el, this.colorPicker, this.cpPosition, this.cpPositionOffset,
Expand Down Expand Up @@ -213,11 +218,11 @@ export class SliderDirective {
</div>
<div class="right">
<div *ngIf="cpAlphaChannel==='disabled'" style="height: 18px;"></div>

<div [slider] [rgX]="1" (newValue)="setHue($event)" class="hue" #hueSlider>
<div [style.left.px]="slider.h" class="cursor"></div>
</div>

<div [hidden]="cpAlphaChannel==='disabled'" [slider] [style.background-color]="alphaSliderColor" [rgX]="1" (newValue)="setAlpha($event)" class="alpha" #alphaSlider>
<div [style.left.px]="slider.a" class="cursor"></div>
</div>
Expand Down Expand Up @@ -271,7 +276,7 @@ export class SliderDirective {
<button *ngIf="cpOKButton" type="button" class="{{cpOKButtonClass}}" (click)="oKColor()">{{cpOKButtonText}}</button>
<button *ngIf="cpCancelButton" type="button" class="{{cpCancelButtonClass}}" (click)="cancelColor()">{{cpCancelButtonText}}</button>
</div>

</div>
`,
styles: [`
Expand Down Expand Up @@ -612,4 +617,4 @@ export class DialogComponent implements OnInit {
imports: [BrowserModule],
declarations: [DialogComponent, TextDirective, SliderDirective]
})
class DynamicCpModule { };
class DynamicCpModule { };
14 changes: 11 additions & 3 deletions lib/color-picker.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ export class ColorPickerService {
case b:
h = (r - g) / d + 4;
break;
default:
h = 0;
break;
}
h /= 6;
}
Expand Down Expand Up @@ -84,6 +87,11 @@ export class ColorPickerService {
case 5:
r = v, g = p, b = q;
break;
default:
r = 0;
g = 0;
b = 0;
break;
}

return new Rgba(r, g, b, a)
Expand Down Expand Up @@ -140,10 +148,10 @@ export class ColorPickerService {
}
});
}


colorString = colorString.toLowerCase();
let hsva: Hsva = null;
let hsva: Hsva = <any>undefined;
for (let key in stringParsers) {
if (stringParsers.hasOwnProperty(key)) {
let parser = stringParsers[key];
Expand Down Expand Up @@ -204,4 +212,4 @@ export class ColorPickerService {
return new Rgba(Math.round(rgba.r * 255), Math.round(rgba.g * 255), Math.round(rgba.b * 255), rgba.a);
}

}
}
8 changes: 6 additions & 2 deletions lib/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions lib/lib/classes.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
export declare class Hsva {
h: number;
s: number;
v: number;
a: number;
constructor(h: number, s: number, v: number, a: number);
}
export declare class Hsla {
h: number;
s: number;
l: number;
a: number;
constructor(h: number, s: number, l: number, a: number);
}
export declare class Rgba {
r: number;
g: number;
b: number;
a: number;
constructor(r: number, g: number, b: number, a: number);
}
export declare class SliderPosition {
h: number;
s: number;
v: number;
a: number;
constructor(h: number, s: number, v: number, a: number);
}
export declare class SliderDimension {
h: number;
s: number;
v: number;
a: number;
constructor(h: number, s: number, v: number, a: number);
}
47 changes: 47 additions & 0 deletions lib/lib/classes.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/lib/classes.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

163 changes: 163 additions & 0 deletions lib/lib/color-picker.directive.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
import { OnChanges, ViewContainerRef, ElementRef, EventEmitter, OnInit } from '@angular/core';
import { ColorPickerService } from './color-picker.service';
import { Compiler } from '@angular/core';
export declare class ColorPickerDirective implements OnInit, OnChanges {
private compiler;
private vcRef;
private el;
private service;
colorPicker: string;
colorPickerChange: EventEmitter<string>;
cpToggle: boolean;
cpToggleChange: EventEmitter<boolean>;
cpPosition: string;
cpPositionOffset: string;
cpPositionRelativeToArrow: boolean;
cpOutputFormat: string;
cpPresetLabel: string;
cpPresetColors: Array<string>;
cpCancelButton: boolean;
cpCancelButtonClass: string;
cpCancelButtonText: string;
cpOKButton: boolean;
cpOKButtonClass: string;
cpOKButtonText: string;
cpFallbackColor: string;
cpHeight: string;
cpWidth: string;
cpIgnoredElements: any;
cpDialogDisplay: string;
cpSaveClickOutside: boolean;
cpAlphaChannel: string;
private dialog;
private created;
private ignoreChanges;
constructor(compiler: Compiler, vcRef: ViewContainerRef, el: ElementRef, service: ColorPickerService);
ngOnChanges(changes: any): void;
ngOnInit(): void;
onClick(): void;
openDialog(): void;
colorChanged(value: string, ignore?: boolean): void;
changeInput(value: string): void;
toggle(value: boolean): void;
}
export declare class TextDirective {
newValue: EventEmitter<any>;
text: any;
rg: number;
changeInput(value: string): void;
}
export declare class SliderDirective {
private el;
newValue: EventEmitter<any>;
slider: string;
rgX: number;
rgY: number;
private listenerMove;
private listenerStop;
constructor(el: ElementRef);
setCursor(event: any): void;
move(event: any): void;
start(event: any): void;
stop(): void;
getX(event: any): number;
getY(event: any): number;
}
export declare class DialogComponent implements OnInit {
private el;
private service;
private hsva;
private rgbaText;
private hslaText;
private hexText;
private outputColor;
private selectedColor;
private alphaSliderColor;
private hueSliderColor;
private slider;
private sliderDimMax;
private format;
private show;
private top;
private left;
private position;
private directiveInstance;
private initialColor;
private directiveElementRef;
private listenerMouseDown;
private listenerResize;
private cpPosition;
private cpPositionOffset;
private cpOutputFormat;
private cpPresetLabel;
private cpPresetColors;
private cpCancelButton;
private cpCancelButtonClass;
private cpCancelButtonText;
private cpOKButton;
private cpOKButtonClass;
private cpOKButtonText;
private cpHeight;
private cpWidth;
private cpIgnoredElements;
private cpDialogDisplay;
private cpSaveClickOutside;
private cpAlphaChannel;
private dialogArrowSize;
private dialogArrowOffset;
private arrowTop;
hueSlider: any;
alphaSlider: any;
dialogElement: any;
constructor(el: ElementRef, service: ColorPickerService);
setDialog(instance: any, elementRef: ElementRef, color: any, cpPosition: string, cpPositionOffset: string, cpPositionRelativeToArrow: boolean, cpOutputFormat: string, cpPresetLabel: string, cpPresetColors: Array<string>, cpCancelButton: boolean, cpCancelButtonClass: string, cpCancelButtonText: string, cpOKButton: boolean, cpOKButtonClass: string, cpOKButtonText: string, cpHeight: string, cpWidth: string, cpIgnoredElements: any, cpDialogDisplay: string, cpSaveClickOutside: boolean, cpAlphaChannel: string): void;
ngOnInit(): void;
setInitialColor(color: any): void;
openDialog(color: any, emit?: boolean): void;
cancelColor(): void;
oKColor(): void;
setColorFromString(value: string, emit?: boolean): void;
onMouseDown(event: any): void;
openColorPicker(): void;
closeColorPicker(): void;
onResize(): void;
setDialogPosition(): void;
setSaturation(val: {
v: number;
rg: number;
}): void;
setLightness(val: {
v: number;
rg: number;
}): void;
setHue(val: {
v: number;
rg: number;
}): void;
setAlpha(val: {
v: number;
rg: number;
}): void;
setR(val: {
v: number;
rg: number;
}): void;
setG(val: {
v: number;
rg: number;
}): void;
setB(val: {
v: number;
rg: number;
}): void;
setSaturationAndBrightness(val: {
s: number;
v: number;
rgX: number;
rgY: number;
}): void;
formatPolicy(): number;
update(emit?: boolean): void;
isDescendant(parent: any, child: any): boolean;
createBox(element: any, offset: boolean): any;
}
Loading