javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-24 23:01:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(components): fix merge conflicts that didn't show up in search

Browse Source
This commit is contained in:
Brandy Carney
2017-11-02 11:04:10 -04:00
parent 0e73723e57
commit d6e60fde3c
3 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/src/components/input/input-base.tsx
View File

@ -30,9 +30,6 @@ export interface InputBaseComponent {
inputChanged: (ev: any) => void; inputChanged: (ev: any) => void;
inputFocused: (ev: any) => void; inputFocused: (ev: any) => void;
inputKeydown: (ev: any) => void; inputKeydown: (ev: any) => void;
disabledChanged: (ev: any) => void;
valueChanged: (ev: any) => void;
} }
export interface InputComponent extends InputBaseComponent { export interface InputComponent extends InputBaseComponent {
@ -50,8 +47,6 @@ export interface InputComponent extends InputBaseComponent {
step: string; step: string;
size: number; size: number;
type: string; type: string;
checkedChanged: (ev: any) => void;
} }
export interface TextareaComponent extends InputBaseComponent { export interface TextareaComponent extends InputBaseComponent {

8
packages/core/src/components/menu/menu.tsx
View File

@ -81,14 +81,8 @@ export class Menu {
*/ */
@Prop() side: Side = 'start'; @Prop() side: Side = 'start';
@PropDidChange('side') @PropDidChange('side')
<<<<<<< HEAD
sideChanged() {
this.isRightSide = isRightSide(this.side);
=======
protected sideChanged() { protected sideChanged() {
const isRTL = false; this.isRightSide = isRightSide(this.side);
this.isRightSide = isRightSide(this.side, isRTL);
>>>>>>> style(components): rename variables and methods for consistency
} }
/** /**

34
packages/core/src/components/toggle/toggle.tsx
View File

@ -24,9 +24,7 @@ export class Toggle implements BooleanInputComponent {
hasFocus: boolean = false; hasFocus: boolean = false;
<<<<<<< HEAD
@State() activated: boolean = false; @State() activated: boolean = false;
=======
/** /**
* @output {Event} Emitted when the value property has changed. * @output {Event} Emitted when the value property has changed.
*/ */
@ -41,7 +39,6 @@ export class Toggle implements BooleanInputComponent {
* @output {Event} Emitted when the toggle has focus. * @output {Event} Emitted when the toggle has focus.
*/ */
@Event() ionFocus: EventEmitter; @Event() ionFocus: EventEmitter;
>>>>>>> style(components): rename variables and methods for consistency
/** /**
* @output {Event} Emitted when the toggle loses focus. * @output {Event} Emitted when the toggle loses focus.
@ -52,45 +49,28 @@ export class Toggle implements BooleanInputComponent {
* @input {boolean} If true, the toggle is selected. Defaults to `false`. * @input {boolean} If true, the toggle is selected. Defaults to `false`.
*/ */
@Prop({ mutable: true }) checked: boolean = false; @Prop({ mutable: true }) checked: boolean = false;
<<<<<<< HEAD
=======
/*
* @input {boolean} If true, the user cannot interact with the toggle. Default false.
*/
@Prop({ mutable: true }) disabled: boolean = false;
/**
* @input {string} the value of the toggle.
*/
@Prop({ mutable: true }) value: string;
protected ionViewWillLoad() {
this.emitStyle();
}
>>>>>>> style(components): rename variables and methods for consistency
@PropDidChange('checked') @PropDidChange('checked')
protected checkedChanged(val: boolean) { protected checkedChanged(val: boolean) {
this.ionChange.emit({ checked: val }); this.ionChange.emit({ checked: val });
this.emitStyle(); this.emitStyle();
} }
/*
* @input {boolean} If true, the user cannot interact with the toggle. Default false.
*/
@Prop({ mutable: true }) disabled: boolean = false; @Prop({ mutable: true }) disabled: boolean = false;
@PropDidChange('disabled') @PropDidChange('disabled')
protected disabledChanged() { protected disabledChanged() {
this.emitStyle(); this.emitStyle();
} }
// TODO: value is broken /**
* @input {string} the value of the toggle.
*/
@Prop({ mutable: true }) value: string; @Prop({ mutable: true }) value: string;
@Event() ionChange: EventEmitter;
@Event() ionStyle: EventEmitter;
@Event() ionFocus: EventEmitter;
@Event() ionBlur: EventEmitter;
constructor() { constructor() {
this.gestureConfig = { this.gestureConfig = {
'onStart': this.onDragStart.bind(this), 'onStart': this.onDragStart.bind(this),