From 771539dae36c07b681cccd1f124c8bd783865a3c Mon Sep 17 00:00:00 2001
From: LosslessBot <bot@lossless.com>
Date: Wed, 4 May 2016 03:44:54 +0200
Subject: [PATCH] update structure for better ES6 support

---
 ts/index.ts                        | 10 +----
 ts/taskbuffer.classes.task.ts      | 52 +++++++++++++++++++++++++
 ts/taskbuffer.classes.taskchain.ts | 12 ++++++
 ts/taskbuffer.classes.ts           | 62 +-----------------------------
 ts/taskbuffer.promisechain.ts      |  1 -
 ts/taskbuffer.task.ts              |  7 ----
 ts/taskbuffer.taskchain.ts         |  7 ----
 7 files changed, 67 insertions(+), 84 deletions(-)
 create mode 100644 ts/taskbuffer.classes.task.ts
 create mode 100644 ts/taskbuffer.classes.taskchain.ts
 delete mode 100644 ts/taskbuffer.promisechain.ts
 delete mode 100644 ts/taskbuffer.task.ts
 delete mode 100644 ts/taskbuffer.taskchain.ts

diff --git a/ts/index.ts b/ts/index.ts
index 8b02527..1bfee17 100644
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -1,10 +1,2 @@
 /// <reference path="./typings/main.d.ts" />
-import plugins = require("./taskbuffer.plugins");
-import task = require("./taskbuffer.task");
-import taskchain = require("./taskbuffer.taskchain");
-
-var taskbuffer = {
-    task: task
-};
-
-export = taskbuffer;
\ No newline at end of file
+export * from "./taskbuffer.classes"
\ No newline at end of file
diff --git a/ts/taskbuffer.classes.task.ts b/ts/taskbuffer.classes.task.ts
new file mode 100644
index 0000000..6bb38df
--- /dev/null
+++ b/ts/taskbuffer.classes.task.ts
@@ -0,0 +1,52 @@
+/// <reference path="./typings/main.d.ts" />
+import * as plugins from "./taskbuffer.plugins"
+import * as helpers from "./taskbuffer.classes.helpers"
+
+export class Task {
+    task:any;
+    idle:boolean;
+    running:boolean;
+    buffered:boolean;
+    private _counterBufferRelative;
+    private _counterTriggerAbsolute;
+    private _state:string;
+    preTask:Task;
+    afterTask:Task;
+
+    constructor(taskArg,optionsArg:{preTask?:Task,afterTask?:Task, buffered?:boolean} = {}){
+        var options = optionsArg;
+        this.task = taskArg;
+        this.preTask = options.preTask;
+        this.afterTask = options.afterTask;
+        this.idle = true;
+        this.running = false;
+        if (typeof options.buffered === "boolean"){
+            this.buffered = options.buffered;
+        } else {
+            this.buffered = false;
+        }
+    }
+    trigger(){
+        helpers.runTask(this.preTask)
+            .then(function(){
+
+            })
+            .then(function(){
+
+            })
+    };
+    triggerBuffered(){
+        var done = plugins.Q.defer();
+    }
+
+    get state():string {
+        return this._state;
+    }
+    set state(stateArg:string){
+        if (stateArg == "locked"){
+            this._state = "locked";
+        } else {
+            plugins.beautylog.error("state type" );
+        }
+    }
+}
\ No newline at end of file
diff --git a/ts/taskbuffer.classes.taskchain.ts b/ts/taskbuffer.classes.taskchain.ts
new file mode 100644
index 0000000..9e7a84d
--- /dev/null
+++ b/ts/taskbuffer.classes.taskchain.ts
@@ -0,0 +1,12 @@
+
+import helpers = require("./taskbuffer.classes.helpers");
+import * as classes from "./taskbuffer.classes"
+
+
+export class Taskchain extends classes.Task {
+    constructor(taskArrayArg:classes.Task[]){
+        super({
+            task: function(){}
+        });
+    }
+}
\ No newline at end of file
diff --git a/ts/taskbuffer.classes.ts b/ts/taskbuffer.classes.ts
index c915510..d3c666e 100644
--- a/ts/taskbuffer.classes.ts
+++ b/ts/taskbuffer.classes.ts
@@ -1,60 +1,2 @@
-/// <reference path="./typings/main.d.ts" />
-import plugins = require("./taskbuffer.plugins");
-import helpers = require("./taskbuffer.classes.helpers");
-export class Task {
-    task:any;
-    idle:boolean;
-    running:boolean;
-    buffered:boolean;
-    private _counterBufferRelative;
-    private _counterTriggerAbsolute;
-    private _state:string;
-    preTask:Task;
-    afterTask:Task;
-
-    constructor(taskArg,optionsArg:{preTask?:Task,afterTask?:Task, buffered?:boolean} = {}){
-        var options = optionsArg;
-        this.task = taskArg;
-        this.preTask = options.preTask;
-        this.afterTask = options.afterTask;
-        this.idle = true;
-        this.running = false;
-        if (typeof options.buffered === "boolean"){
-            this.buffered = options.buffered;
-        } else {
-            this.buffered = false;
-        }
-    }
-    trigger(){
-        helpers.runTask(this.preTask)
-            .then(function(){
-
-            })
-            .then(function(){
-
-            })
-    };
-    triggerBuffered(){
-        var done = plugins.Q.defer();
-    }
-
-    get state():string {
-        return this._state;
-    }
-    set state(stateArg:string){
-        if (stateArg == "locked"){
-            this._state = "locked";
-        } else {
-            plugins.beautylog.error("state type" );
-        }
-    }
-}
-
-
-export class TaskChain extends Task {
-    constructor(taskArrayArg:Task[]){
-        super({
-            task: function(){}
-        });
-    }
-}
\ No newline at end of file
+export * from "./taskbuffer.classes.task"
+export * from "./taskbuffer.classes.taskchain"
\ No newline at end of file
diff --git a/ts/taskbuffer.promisechain.ts b/ts/taskbuffer.promisechain.ts
deleted file mode 100644
index 17f6a8b..0000000
--- a/ts/taskbuffer.promisechain.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
\ No newline at end of file
diff --git a/ts/taskbuffer.task.ts b/ts/taskbuffer.task.ts
deleted file mode 100644
index b3b3c53..0000000
--- a/ts/taskbuffer.task.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-import classes = require("./taskbuffer.classes");
-var task = function(taskArg,options?){
-    var task = taskArg
-    return new classes.Task(task,options);
-};
-export = task;
\ No newline at end of file
diff --git a/ts/taskbuffer.taskchain.ts b/ts/taskbuffer.taskchain.ts
deleted file mode 100644
index 9447b64..0000000
--- a/ts/taskbuffer.taskchain.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-import classes = require("./taskbuffer.classes");
-var taskChain = function(taskArrayArg:classes.Task[]){
-
-    return new classes.TaskChain(taskArrayArg);
-};
-export = taskChain;