Merge branch 'release/0.1.0'

pushandplay · Oct 18, 2017 · f9fe301 · f9fe301
2 parents 8ac6147 + 8e56488
commit f9fe301
Show file tree

Hide file tree

Showing 17 changed files with 825 additions and 85 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,19 @@
 {
-  "presets": ["env", "stage-0"],
+  "presets": [
+    "es3",
+    [
+      "env",
+      {
+        "targets": {
+          "browsers": [
+            "> 0.5%",
+            "ie >= 8"
+          ]
+        }
+      }
+    ],
+    "stage-0"
+  ],
   "plugins": [
     "babel-plugin-add-module-exports"
   ]

diff --git a/README.md b/README.md
@@ -1,12 +1,16 @@
-[![NPM](https://nodei.co/npm/browser-language-detector.png?global=true)](https://nodei.co/npm/browser-language-detector/)
 
-[![npm](https://img.shields.io/npm/v/browser-language-detector.svg)](https://www.npmjs.com/package/browser-language-detector) [![Build Status](https://travis-ci.org/pushandplay/browser-language-detector.svg?branch=master)](https://travis-ci.org/pushandplay/browser-language-detector) [![Coverage Status](https://coveralls.io/repos/github/pushandplay/browser-language-detector/badge.svg?branch=master)](https://coveralls.io/github/pushandplay/browser-language-detector?branch=master) [![license](https://img.shields.io/github/license/pushandplay/browser-language-detector.svg)](https://github.com/pushandplay/browser-language-detector/blob/master/LICENSE)
+A lightweight cross-browser JavaScript library for detecting browser and user language.
 
-A lightweight cross-browser JavaScript library for detecting browser language.
+
+[![NPM][npm]][npm-url]
+[![Build Status][travis]][travis-url]
+[![Coverage Status][coverage]][coverage-url]
+[![Quality][quality]][quality-url]
+[![License][license]][license-url]
 
 ## Download
 
-[Latest build](https://raw.githubusercontent.com/pushandplay/browser-language-detector/master/dist/BrowserLanguageDetector.min.js)
+[Latest build][download-url]
 
 ## Installation
 
@@ -25,9 +29,27 @@ $ npm i --save browser-language-detector
 So... it works like this:
 
 ```javascript
-BrowserLanguageDetector.detect().lang; // en or your browser language
+BrowserLanguageDetector.lang; // en or your browser language
 ```
 
 ## License
 
   [MIT](LICENSE)
+
+
+[download-url]: https://raw.githubusercontent.com/pushandplay/browser-language-detector/master/dist/BrowserLanguageDetector.min.js
+
+[npm]: https://img.shields.io/npm/v/browser-language-detector.svg
+[npm-url]: https://www.npmjs.com/package/browser-language-detector
+
+[travis]: https://travis-ci.org/pushandplay/browser-language-detector.svg?branch=master
+[travis-url]: https://travis-ci.org/pushandplay/browser-language-detector
+
+[coverage]: https://coveralls.io/repos/github/pushandplay/browser-language-detector/badge.svg?branch=master
+[coverage-url]: https://coveralls.io/github/pushandplay/browser-language-detector?branch=master
+
+[quality]: https://www.bithound.io/github/pushandplay/browser-language-detector/badges/score.svg
+[quality-url]: https://www.bithound.io/github/pushandplay/browser-language-detector
+
+[license]: https://img.shields.io/github/license/pushandplay/browser-language-detector.svg
+[license-url]: https://github.com/pushandplay/browser-language-detector/blob/master/LICENSE
diff --git a/__tests__/index.spec.js b/__tests__/index.spec.js
@@ -1,18 +1,22 @@
 /* eslint-disable max-nested-callbacks */
-import BrowserLanguageDetector from '../src';
+import BrowserLanguageDetector from '../src/BrowserLanguageDetector.full';
 
 const config = {
   fallbackLanguage: 'es'
 };
 
 describe('BrowserLanguageDetector', () => {
   test('Language should be equal "en"', () => {
-    expect(BrowserLanguageDetector.detect().lang).toBe('en');
+    expect(BrowserLanguageDetector.lang).toBe('en');
   });
 
   test('Language should be equal "es"', () => {
     expect(BrowserLanguageDetector.config(config).detect().lang).toBe('es');
   });
+
+  test('Language should be equal "es" (detect)', () => {
+    expect(BrowserLanguageDetector.detect().lang).toBe('es');
+  });
 });
 
 describe('BrowserLanguageDetector.selectPreferredLanguage()', () => {

diff --git a/__tests__/utils.spec.js b/__tests__/utils.spec.js
@@ -17,11 +17,7 @@ describe('Test utils flatten', () => {
     expect(flatten([0, 1, 2])).toEqual([0, 1, 2]);
   });
 
-  test('Should be equal [0,1,2,3]', () => {
-    expect(flatten([0, [1, 2], 3])).toEqual([0, 1, 2, 3]);
-  });
-
-  test('Should be equal [0,1,1,2]', () => {
-    expect(flatten([0, [1, [1], 2]])).toEqual([0, 1, 1, 2]);
+  test('Should be equal [3,1,6,3]', () => {
+    expect(flatten([3, [1, 6], 3])).toEqual([3, 1, 6, 3]);
   });
 });
diff --git a/dist/BrowserLanguageDetector.min.js b/dist/BrowserLanguageDetector.min.js
diff --git a/dist/BrowserLanguageDetectorCore.min.js b/dist/BrowserLanguageDetectorCore.min.js
diff --git a/dist/NavigatorDetector.min.js b/dist/NavigatorDetector.min.js
diff --git a/examples/index.html b/examples/index.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>Test</title>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+<script src="../dist/BrowserLanguageDetector.min.js"></script>
+<script>
+  window.onload = function () {
+    console.log(window.BrowserLanguageDetector.lang);
+    console.log(window.BrowserLanguageDetector.config({fallbackLanguage: 'ru'}).lang);
+    console.log(window.BrowserLanguageDetector.config({fallbackLanguage: 'en'}).lang);
+    console.log(window.BrowserLanguageDetector.config({fallbackLanguage: 'es'}).lang);
+  };
+</script>
+</body>
+</html>
diff --git a/index.js b/index.js
@@ -1,3 +1,3 @@
-import BrowserLanguageDetector from './src';
+import BrowserLanguageDetector from './src/BrowserLanguageDetector';
 
 export default BrowserLanguageDetector;