fix CI and update lint rules

plantain-00 · Jun 1, 2017 · 396cd39 · 396cd39
1 parent 5c1e378
commit 396cd39
Show file tree

Hide file tree

Showing 8 changed files with 1,267 additions and 845 deletions.
diff --git a/demo/common.ts b/demo/common.ts
@@ -167,9 +167,8 @@ export function setSelectionOfTree(tree: TreeData, selected: boolean) {
     }
 }
 
-/* tslint:disable:ban-types */
+// tslint:disable-next-line:ban-types
 export function setContextMenu(tree: TreeData, component: string | Function) {
-    /* tslint:enable:ban-types */
     tree.contextmenu = component;
     if (tree.children) {
         for (const child of tree.children) {

diff --git a/demo/vue/index.ts b/demo/vue/index.ts
@@ -137,6 +137,5 @@ class App extends Vue {
     }
 }
 
-/* tslint:disable:no-unused-expression */
+// tslint:disable-next-line:no-unused-expression
 new App({ el: "#container" });
-/* tslint:enable:no-unused-expression */
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/angular.ts b/src/angular.ts
@@ -130,7 +130,7 @@ export class TreeComponent {
     }
 
     canDrop(event: DragEvent) {
-        return this.draggable && (event.target as HTMLElement).dataset["path"];
+        return this.draggable && (event.target as HTMLElement).dataset.path;
     }
     ontoggle(eventData: common.EventData) {
         this.toggle.emit(eventData);

diff --git a/src/common.ts b/src/common.ts
@@ -4,9 +4,8 @@ export type TreeData = {
     icon?: string | false;
     state: TreeNodeState;
     children: TreeData[];
-    /* tslint:disable:ban-types */
+    // tslint:disable-next-line:ban-types
     contextmenu?: string | Function;
-    /* tslint:enable:ban-types */
 };
 
 export type TreeNodeState = {
@@ -192,8 +191,8 @@ export function clearDropPositionOfTree(tree: TreeData) {
 
 export function ondrag(pageY: number, dragTarget: HTMLElement | null, dropTarget: HTMLElement | null, data: TreeData[], dropAllowed?: (dropData: DropData) => boolean, next?: () => void) {
     if (dropTarget) {
-        const sourcePath = dragTarget!.dataset["path"]!.split(",").map(s => +s);
-        const dropTargetPathString = dropTarget.dataset["path"];
+        const sourcePath = dragTarget!.dataset.path!.split(",").map(s => +s);
+        const dropTargetPathString = dropTarget.dataset.path;
         if (dropTargetPathString) {
             const targetPath = dropTargetPathString.split(",").map(s => +s);
             const targetData = getNodeFromPath(data, targetPath)!;
@@ -217,7 +216,7 @@ export function ondrag(pageY: number, dragTarget: HTMLElement | null, dropTarget
 }
 
 export function ondragleave(target: HTMLElement, data: TreeData[]) {
-    const pathString = target.dataset["path"];
+    const pathString = target.dataset.path;
     if (pathString) {
         const path = pathString.split(",").map(s => +s);
         const node = getNodeFromPath(data, path);
@@ -228,8 +227,8 @@ export function ondragleave(target: HTMLElement, data: TreeData[]) {
 }
 
 export function ondrop(target: HTMLElement, dragTarget: HTMLElement | null, data: TreeData[], next: (dropData: DropData) => void) {
-    const sourcePath = dragTarget!.dataset["path"]!.split(",").map(s => +s);
-    const targetPathString = target.dataset["path"];
+    const sourcePath = dragTarget!.dataset.path!.split(",").map(s => +s);
+    const targetPathString = target.dataset.path;
     if (targetPathString) {
         const targetPath = targetPathString.split(",").map(s => +s);
         const targetData = getNodeFromPath(data, targetPath)!;

diff --git a/src/react.tsx b/src/react.tsx
@@ -216,7 +216,7 @@ export class Tree extends React.PureComponent<{
     }
 
     canDrop(event: React.DragEvent<HTMLElement>) {
-        return this.props.draggable && (event.target as HTMLElement).dataset["path"];
+        return this.props.draggable && (event.target as HTMLElement).dataset.path;
     }
     ontoggle(eventData: common.EventData) {
         if (this.props.toggle) {

diff --git a/src/vue.ts b/src/vue.ts
@@ -136,7 +136,7 @@ export class Tree extends Vue {
     }
 
     canDrop(event: DragEvent) {
-        return this.draggable && (event.target as HTMLElement).dataset["path"];
+        return this.draggable && (event.target as HTMLElement).dataset.path;
     }
     ontoggle(eventData: common.EventData) {
         this.$emit("toggle", eventData);

diff --git a/tslint.json b/tslint.json
@@ -1,28 +1,13 @@
 {
     "extends": "tslint:latest",
     "rules": {
-        "forin": false,
-        "interface-name": [
-            false
-        ],
         "max-line-length": [
             false
         ],
-        "no-var-requires": false,
-        "no-console": [
-            false
-        ],
-        "no-string-literal": false,
-        "no-reference": false,
         "ordered-imports": [
             false
         ],
         "object-literal-sort-keys": false,
-        "variable-name": [
-            true,
-            "ban-keywords"
-        ],
-        "no-bitwise": false,
         "member-access": false,
         "arrow-parens": false,
         "array-type": [