From 23811832933f9858dfb8595cf9d9a597576359ba Mon Sep 17 00:00:00 2001 From: Mark Francis Date: Mon, 30 Jul 2018 08:44:13 +0100 Subject: [PATCH 1/3] Added package-lock.json to .gitignore --- .gitignore | 2 ++ examples/package.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f765c79..495564d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ node_modules/* typings/* npm-debug.log +package-lock.json + nbproject/* # lib/ diff --git a/examples/package.json b/examples/package.json index 6968eac..8d8e3b1 100644 --- a/examples/package.json +++ b/examples/package.json @@ -1,7 +1,7 @@ { "name": "angular4-color-picker-example", "version": "1.3.1", - "description": "Example for Angular2 Color Picker", + "description": "Example for Angular2 Color Picker", "scripts": { "start": "npm run lite", "lite": "lite-server" @@ -26,4 +26,4 @@ "concurrently": "^3.0.0", "lite-server": "^2.2.2" } -} \ No newline at end of file +} From e3bb420c176a7f48bacbf3957f0e55f73f815fa2 Mon Sep 17 00:00:00 2001 From: Mark Francis Date: Mon, 30 Jul 2018 08:56:49 +0100 Subject: [PATCH 2/3] Added missing declarations to ColorPickerModule --- src/color-picker.module.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/color-picker.module.ts b/src/color-picker.module.ts index 7c49ec0..089125b 100644 --- a/src/color-picker.module.ts +++ b/src/color-picker.module.ts @@ -2,12 +2,17 @@ import { ModuleWithProviders, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ColorPickerService } from './color-picker.service'; -import { ColorPickerDirective } from './color-picker.directive'; +import { ColorPickerDirective, TextDirective, SliderDirective, DialogComponent } from './color-picker.directive'; @NgModule({ imports: [CommonModule], providers: [ColorPickerService], - declarations: [ColorPickerDirective], + declarations: [ + ColorPickerDirective, + TextDirective, + SliderDirective, + DialogComponent + ], exports: [ColorPickerDirective] }) export class ColorPickerModule { From a473b46147bc06e9b117d9db86915d071b38dfb8 Mon Sep 17 00:00:00 2001 From: Mark Francis Date: Mon, 30 Jul 2018 09:03:05 +0100 Subject: [PATCH 3/3] Fixed member accessibility for DialogComponent --- src/color-picker.directive.ts | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/color-picker.directive.ts b/src/color-picker.directive.ts index 85c682d..034d5aa 100644 --- a/src/color-picker.directive.ts +++ b/src/color-picker.directive.ts @@ -1,7 +1,7 @@ -import {Component, OnChanges, Directive, Input, Output, ViewContainerRef, ElementRef, EventEmitter, OnInit, ViewChild} from '@angular/core'; -import {ColorPickerService} from './color-picker.service'; -import {Rgba, Hsla, Hsva, SliderPosition, SliderDimension} from './classes'; -import {NgModule, Compiler, ReflectiveInjector} from '@angular/core'; +import { Component, OnChanges, Directive, Input, Output, ViewContainerRef, ElementRef, EventEmitter, OnInit, ViewChild } from '@angular/core'; +import { ColorPickerService } from './color-picker.service'; +import { Rgba, Hsla, Hsva, SliderPosition, SliderDimension } from './classes'; +import { NgModule, Compiler, ReflectiveInjector } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; @Directive({ @@ -205,20 +205,20 @@ export class SliderDirective { export class DialogComponent implements OnInit { private hsva: Hsva; - private rgbaText: Rgba; - private hslaText: Hsla; - private hexText: string; + public rgbaText: Rgba; + public hslaText: Hsla; + public hexText: string; private outputColor: string; - private selectedColor: string; - private alphaSliderColor: string; - private hueSliderColor: string; - private slider: SliderPosition; + public selectedColor: string; + public alphaSliderColor: string; + public hueSliderColor: string; + public slider: SliderPosition; private sliderDimMax: SliderDimension; - private format: number; - private show: boolean; - private top: number; - private left: number; - private position: string; + public format: number; + public show: boolean; + public top: number; + public left: number; + public position: string; private directiveInstance: any; private initialColor: string; private directiveElementRef: ElementRef; @@ -230,19 +230,19 @@ export class DialogComponent implements OnInit { private cpPositionOffset: number; private cpOutputFormat: string; private cpPresetLabel: string; - private cpPresetColors: Array; - private cpCancelButton: boolean; + public cpPresetColors: Array; + public cpCancelButton: boolean; private cpCancelButtonClass: string; private cpCancelButtonText: string; - private cpOKButton: boolean; + public cpOKButton: boolean; private cpOKButtonClass: string; private cpOKButtonText: string; - private cpHeight: number; - private cpWidth: number; + public cpHeight: number; + public cpWidth: number; private cpIgnoredElements: any; - private cpDialogDisplay: string; + public cpDialogDisplay: string; private cpSaveClickOutside: boolean; - private cpAlphaChannel: string; + public cpAlphaChannel: string; private dialogArrowSize: number = 10; private dialogArrowOffset: number = 15;