Merge branch 'dev'

latel · latel · commit b644bb6de5fd · 2016-11-26T22:16:38.000+08:00
diff --git a/dist/logline.js b/dist/logline.js
@@ -168,7 +168,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	                return this;
 	            }
 
-	            Logline.database(database);
+	            Logline.database(database || Logline._database);
 	            Logline._initProtocol(protocol);
 	            return this;
 	        }
diff --git a/dist/logline.min.js b/dist/logline.min.js
diff --git a/src/configure b/src/configure
@@ -63,7 +63,7 @@ class Logline {
             return this;
         }
 
-        Logline.database(database);
+        Logline.database(database || Logline._database);
         Logline._initProtocol(protocol);
         return this;
     }
diff --git a/src/logline.js b/src/logline.js
@@ -63,7 +63,7 @@ class Logline {
             return this;
         }
 
-        Logline.database(database);
+        Logline.database(database || Logline._database);
         Logline._initProtocol(protocol);
         return this;
     }

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ return /******/ (function(modules) { // webpackBootstrap`
`168`	`168`	`return this;`
`169`	`169`	`}`
`170`	`170`
`171`		`- Logline.database(database);`
	`171`	`+ Logline.database(database \|\| Logline._database);`
`172`	`172`	`Logline._initProtocol(protocol);`
`173`	`173`	`return this;`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class Logline {`
`63`	`63`	`return this;`
`64`	`64`	`}`
`65`	`65`
`66`		`- Logline.database(database);`
	`66`	`+ Logline.database(database \|\| Logline._database);`
`67`	`67`	`Logline._initProtocol(protocol);`
`68`	`68`	`return this;`
`69`	`69`	`}`