detector - npm Package Compare versions

Comparing version 2.2.3 to 2.3.0

detector.js

@@ -233,2 +233,3 @@
 var ENGINE = [
+  ["edgehtml", /edge\/([0-9.]+)/],
   ["trident", re_msie],
@@ -254,2 +255,4 @@ ["blink", function(ua){
 var BROWSER = [
+  // Microsoft Edge Browser, Default browser in Windows 10.
+  ["edge", /edge\/([0-9.]+)/],
   // Sogou.
@@ -256,0 +259,0 @@ ["sogou", function(ua){

examples/index.md

@@ -14,3 +14,3 @@ # Example
   target="_blank"><strong>Please send Email to us</strong></a>.
-* if click Email link can'nt send Email, Please copy this page's information,
+* if click Email link can't send Email, Please copy this page's information,
   and send email to `[e-mail]`.
@@ -22,10 +22,3 @@
 
-<div style="display:none;">
-````javascript
-require('jquery');
-require('detector');
-````
-</div>
-
-<script>
+<script type='text/spm'>
 function isObject(obj){
@@ -46,5 +39,6 @@ return Object.prototype.toString.call(obj) === "[object Object]";
 
-var $ = window['jquery']; // require('jquery');
-var detector = window['detector']; // require('detector');
+var $ = require('jquery');
+var detector = require('detector');
 
+
 var OS_ALIAS = {
@@ -51,0 +45,0 @@ // Windows.

examples/tests.md

@@ -36,11 +36,6 @@
 
-````javascript
-var $ = require('jquery');
-var detector = require('detector');
-```
-
-<script>
-  var $ = window['jquery']; // require('jquery');
-  var detector = window['detector']; // require('detector');
-  var ua = navigator.userAgent;
+<script type="text/spm">
+  var $ = require('jquery');
+  var detector = require('detector');
+  var ua = navigator.userAgent + '\nMozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10162';
   var ipt = $("#userAgents");
@@ -47,0 +42,0 @@ var btn = $("#btn-analytics");

package.json

 {
   "name": "detector",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "description": "The module for detect client-side information.",
@@ -5,0 +5,0 @@ "homepage": "http://spmjs.io/docs/detector/",

README.md

@@ -5,7 +5,15 @@ # detector
 
-[![NPM version](https://badge.fury.io/js/detector.png)](http://badge.fury.io/js/detector)
-[![spm package](http://spmjs.io/badge/detector)](http://spmjs.io/package/detector)
-[![Build Status](https://secure.travis-ci.org/hotoo/detector.png?branch=master)](https://travis-ci.org/hotoo/detector)
-[![Coverage Status](https://coveralls.io/repos/hotoo/detector/badge.png?branch=master)](https://coveralls.io/r/hotoo/detector)
+[![NPM version][npm-badge]][npm-url]
+[![spm version][spm-badge]][spm-url]
+[![Build Status][travis-badge]][travis-url]
+[![Coverage Status][coveralls-badge]][coveralls-url]
 
+[npm-badge]: https://img.shields.io/npm/v/detector.svg?style=flat
+[npm-url]: https://www.npmjs.com/package/detector
+[spm-badge]: http://spmjs.io/badge/detector
+[spm-url]: http://spmjs.io/package/detector
+[travis-badge]: https://travis-ci.org/hotoo/detector.svg
+[travis-url]: https://travis-ci.org/hotoo/detector
+[coveralls-badge]: https://coveralls.io/repos/hotoo/detector/badge.svg?branch=master
+[coveralls-url]: https://coveralls.io/r/hotoo/detector
 
@@ -146,11 +154,11 @@ Client information detector, for auto detect user agent, include:
 * `aliyun`: Aliyun.
-* `huawei`: Huawei (华为)
+* `huawei`: Huawei （华为）
 * `lenovo`: lenovo.
-* `zte`: ZTE Corporation (中兴)
-* `vivo`: vivo (步步高)
+* `zte`: ZTE Corporation （中兴）
+* `vivo`: vivo （步步高）
 * `htc`: HTC.
 * `oppo`: OPPO.
-* `konka`: konka (康佳)
-* `sonyericsson`: sonyericsson (索尼爱立信)
-* `coolpad`: coolpad (酷派)
+* `konka`: konka （康佳）
+* `sonyericsson`: sonyericsson （索尼爱立信）
+* `coolpad`: coolpad （酷派）
 * `lg`: LG.
@@ -298,2 +306,3 @@
 
+* `edge`: Microsoft Edge browser.
 * `ie`: Microsoft Internet Explorer.
@@ -311,10 +320,10 @@ * `chrome`: Google Chrome.
 * `tt`: TencentTraveler.
-* `liebao`: Cheetah Mobile Inc. (猎豹) Browser.
-* `tao`: Taobao (淘宝) Browser.
-* `coolnovo`: coolnovo (枫树)
-* `saayaa`: Saayaa (闪游)
+* `liebao`: Cheetah Mobile Inc. （猎豹） Browser.
+* `tao`: Taobao （淘宝） Browser.
+* `coolnovo`: coolnovo （枫树）
+* `saayaa`: Saayaa （闪游）
 * `uc`: UC Browser.
-* `mi`: Build-in browser in Xiaomi (小米).
-* `baidu`: Baidu (百度) browser.
-* `nokia`: Build-in Browser in Nokia (诺基亚)
+* `mi`: Build-in browser in Xiaomi （小米）.
+* `baidu`: Baidu （百度） browser.
+* `nokia`: Build-in Browser in Nokia （诺基亚）
 * `blackberry`: 黑莓默认浏览器，版本号与系统版本相同。
@@ -347,3 +356,3 @@ * `webview`: iOS WebView.
 * `curl`: curl.
-* `micromessenger` WeChat (微信)
+* `micromessenger` WeChat （微信）
 * ~~`slurpbot`: Yahoo! [Slurp](wiki/slurpbot.md)~~
@@ -386,2 +395,3 @@
 
+* `edgehtml`: Microsoft Edge browser's rendering engine. (Note: version same browser version now.)
 * `trident`: Microsoft Trident.
@@ -388,0 +398,0 @@ * `blink`: Google Blink.

tests/detector-spec.js

@@ -11,2 +11,19 @@
 var UAs = [
+  // Windows 10, Edge browser.
+  ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10162", {
+    device: "pc/-1",
+    os: "windows/10.0",
+    browser: "edge/12.10162;12.10162;o",
+    //      name/version;mode;compatible
+    //                        c: compatible; o: origin, not compatible.
+    engine: "edgehtml/12.10162;12.10162;o"
+  }],
+  ["Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; rv:11.0) like Gecko", {
+    device: "pc/-1",
+    os: "windows/10.0",
+    browser: "ie/11.0;11.0;o",
+    //      name/version;mode;compatible
+    //                        c: compatible; o: origin, not compatible.
+    engine: "trident/7.0;7.0;o"
+  }],
   // Windows Blue
@@ -13,0 +30,0 @@ ["Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv 11.0) like Gecko", {

No alert changes

Improved metrics

Total package byte prevSize

119339

increased by1.04%

Lines of code

1891

increased by1.07%

Number of lines in readme file

412

increased by2.49%

No dependency changes