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

10
package.json
View File

@@ -26,11 +26,11 @@
"yargs": "^4.7.1" "yargs": "^4.7.1"
}, },
"dependencies": { "dependencies": {
"@angular/common": "2.0.0-rc.1", "@angular/common": "2.0.0-rc.2",
"@angular/compiler": "2.0.0-rc.1", "@angular/compiler": "2.0.0-rc.2",
"@angular/core": "2.0.0-rc.1", "@angular/core": "2.0.0-rc.2",
"@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser": "2.0.0-rc.2",
"@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.2",
"bootstrap": "^3.3.6", "bootstrap": "^3.3.6",
"browser-stdout": "^1.3.0", "browser-stdout": "^1.3.0",
"es6-shim": "^0.35.1", "es6-shim": "^0.35.1",

14
src/components/keys/svg-keyboard-key.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnInit, Input, OnChanges, SimpleChange } from '@angular/core'; import { Component, OnInit, Input, OnChanges, SimpleChange } from '@angular/core';
import {NgSwitch, NgSwitchWhen} from '@angular/common'; import {NgSwitch, NgSwitchCase} from '@angular/common';
import {KeyAction} from '../../../config-serializer/config-items/KeyAction'; import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
import {KeystrokeAction} from '../../../config-serializer/config-items/KeystrokeAction'; import {KeystrokeAction} from '../../../config-serializer/config-items/KeystrokeAction';
@@ -37,28 +37,28 @@ enum LabelTypes {
[attr.font-family]="'Helvetica'" [attr.font-family]="'Helvetica'"
[attr.fill]="'white'" [attr.fill]="'white'"
style="dominant-baseline: central"> style="dominant-baseline: central">
<svg:g svg-one-line-text-key *ngSwitchWhen="enumLabelTypes.OneLineText" <svg:g svg-one-line-text-key *ngSwitchCase="enumLabelTypes.OneLineText"
[height]="height" [height]="height"
[width]="width" [width]="width"
[text]="labelSource"> [text]="labelSource">
</svg:g> </svg:g>
<svg:g svg-two-line-text-key *ngSwitchWhen="enumLabelTypes.TwoLineText" <svg:g svg-two-line-text-key *ngSwitchCase="enumLabelTypes.TwoLineText"
[height]="height" [height]="height"
[width]="width" [width]="width"
[texts]="labelSource"> [texts]="labelSource">
</svg:g> </svg:g>
<svg:g svg-text-icon-key *ngSwitchWhen="enumLabelTypes.TextIcon" <svg:g svg-text-icon-key *ngSwitchCase="enumLabelTypes.TextIcon"
[height]="height" [height]="height"
[width]="width" [width]="width"
[text]="labelSource.text" [text]="labelSource.text"
[icon]="labelSource.icon"> [icon]="labelSource.icon">
</svg:g> </svg:g>
<svg:g svg-single-icon-key *ngSwitchWhen="enumLabelTypes.SingleIcon" <svg:g svg-single-icon-key *ngSwitchCase="enumLabelTypes.SingleIcon"
[height]="height" [height]="height"
[width]="width" [width]="width"
[icon]="labelSource"> [icon]="labelSource">
</svg:g> </svg:g>
<svg:g svg-switch-keymap-key *ngSwitchWhen="enumLabelTypes.SwitchKeymap" <svg:g svg-switch-keymap-key *ngSwitchCase="enumLabelTypes.SwitchKeymap"
[height]="height" [height]="height"
[width]="width" [width]="width"
[abbreviation]="labelSource"> [abbreviation]="labelSource">
@@ -68,7 +68,7 @@ enum LabelTypes {
directives: directives:
[ [
NgSwitch, NgSwitch,
NgSwitchWhen, NgSwitchCase,
SvgOneLineTextKeyComponent, SvgOneLineTextKeyComponent,
SvgTwoLineTextKeyComponent, SvgTwoLineTextKeyComponent,
SvgSingleIconKeyComponent, SvgSingleIconKeyComponent,

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

@@ -12,7 +12,7 @@ import {
ChangeDetectorRef ChangeDetectorRef
} from '@angular/core'; } from '@angular/core';
import {NgSwitch, NgSwitchWhen} from '@angular/common'; import {NgSwitch, NgSwitchCase} from '@angular/common';
import {KeyAction} from '../../../config-serializer/config-items/KeyAction'; import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
@@ -74,12 +74,12 @@ import {KeyActionSaver} from './key-action-saver';
</div> </div>
</div> </div>
<div class="row" [ngSwitch]="activeListItemIndex"> <div class="row" [ngSwitch]="activeListItemIndex">
<keypress-tab #tab *ngSwitchWhen="0" class="popover-content"></keypress-tab> <keypress-tab #tab *ngSwitchCase="0" class="popover-content"></keypress-tab>
<layer-tab #tab *ngSwitchWhen="1" class="popover-content"></layer-tab> <layer-tab #tab *ngSwitchCase="1" class="popover-content"></layer-tab>
<mouse-tab #tab *ngSwitchWhen="2" class="popover-content"></mouse-tab> <mouse-tab #tab *ngSwitchCase="2" class="popover-content"></mouse-tab>
<macro-tab #tab *ngSwitchWhen="3" class="popover-content"></macro-tab> <macro-tab #tab *ngSwitchCase="3" class="popover-content"></macro-tab>
<keymap-tab #tab *ngSwitchWhen="4" class="popover-content"></keymap-tab> <keymap-tab #tab *ngSwitchCase="4" class="popover-content"></keymap-tab>
<none-tab #tab *ngSwitchWhen="5" class="popover-content"></none-tab> <none-tab #tab *ngSwitchCase="5" class="popover-content"></none-tab>
</div> </div>
<div class="row"> <div class="row">
<div class="popover-action"> <div class="popover-action">
@@ -94,7 +94,7 @@ import {KeyActionSaver} from './key-action-saver';
directives: directives:
[ [
NgSwitch, NgSwitch,
NgSwitchWhen, NgSwitchCase,
KeypressTabComponent, KeypressTabComponent,
LayerTabComponent, LayerTabComponent,
MouseTabComponent, MouseTabComponent,

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

@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; 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 { LayerName, SwitchLayerAction } from '../../../../config-serializer/config-items/SwitchLayerAction';
import { KeyActionSaver } from '../key-action-saver'; import { KeyActionSaver } from '../key-action-saver';
@@ -17,12 +17,12 @@ import {OptionData} from 'ng2-select2/dist/select2';
<span>the</span> <span>the</span>
<select2 [data]="layerData" (valueChanged)="layerChanged($event)"></select2> <select2 [data]="layerData" (valueChanged)="layerChanged($event)"></select2>
<span [ngSwitch]="toggle"> <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> <template ngSwitchDefault="false">layer by holding this key.</template>
</span> </span>
`, `,
styles: [require('./layer-tab.component.scss')], styles: [require('./layer-tab.component.scss')],
directives: [SELECT2_DIRECTIVES, NgSwitch, NgSwitchWhen, NgSwitchDefault] directives: [SELECT2_DIRECTIVES, NgSwitch, NgSwitchCase, NgSwitchDefault]
}) })
export class LayerTabComponent implements OnInit, KeyActionSaver { export class LayerTabComponent implements OnInit, KeyActionSaver {
private toggle: boolean; 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 { Component, OnInit, OnChanges, Input } from '@angular/core';
import { NgSwitch, NgSwitchWhen} from '@angular/common';
import {MacroAction} from '../../../../config-serializer/config-items/MacroAction'; import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
import {DelayMacroAction} from '../../../../config-serializer/config-items/DelayMacroAction'; 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> <icon *ngIf="editable" name="pencil"></icon>
`, `,
styles: [require('./macro-item.component.scss')], styles: [require('./macro-item.component.scss')],
directives: [NgSwitch, NgSwitchWhen, IconComponent] directives: [IconComponent]
}) })
export class MacroItemComponent implements OnInit, OnChanges { 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 { 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 { KeyActionSaver } from '../key-action-saver';
import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction'; import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction';
@@ -18,7 +18,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
</ul> </ul>
</div> </div>
<div class="details col-sm-8" [ngSwitch]="selectedIndex"> <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"> <div class="row">
<button type="button" class="btn btn-default btn-lg" <button type="button" class="btn btn-default btn-lg"
(click)="onMouseActionClick($event.target, MouseActionParam.moveUp)"> (click)="onMouseActionClick($event.target, MouseActionParam.moveUp)">
@@ -45,7 +45,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
</button> </button>
</div> </div>
</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"> <div class="row">
<button type="button" class="btn btn-default btn-lg" <button type="button" class="btn btn-default btn-lg"
(click)="onMouseActionClick($event.target, MouseActionParam.scrollUp)"> (click)="onMouseActionClick($event.target, MouseActionParam.scrollUp)">
@@ -72,7 +72,7 @@ import {MouseAction, MouseActionParam} from '../../../../config-serializer/confi
</button> </button>
</div> </div>
</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"> <div class="btn-group col-xs-12" role="group">
<button type="button" class="btn btn-default col-xs-4" <button type="button" class="btn btn-default col-xs-4"
(click)="onMouseActionClick($event.target, MouseActionParam.leftClick)">Left</button> (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> (click)="onMouseActionClick($event.target, MouseActionParam.rightClick)">Right</button>
</div> </div>
</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"> <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>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> <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> </div>
`, `,
styles: [require('./mouse-tab.component.scss')], styles: [require('./mouse-tab.component.scss')],
directives: [NgSwitch, NgSwitchWhen, NgSwitchDefault] directives: [NgSwitch, NgSwitchCase, NgSwitchDefault]
}) })
export class MouseTabComponent implements OnInit, KeyActionSaver { export class MouseTabComponent implements OnInit, KeyActionSaver {
private mouseActionParam: MouseActionParam; private mouseActionParam: MouseActionParam;

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

@@ -1,5 +1,5 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
import { NgSwitch, NgSwitchWhen } from '@angular/common'; import { NgSwitch, NgSwitchCase } from '@angular/common';
@Component({ @Component({
moduleId: module.id, moduleId: module.id,
@@ -7,16 +7,16 @@ import { NgSwitch, NgSwitchWhen } from '@angular/common';
template: template:
` `
<div [ngSwitch]="name"> <div [ngSwitch]="name">
<span *ngSwitchWhen="'option-vertical'" class="glyphicon glyphicon-option-vertical" aria-hidden="true"></span> <span *ngSwitchCase="'option-vertical'" class="glyphicon glyphicon-option-vertical" aria-hidden="true"></span>
<i *ngSwitchWhen="'square'" class="fa fa-square"></i> <i *ngSwitchCase="'square'" class="fa fa-square"></i>
<i *ngSwitchWhen="'mouse-pointer'" class="fa fa-mouse-pointer"></i> <i *ngSwitchCase="'mouse-pointer'" class="fa fa-mouse-pointer"></i>
<i *ngSwitchWhen="'clock'" class="fa fa-clock-o"></i> <i *ngSwitchCase="'clock'" class="fa fa-clock-o"></i>
<i *ngSwitchWhen="'trash'" class="glyphicon glyphicon-trash action--trash"></i> <i *ngSwitchCase="'trash'" class="glyphicon glyphicon-trash action--trash"></i>
<i *ngSwitchWhen="'pencil'" class="glyphicon glyphicon-pencil action--edit"></i> <i *ngSwitchCase="'pencil'" class="glyphicon glyphicon-pencil action--edit"></i>
<i *ngSwitchWhen="'question-circle'" class ="fa fa-question-circle"></i> <i *ngSwitchCase="'question-circle'" class ="fa fa-question-circle"></i>
</div> </div>
`, `,
directives: [NgSwitch, NgSwitchWhen], directives: [NgSwitch, NgSwitchCase],
styles: [require('./icon.component.scss')] styles: [require('./icon.component.scss')]
}) })
export class IconComponent implements OnInit { export class IconComponent implements OnInit {