crosstab - npm Package Compare versions

Comparing version 0.2.6 to 0.2.7

bower.json

 {
   "name": "crosstab",
-  "version": "v0.2.6",
+  "version": "v0.2.7",
   "homepage": "https://github.com/tejacques/crosstab",
@@ -5,0 +5,0 @@ "authors": [

package.json

 {
   "name": "crosstab",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "A utility library for cross-tab communication using localStorage.",
@@ -5,0 +5,0 @@ "author": "Tom Jacques <[e-mail]>",

README.md

@@ -41,2 +41,4 @@ # crosstab [![NPM version][npm-img]][npm-url] [![Build Status][travis-img]][travis-url]
 
+No Mobile browser is supported.
+
 # API #
@@ -43,0 +45,0 @@

src/crosstab.js

 /*!
- * crosstab JavaScript Library v0.2.6
+ * crosstab JavaScript Library v0.2.7
  * https://github.com/tejacques/crosstab
@@ -13,3 +13,3 @@ *
     var useragent = navigator.userAgent || navigator.vendor || window.opera;
-    var isMobile = (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(useragent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(useragent.substr(0, 4)));
+    var isMobile = (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(useragent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(useragent.substr(0, 4)));
 
@@ -103,3 +103,3 @@ var localStorage;
     util.forEachArr = function (arr, fn) {
-        var len = arr.length
+        var len = arr.length;
         for (var i = 0; i < len; i++) {
@@ -156,2 +156,3 @@ fn.call(arr, arr[i], i, arr);
         becomeMaster: 'becomeMaster',
+        demoteFromMaster: 'demotedFromMaster',
         tabUpdated: 'tabUpdated',
@@ -399,5 +400,16 @@ tabClosed: 'tabClosed',
 
-        util.events.destructor();
     }
 
+    function restoreLoop() {
+        crosstab.stopKeepalive = false;
+        keepaliveLoop();
+    }
+
+    function swapUnloadEvents() {
+        // `beforeunload` replaced by `unload` (IE11 will be smart now)
+        window.removeEventListener('beforeunload', unload, false);
+        window.addEventListener('unload', unload, false);
+        restoreLoop();
+    }
+
     function getMaster() {
@@ -415,4 +427,10 @@ return util.tabs[util.keys.MASTER_TAB];
 
+    function getMasterId() {
+        var master = getMaster();
+
+        return master ? master.id : 0;
+    }
+
     function isMaster() {
-        return getMaster().id === crosstab.id;
+        return getMasterId() === crosstab.id;
     }
@@ -472,6 +490,6 @@
 
-        if (getMaster().id === tab.id) {
+        if (getMasterId() === tab.id) {
             setMaster(tab);
         }
-        if (getMaster().id === crosstab.id) {
+        if (isMaster()) {
             // If I am master, save the new tabs out
@@ -485,2 +503,3 @@ setStoredTabs();
         var lastUpdated = message.timestamp;
+        var previousMaster = getMasterId();
         setMaster({
@@ -491,3 +510,4 @@ id: id,
 
-        if (crosstab.id === id) {
+        if (isMaster()
+            && previousMaster !== crosstab.id) {
             // set the tabs in localStorage
@@ -498,2 +518,6 @@ setStoredTabs();
             util.events.emit(util.eventTypes.becomeMaster);
+        } else if (!isMaster()
+            && previousMaster === crosstab.id) {
+            // emit the demoted from master event so we can clean up resources
+            util.events.emit(util.eventTypes.demoteFromMaster);
         }
@@ -696,3 +720,2 @@ });
             keepalive();
-            window.setTimeout(keepaliveLoop, TAB_KEEPALIVE);
         }
@@ -707,3 +730,6 @@ }
         window.addEventListener('storage', onStorageEvent, false);
-        window.addEventListener('unload', unload, false);
+        // start with the `beforeunload` event due to IE11
+        window.addEventListener('beforeunload', unload, false);
+        // swap `beforeunload` to `unload` after DOM is loaded
+        window.addEventListener('DOMContentLoaded', swapUnloadEvents, false);
 
@@ -721,2 +747,3 @@ util.events.on('PING', function (message) {
 
+        setInterval(keepaliveLoop, TAB_KEEPALIVE);
         keepaliveLoop();
@@ -723,0 +750,0 @@ }

test/test-crosstab.js

@@ -283,2 +283,74 @@ // =========== Iframe Tools ==============
     });
+
+    describe('setup during load', function() {
+        var iframe;
+
+        beforeEach(function (done) {
+            window.done = done;
+            iframe = runIframe(function () {
+                crosstab(function () {
+                    addText('crosstab setup complete');
+                });
+                window.parent.done();
+            });
+        });
+
+        it('should stop on beforeunload event and recover when canceled', function (done) {
+            window.done = done;
+
+            iframe.run(function () {
+                crosstab(function() {
+
+                    window.parent.expect(crosstab.stopKeepalive).to.be.undefined;
+                    
+                    // FIXME use `new Event()` once PhantomJS 2.0 is available on npm
+                    var e = document.createEvent('Event');
+                    e.initEvent('beforeunload', true, true);
+                    window.dispatchEvent(e);
+
+                    window.parent.expect(crosstab.stopKeepalive).to.be(true);
+
+                    // should recover if the event was canceled
+                    e = document.createEvent('Event');
+                    e.initEvent('DOMContentLoaded', true, false);
+                    window.dispatchEvent(e);
+
+                    window.parent.expect(crosstab.stopKeepalive).to.be(false);
+
+                    window.parent.done();
+                });
+            });
+        });
+
+        it ('should stop on unload event after DOMContentLoaded event', function (done) {
+            window.done = done;
+            iframe.run(function () {
+                crosstab(function() {
+                    
+                    window.parent.expect(crosstab.stopKeepalive).to.be.undefined;
+
+                    // FIXME use `new Event()` once PhantomJS 2.0 is available on npm
+                    var e = document.createEvent('Event');
+                    e.initEvent('DOMContentLoaded', true, false);
+                    window.dispatchEvent(e);
+
+                    e = document.createEvent('Event');
+                    e.initEvent('beforeunload', true, true);
+                    window.dispatchEvent(e);
+
+                    // nothing should have happened
+                    window.parent.expect(crosstab.stopKeepalive).to.be.undefined;
+                    
+                    // should respond only to unload event now
+                    e = document.createEvent('Event');
+                    e.initEvent('unload', true, false);
+                    window.dispatchEvent(e);
+
+                    window.parent.expect(crosstab.stopKeepalive).to.be(true);
+
+                    window.parent.done();
+                });
+            });
+        });
+    });
 });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

75933

increased by5.23%

Lines of code

1227

increased by6.7%

Number of lines in readme file

150

increased by1.35%

No dependency changes