uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to angular2-rc.6

Browse Source
This commit is contained in:
Farkas József
2016-09-01 17:44:51 +02:00
parent 5367346990
commit a1020982b8
20 changed files with 90 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/popover/popover.component.ts
View File

@@ -1,15 +1,7 @@
import {Component, OnInit, Input, Output, EventEmitter, ViewChild} from '@angular/core';
import {NgSwitch, NgSwitchCase} from '@angular/common';
import {KeyAction} from '../../config-serializer/config-items/KeyAction';
import {KeypressTabComponent} from './tab/keypress/keypress-tab.component';
import {LayerTabComponent} from './tab/layer/layer-tab.component';
import {MouseTabComponent} from './tab/mouse/mouse-tab.component';
import {MacroTabComponent} from './tab/macro/macro-tab.component';
import {KeymapTabComponent} from './tab/keymap/keymap-tab.component';
import {NoneTabComponent} from './tab/none/none-tab.component';
import {Tab} from './tab/tab';
import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction';
import {SwitchLayerAction} from '../../config-serializer/config-items/SwitchLayerAction';
@@ -30,18 +22,7 @@ enum TabName {
selector: 'popover',
template: require('./popover.component.html'),
styles: [require('./popover.component.scss')],
host: { 'class': 'popover' },
directives:
[
NgSwitch,
NgSwitchCase,
KeypressTabComponent,
LayerTabComponent,
MouseTabComponent,
MacroTabComponent,
KeymapTabComponent,
NoneTabComponent
]
host: { 'class': 'popover' }
})
export class PopoverComponent implements OnInit {
@Input() defaultKeyAction: KeyAction;

6
src/components/popover/tab/keymap/keymap-tab.component.ts
View File

@@ -3,17 +3,15 @@ import {Component, OnInit, Input} from '@angular/core';
import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
import {Keymap} from '../../../../config-serializer/config-items/Keymap';
import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
import {SvgKeyboardComponent} from '../../../svg/keyboard';
import {Tab} from '../tab';
import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
import {Select2OptionData} from 'ng2-select2/ng2-select2';
@Component({
selector: 'keymap-tab',
template: require('./keymap-tab.component.html'),
styles: [require('./keymap-tab.component.scss')],
directives: [SvgKeyboardComponent, Select2Component]
styles: [require('./keymap-tab.component.scss')]
})
export class KeymapTabComponent implements OnInit, Tab {
@Input() defaultKeyAction: KeyAction;

7
src/components/popover/tab/keypress/keypress-tab.component.ts
View File

@@ -1,19 +1,16 @@
import {Component, OnInit, Input} from '@angular/core';
import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
import {Select2OptionData} from 'ng2-select2/ng2-select2';
import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
import {IconComponent} from '../../widgets/icon';
import {CaptureKeystrokeButtonComponent} from '../../widgets/capture-keystroke';
import {Tab} from '../tab';
@Component({
selector: 'keypress-tab',
template: require('./keypress-tab.component.html'),
styles: [require('./keypress-tab.component.scss')],
directives: [CaptureKeystrokeButtonComponent, IconComponent, Select2Component]
styles: [require('./keypress-tab.component.scss')]
})
export class KeypressTabComponent implements OnInit, Tab {
@Input() defaultKeyAction: KeyAction;

4
src/components/popover/tab/layer/layer-tab.component.ts
View File

@@ -1,5 +1,4 @@
import {Component, OnInit, Input, ViewChild} from '@angular/core';
import {NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
import {LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/SwitchLayerAction';
import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
@@ -11,8 +10,7 @@ import {Tab} from '../tab';
@Component({
selector: 'layer-tab',
template: require('./layer-tab.component.html'),
styles: [require('./layer-tab.component.scss')],
directives: [Select2Component, NgSwitch, NgSwitchCase, NgSwitchDefault]
styles: [require('./layer-tab.component.scss')]
})
export class LayerTabComponent implements OnInit, Tab {
@Input() defaultKeyAction: KeyAction;

5
src/components/popover/tab/macro/macro-item.component.ts
View File

@@ -9,15 +9,12 @@ import {ReleaseModifiersMacroAction} from '../../../../config-serializer/config-
import {ScrollMouseMacroAction} from '../../../../config-serializer/config-items/ScrollMouseMacroAction';
import {TextMacroAction} from '../../../../config-serializer/config-items/TextMacroAction';
import {IconComponent} from '../../widgets/icon';
import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModifiers';
@Component({
selector: 'macro-item',
template: require('./macro-item.component.html'),
styles: [require('./macro-item.component.scss')],
directives: [IconComponent]
styles: [require('./macro-item.component.scss')]
})
export class MacroItemComponent implements OnInit, OnChanges {

6
src/components/popover/tab/macro/macro-tab.component.ts
View File

@@ -6,15 +6,13 @@ import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
import {Tab} from '../tab';
import {MacroItemComponent} from './macro-item.component';
import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
import {Select2OptionData} from 'ng2-select2/ng2-select2';
@Component({
selector: 'macro-tab',
template: require('./macro-tab.component.html'),
styles: [require('./macro-tab.component.scss')],
directives: [MacroItemComponent, Select2Component]
styles: [require('./macro-tab.component.scss')]
})
export class MacroTabComponent implements OnInit, Tab {
@Input() defaultKeyAction: KeyAction;

4
src/components/popover/tab/mouse/mouse-tab.component.ts
View File

@@ -1,5 +1,4 @@
import {Component, OnInit, Input} from '@angular/core';
import {NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
import {Tab} from '../tab';
import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
@@ -8,8 +7,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
@Component({
selector: 'mouse-tab',
template: require('./mouse-tab.component.html'),
styles: [require('./mouse-tab.component.scss')],
directives: [NgSwitch, NgSwitchCase, NgSwitchDefault]
styles: [require('./mouse-tab.component.scss')]
})
export class MouseTabComponent implements OnInit, Tab {
@Input() defaultKeyAction: KeyAction;

4
src/components/popover/widgets/icon/icon.component.ts
View File

@@ -1,11 +1,9 @@
import { Component, OnInit, Input } from '@angular/core';
import { NgSwitch, NgSwitchCase } from '@angular/common';
@Component({
selector: 'icon',
template: require('./icon.component.html'),
styles: [require('./icon.component.scss')],
directives: [NgSwitch, NgSwitchCase]
styles: [require('./icon.component.scss')]
})
export class IconComponent implements OnInit {