Skip to content
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

Fixed member accessibility and missing declarations #6

Open
wants to merge 3 commits 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ node_modules/*
typings/*
npm-debug.log

package-lock.json

nbproject/*

# lib/
Expand Down
4 changes: 2 additions & 2 deletions examples/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -26,4 +26,4 @@
"concurrently": "^3.0.0",
"lite-server": "^2.2.2"
}
}
}
46 changes: 23 additions & 23 deletions src/color-picker.directive.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand Down Expand Up @@ -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;
Expand All @@ -230,19 +230,19 @@ export class DialogComponent implements OnInit {
private cpPositionOffset: number;
private cpOutputFormat: string;
private cpPresetLabel: string;
private cpPresetColors: Array<string>;
private cpCancelButton: boolean;
public cpPresetColors: Array<string>;
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;
Expand Down
9 changes: 7 additions & 2 deletions src/color-picker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down