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

Update to webpack 2.x

Browse Source
This commit is contained in:
Farkas J??zsef
2017-02-04 20:37:05 +01:00
committed by József Farkas
parent 908c7e1e8c
commit 67c8b12eac
8 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@ export class KeypressTabComponent extends Tab implements OnChanges {
id: '0',
text: 'None'
}];
this.scanCodeGroups = this.scanCodeGroups.concat(require('json!./scancodes.json'));
this.longPressGroups = require('json!./longPress.json');
this.scanCodeGroups = this.scanCodeGroups.concat(require('json-loader!./scancodes.json'));
this.longPressGroups = require('json-loader!./longPress.json');
this.leftModifierSelects = Array(this.leftModifiers.length).fill(false);
this.rightModifierSelects = Array(this.rightModifiers.length).fill(false);
this.scanCode = 0;

2
shared/src/components/svg/keyboard/svg-keyboard.component.ts
View File

@@ -69,7 +69,7 @@ export class SvgKeyboardComponent implements OnInit {
}
private getBaseLayer(): any {
return require('xml!../../../../../images/base-layer.svg').svg;
return require('xml-loader!../../../../../images/base-layer.svg').svg;
}
}

4
shared/src/store/storage/index.ts
View File

@@ -54,8 +54,8 @@ export class DataStorage {
initUHKJson() {
this.defaultUserConfiguration = new UserConfiguration()
.fromJsonObject(require('json!../../config-serializer/user-config.json'));
this.uhkPresets = (<any[]>require('json!../../config-serializer/preset-keymaps.json'))
.fromJsonObject(require('json-loader!../../config-serializer/user-config.json'));
this.uhkPresets = (<any[]>require('json-loader!../../config-serializer/preset-keymaps.json'))
.map(keymap => new Keymap().fromJsonObject(keymap));
}