Merge branch 'dev'

# Conflicts: # dist/logline.min.js # dist/logline.min.js.map
latel · Sep 7, 2018 · 793a0e0 · 793a0e0
2 parents ab07ef7 + c26b3ea
commit 793a0e0
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 28 deletions.
diff --git a/dist/logline.js b/dist/logline.js
@@ -433,6 +433,8 @@ var Pool = function () {
     return Pool;
 }();
 
+var READ_WRITE = 'readwrite';
+
 /**
  * IndexedDB protocol
  * @class IndexedDBLogger
@@ -485,7 +487,7 @@ var IndexedDBLogger = function (_LoggerInterface) {
                 }
 
                 debug(this._namespace, level, descriptor, data);
-                var transaction = IndexedDBLogger.db.transaction(['logs'], IDBTransaction.READ_WRITE || 'readwrite');
+                var transaction = IndexedDBLogger.db.transaction(['logs'], READ_WRITE || 'readwrite');
                 transaction.onerror = function (event) {
                     return throwError(event.target.error);
                 };
@@ -649,7 +651,7 @@ var IndexedDBLogger = function (_LoggerInterface) {
                     });
                 }
 
-                var store = IndexedDBLogger._getTransactionStore(IDBTransaction.READ_WRITE);
+                var store = IndexedDBLogger._getTransactionStore(READ_WRITE);
                 if (!store) {
                     return false;
                 }
@@ -722,7 +724,7 @@ var IndexedDBLogger = function (_LoggerInterface) {
         value: function _getTransactionStore(mode) {
             try {
                 if (IndexedDBLogger.db) {
-                    var transaction = IndexedDBLogger.db.transaction(['logs'], mode || IDBTransaction.READ_WRITE);
+                    var transaction = IndexedDBLogger.db.transaction(['logs'], mode || READ_WRITE);
                     transaction.onerror = function (event) {
                         return throwError(event.target.error);
                     };
@@ -745,10 +747,6 @@ var IndexedDBLogger = function (_LoggerInterface) {
         key: 'support',
         get: function get$$1() {
             var support = !!(window.indexedDB && window.IDBTransaction && window.IDBKeyRange);
-            if (support) {
-                window.IDBTransaction.READ_WRITE = 'readwrite';
-                window.IDBTransaction.READ_ONLY = 'readonly';
-            }
             return support;
         }
     }]);

diff --git a/dist/logline.min.js b/dist/logline.min.js
diff --git a/dist/logline.min.js.map b/dist/logline.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "logline",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "logs for the frontend",
   "main": "dist/logline.min.js",
   "scripts": {
@@ -31,6 +31,7 @@
   "homepage": "https://github.com/latel/logline#readme",
   "devDependencies": {
     "babel-core": "^6.7.7",
+    "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-env": "^1.7.0",
     "chai": "^3.5.0",
@@ -42,11 +43,13 @@
     "gulp-compile-handlebars": "^0.6.1",
     "gulp-rename": "^1.2.2",
     "html-loader": "^0.4.3",
+    "install": "^0.12.1",
     "jsonfile": "^2.4.0",
     "minimist": "^1.2.0",
     "mocha": "^2.5.3",
     "mocha-headless-chrome": "1.7.1",
     "moment": "^2.13.0",
+    "npm": "^6.4.1",
     "rollup": "^0.41.4",
     "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-license": "^0.2.0",

diff --git a/src/protocols/indexeddb.js b/src/protocols/indexeddb.js
@@ -2,6 +2,8 @@ import LoggerInterface from './interface';
 import Pool from '../lib/pool';
 import * as util from '../lib/util';
 
+const READ_WRITE = 'readwrite';
+
 /**
  * IndexedDB protocol
  * @class IndexedDBLogger
@@ -35,7 +37,7 @@ export default class IndexedDBLogger extends LoggerInterface {
             }
 
             util.debug(this._namespace, level, descriptor, data);
-            let transaction = IndexedDBLogger.db.transaction(['logs'], IDBTransaction.READ_WRITE || 'readwrite');
+            let transaction = IndexedDBLogger.db.transaction(['logs'], READ_WRITE || 'readwrite');
             transaction.onerror = event => util.throwError(event.target.error);
 
             let store = transaction.objectStore('logs');
@@ -176,7 +178,7 @@ export default class IndexedDBLogger extends LoggerInterface {
                 return IndexedDBLogger._pool.push(() => IndexedDBLogger.keep(daysToMaintain));
             }
 
-            let store = IndexedDBLogger._getTransactionStore(IDBTransaction.READ_WRITE);
+            let store = IndexedDBLogger._getTransactionStore(READ_WRITE);
             if (!store) {
                 return false;
             }
@@ -236,7 +238,7 @@ export default class IndexedDBLogger extends LoggerInterface {
     static _getTransactionStore(mode) {
         try {
             if (IndexedDBLogger.db) {
-                let transaction = IndexedDBLogger.db.transaction(['logs'], mode || IDBTransaction.READ_WRITE);
+                let transaction = IndexedDBLogger.db.transaction(['logs'], mode || READ_WRITE);
                 transaction.onerror = event => util.throwError(event.target.error);
                 return transaction.objectStore('logs');
             }
@@ -255,10 +257,6 @@ export default class IndexedDBLogger extends LoggerInterface {
      */
     static get support() {
         const support = !!(window.indexedDB && window.IDBTransaction && window.IDBKeyRange);
-        if (support) {
-            window.IDBTransaction.READ_WRITE = 'readwrite';
-            window.IDBTransaction.READ_ONLY = 'readonly';
-        }
         return support;
     }
 }
diff --git a/test/tests.js b/test/tests.js
@@ -5,7 +5,8 @@ Logline.config({
 });
 
 var readyTimer, repeated, isReady = function(readyFn) {
-    clearInterval(readyTimer), repeated = 0;
+    clearInterval(readyTimer);
+    repeated = 0;
     readyTimer = setInterval(function() {
         var ready = 0, i;
         if (repeated++ > 20) {
@@ -58,23 +59,27 @@ describe('Logline', function() {
 
     it('should be able to specialfy any available protocols', function(done) {
         for (var i = 0; i < Object.keys(window.Logline.PROTOCOL).length; i++) {
-            window.Logline.using(window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]]);
-            assert.equal(window.Logline._protocol, window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]], 'protocol should be properly setted');
-            window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]].clean();
-            delete window.Logline._protocol;
+            if (window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]].support) {
+                window.Logline.using(window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]]);
+                assert.equal(window.Logline._protocol, window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]], 'protocol should be properly setted');
+                window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]].clean();
+                delete window.Logline._protocol;
+            }
         }
         done();
     });
 
     it('should be able to create any available protocols instance', function(done) {
         isReady(function() {
             for (var i = 0; i < Object.keys(window.Logline.PROTOCOL).length; i++) {
-                window.Logline.using(window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]]);
-                var logger = new window.Logline('a');
-                assert.equal(window.Logline._protocol, window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]], 'protocol should be properly setted');
-                assert.instanceOf(logger, window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]], 'log instance should be correctly created');
-                window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]].clean();
-                delete window.Logline._protocol;
+                if (window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]].support) {
+                    window.Logline.using(window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]]);
+                    var logger = new window.Logline('a');
+                    assert.equal(window.Logline._protocol, window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]], 'protocol should be properly setted');
+                    assert.instanceOf(logger, window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]], 'log instance should be correctly created');
+                    window.Logline.PROTOCOL[Object.keys(window.Logline.PROTOCOL)[i]].clean();
+                    delete window.Logline._protocol;
+                }
             }
             done();
         });