Skip to content

Commit

Permalink
Merge 5590554 into 258e65b
Browse files Browse the repository at this point in the history
  • Loading branch information
FrancescoBorzi committed Oct 4, 2019
2 parents 258e65b + 5590554 commit f77d422
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
@@ -1,17 +1,17 @@
import { Component } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { MysqlError } from 'mysql';

import { GameobjectHandlerService } from '../../../../services/handlers/gameobject-handler.service';
import { GameobjectLootTemplate } from '../../../../types/gameobject-loot-template.type';
import { GameobjectLootTemplateService } from '../../../../services/editors/gameobject/gameobject-loot-template.service';
import { LootTemplateComponent } from '../../shared/loot-template/loot-template.component';
import { MysqlError } from 'mysql';

@Component({
selector: 'app-gameobject-loot-template',
templateUrl: './gameobject-loot-template.component.html',
styleUrls: ['./gameobject-loot-template.component.scss']
})
export class GameobjectLootTemplateComponent extends LootTemplateComponent<GameobjectLootTemplate> {
export class GameobjectLootTemplateComponent extends LootTemplateComponent<GameobjectLootTemplate> implements OnInit {

private _type: number;
get type(): number { return this._type; }
Expand Down
9 changes: 4 additions & 5 deletions tslint.json
Expand Up @@ -72,7 +72,6 @@
"no-trailing-whitespace": true,
"no-unnecessary-initializer": true,
"no-unused-expression": true,
"no-use-before-declare": true,
"no-var-keyword": true,
"object-literal-sort-keys": false,
"one-line": [
Expand Down Expand Up @@ -123,12 +122,12 @@
"kebab-case"
],
"no-output-on-prefix": true,
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
"no-inputs-metadata-property": true,
"no-outputs-metadata-property": true,
"no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": true,
"use-life-cycle-interface": true,
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"component-class-suffix": true,
"directive-class-suffix": true
Expand Down

0 comments on commit f77d422

Please sign in to comment.