update v0.2.6

drawcall · May 11, 2017 · d298152 · d298152
1 parent 5e62bd8
commit d298152
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rxemitter",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "rxemitter = rxjs + eventbus",
   "main": "index.js",
   "scripts": {

diff --git a/src/rxemitter.ts b/src/rxemitter.ts
@@ -123,5 +123,5 @@ export interface ICacheObj<T> {
 
 function guid(): string {
     return 'xxxxxx-xxxx-4xxx-yxxx-xxxxxx'.
-        replace(/[xy]/g, c => { var r = Math.random() * 16 | 0, v = c == 'x' ? r : r & 0x3 | 0x8; return v.toString(16); });
+        replace(/[xy]/g, c => { let r = Math.random() * 16 | 0, v = c == 'x' ? r : r & 0x3 | 0x8; return v.toString(16); });
 }
diff --git a/src/rxsubscribe.ts b/src/rxsubscribe.ts
@@ -15,10 +15,10 @@ export function RxSubscribe(a: string | Object, b: boolean | string = false, c:
         }
 
         if (eventObj.unsubscribe === true ||
-            eventObj.unsubscribe == "unsubscribe" ||
-            eventObj.unsubscribe == "destroy" ||
-            eventObj.unsubscribe == "off" ||
-            eventObj.unsubscribe == "remove") {
+            eventObj.unsubscribe == 'unsubscribe' ||
+            eventObj.unsubscribe == 'destroy' ||
+            eventObj.unsubscribe == 'off' ||
+            eventObj.unsubscribe == 'remove') {
 
             let oldNgOnDestroy = target.ngOnDestroy;
 

diff --git a/tslint.json b/tslint.json
@@ -2,40 +2,51 @@
   "rules": {
     "curly": true,
     "eofline": false,
-    "align": [true, "parameters"],
+    "align": [
+      true,
+      "parameters"
+    ],
     "class-name": true,
-    "indent": [true, "spaces"],
-    "max-line-length": [true, 150],
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "max-line-length": [
+      true,
+      150
+    ],
     "no-consecutive-blank-lines": true,
     "no-trailing-whitespace": true,
     "no-duplicate-variable": true,
     "no-var-keyword": true,
+    "ignore-same-line": true,
     "no-empty": true,
     "no-unused-expression": true,
     "no-unused-variable": true,
     "no-use-before-declare": true,
     "no-var-requires": true,
     "no-require-imports": true,
-    "one-line": [true,
+    "one-line": [
+      true,
       "check-else",
-      "check-whitespace",
-      "check-open-brace"],
-    "quotemark": [true,
+      "check-open-brace"
+    ],
+    "quotemark": [
+      true,
       "single",
-      "avoid-escape"],
-    "semicolon": [true, "always"],
-    "typedef-whitespace": [true, {
-      "call-signature": "nospace",
-      "index-signature": "nospace",
-      "parameter": "nospace",
-      "property-declaration": "nospace",
-      "variable-declaration": "nospace"
-    }],
-    "whitespace": [true,
+      "avoid-escape"
+    ],
+    "semicolon": [
+      true,
+      "always"
+    ],
+    "whitespace": [
+      true,
       "check-branch",
       "check-decl",
       "check-operator",
       "check-separator",
-      "check-type"]
+      "check-type"
+    ]
   }
 }