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

Update to angular2-rc.2

Browse Source
This commit is contained in:
József Farkas
2016-06-21 20:02:23 +02:00
parent 7748667065
commit 4a1829e431
7 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {NgSwitch, NgSwitchWhen, NgSwitchDefault } from '@angular/common';
import {NgSwitch, NgSwitchCase, NgSwitchDefault } from '@angular/common';
import { LayerName, SwitchLayerAction } from '../../../../config-serializer/config-items/SwitchLayerAction';
import { KeyActionSaver } from '../key-action-saver';
@@ -17,12 +17,12 @@ import {OptionData} from 'ng2-select2/dist/select2';
<span>the</span>
<select2 [data]="layerData" (valueChanged)="layerChanged($event)"></select2>
<span [ngSwitch]="toggle">
<template ngSwitchWhen="true">layer by pressing this key.</template>
<template ngSwitchCase="true">layer by pressing this key.</template>
<template ngSwitchDefault="false">layer by holding this key.</template>
</span>
`,
styles: [require('./layer-tab.component.scss')],
directives: [SELECT2_DIRECTIVES, NgSwitch, NgSwitchWhen, NgSwitchDefault]
directives: [SELECT2_DIRECTIVES, NgSwitch, NgSwitchCase, NgSwitchDefault]
})
export class LayerTabComponent implements OnInit, KeyActionSaver {
private toggle: boolean;

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

@@ -1,5 +1,4 @@
import { Component, OnInit, OnChanges, Input } from '@angular/core';
import { NgSwitch, NgSwitchWhen} from '@angular/common';
import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
import {DelayMacroAction} from '../../../../config-serializer/config-items/DelayMacroAction';
@@ -32,7 +31,7 @@ import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModif
<icon *ngIf="editable" name="pencil"></icon>
`,
styles: [require('./macro-item.component.scss')],
directives: [NgSwitch, NgSwitchWhen, IconComponent]
directives: [IconComponent]
})
export class MacroItemComponent implements OnInit, OnChanges {

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

@@ -1,5 +1,5 @@
import { Component, OnInit, Renderer} from '@angular/core';
import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from '@angular/common';
import {NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
import { KeyActionSaver } from '../key-action-saver';
import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction';
@@ -18,7 +18,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
</ul>
</div>
<div class="details col-sm-8" [ngSwitch]="selectedIndex">
<div *ngSwitchWhen="0" class="mouse__config mouse__config--move text-center">
<div *ngSwitchCase="0" class="mouse__config mouse__config--move text-center">
<div class="row">
<button type="button" class="btn btn-default btn-lg"
(click)="onMouseActionClick($event.target, MouseActionParam.moveUp)">
@@ -45,7 +45,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
</button>
</div>
</div>
<div *ngSwitchWhen="1" class="mouse__config mouse__config--scroll text-center">
<div *ngSwitchCase="1" class="mouse__config mouse__config--scroll text-center">
<div class="row">
<button type="button" class="btn btn-default btn-lg"
(click)="onMouseActionClick($event.target, MouseActionParam.scrollUp)">
@@ -72,7 +72,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
</button>
</div>
</div>
<div *ngSwitchWhen="2" class="mouse__config mouse__config--click">
<div *ngSwitchCase="2" class="mouse__config mouse__config--click">
<div class="btn-group col-xs-12" role="group">
<button type="button" class="btn btn-default col-xs-4"
(click)="onMouseActionClick($event.target, MouseActionParam.leftClick)">Left</button>
@@ -82,7 +82,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
(click)="onMouseActionClick($event.target, MouseActionParam.rightClick)">Right</button>
</div>
</div>
<div *ngSwitchWhen="3" class="mouse__config mouse__config--speed text-center">
<div *ngSwitchCase="3" class="mouse__config mouse__config--speed text-center">
<div class="help-text--mouse-speed text-left">
<p>Press this key along with mouse movement/scrolling to accelerate/decelerate the speed of the action.</p>
<p>You can set the multiplier in <a href="#" title="link to the setting">link to setting</a>.</p>
@@ -99,7 +99,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
</div>
`,
styles: [require('./mouse-tab.component.scss')],
directives: [NgSwitch, NgSwitchWhen, NgSwitchDefault]
directives: [NgSwitch, NgSwitchCase, NgSwitchDefault]
})
export class MouseTabComponent implements OnInit, KeyActionSaver {
private mouseActionParam: MouseActionParam;