Merge branch 'dev'

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Maslov Ivan
+Copyright (c) 2015-2017 Maslov Ivan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-DuelJS v1.2.6
+DuelJS v1.2.7
 ======
 [![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat-square)](http://dueljs.readthedocs.org/) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/studentIvan/dueljs/master/LICENSE) [![Bower](https://img.shields.io/bower/v/duel.svg?style=flat-square)](http://bower.io/search/?q=duel) [![](https://img.shields.io/github/issues-raw/studentIvan/dueljs.svg?style=flat-square)](https://github.com/studentIvan/dueljs/issues/) [![GitHub stars](https://img.shields.io/github/stars/studentIvan/dueljs.svg?style=flat-square)](https://github.com/studentIvan/dueljs/stargazers)
 
@@ -8,6 +8,9 @@ See a brief look on [the homepage](http://dueljs.studentivan.ru)
 
 Documentation available on http://dueljs.readthedocs.org/
 
+######New in 1.2.7:
+* Fixed [#13](https://github.com/studentIvan/dueljs/issues/13): webpack import
+
 ######New in 1.2.6:
 * Fixed [#11](https://github.com/studentIvan/dueljs/issues/11): localstorage issue for private browsing (thanks to Stéphane Bachelier <[email protected]>)
 * Library added to npm as dueljs (thanks to Denis Lukov <[email protected]>)
@@ -73,4 +76,26 @@ duel.useStorageEvent = false; // auto false in IE
 Internet Explorer does incorrect. So it using force `useStorageEvent = false` by default.
 
 ######How it works with Internet Explorer without storage event?
-Don't worry. It using setInterval javascript checking.
+Don't worry. It using setInterval javascript checking.
+
+######Testing suite
+1. NodeJS version 6.7.0
+2. PhantomJS version 2.1.1
+3. Chai version 3.5.0
+4. Mocha version 3.1.0
+5. Mocha-PhantomJS custom fork of 4.1.0
+
+In Mac OS Sierra you want to use phantomjs from brew (brew install phantomjs) and check to link it:
+
+```
+$ which phantomjs
+/usr/local/bin/phantomjs
+```
+
+And also you can create this link by yourself:
+
+```
+ln -s /usr/local/Cellar/phantomjs/2.1.1/bin/phantomjs /usr/local/bin/phantomjs
+```
+
+The reason I temporary changed original repo of mocha-phantomjs to git+https://github.com/studentIvan/mocha-phantomjs.git#master is cause mocha-phantomjs doesn't support the second phantomjs right now.

package.json

@@ -1,20 +1,18 @@
 {
   "name": "dueljs",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "DuelJS - JavaScript HTML5 Master/Slave Browser Tabs Helper",
   "main": "public/lib/duel.js",
   "devDependencies": {
-    "chai": "^1.10.0",
-    "mocha": "^2.1.0",
-    "mocha-phantomjs": "^3.5.3",
-    "phantomjs": "^1.9.13",
-    "http-server": "*",
+    "chai": "3.5.0",
+    "mocha": "3.1.0",
+    "mocha-phantomjs": "git+https://github.com/studentIvan/mocha-phantomjs.git#master",
     "uglifyjs": "*"
   },
   "scripts": {
-    "pretest": "npm install && mocha-phantomjs test/mocha.test.html && mocha-phantomjs test/mocha.min.test.html",
+    "pretest": "npm install && node_modules/.bin/mocha-phantomjs test/mocha.test.umd.html && node_modules/.bin/mocha-phantomjs test/mocha.test.html && node_modules/.bin/mocha-phantomjs test/mocha.min.test.html",
     "test": "phantomjs test/phantom.script.js",
-    "start": "npm install && node_modules/.bin/http-server",
+    "start": "npm install && http-server -p 8089",
     "min": "npm install && node_modules/.bin/uglifyjs --compress --bare-returns --keep-fnames --source-map=public/lib/duel.min.js.map --source-map-url=duel.min.js.map --output=public/lib/duel.min.js --mangle -- public/lib/duel.js"
   },
   "repository": {

public/lib/duel.js

@@ -1,5 +1,5 @@
 /*!
- * DuelJS JavaScript Library v1.2.5
+ * DuelJS JavaScript Library v1.2.7
  * https://github.com/studentIvan/dueljs
  * http://dueljs.readthedocs.org/en/latest/
  *
@@ -24,7 +24,7 @@
     // Browser globals
     root.duel = factory(root);
   }
-}(this, function (window) {
+}(typeof window !== "undefined" ? window : this, function (window) {
   var duel = {};
 
   /**