From 57d0282a31a1e430648ca0973159d0f7a3247379 Mon Sep 17 00:00:00 2001 From: AdrianoCahete Date: Mon, 26 Oct 2015 08:39:43 -0200 Subject: [PATCH 1/2] Fix duplicate script tag + Fix New Opera detection + Update README --- README.md | 7 +++++-- build/config.js | 2 +- detect.js | 4 ++-- package.json | 7 ++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b11a9d5..4b74aab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ Detect.js ========= - -@version 2.2.1 +@version 2.2.2 **Note:** Detect.js is a JavaScript library to detect platforms, versions, manufacturers and types based on the `navigator.userAgent` string. This code is based on, and modified from, the original work of Tobie Langel's UA-Parser: https://github.com/tobie/ua-parser. UA-Parser is subsequently a port of [BrowserScope][1]'s [user agent string parser][2]. @@ -88,6 +87,10 @@ Hacking * Install the pre-commit hook by running `hooks/install.sh`. * Kick off the default build (which will generate `detect.js` and `detect.min.js`) with `npm start`. +Credits +------- +Thanks to [Adriano Caheté](https://github.com/AdrianoCahete) and [Julian](https://github.com/julmot), + Licensing --------- * Some data contained in `build/regexes.js` is Copyright 2009 Google Inc. and available under the Apache License, Version 2.0. diff --git a/build/config.js b/build/config.js index 834524c..6b77baf 100644 --- a/build/config.js +++ b/build/config.js @@ -1,6 +1,6 @@ var config = root.config = { - browser: 'firefox netscape opera edge chrome facebook twitter ie opera other'.split(' '), + browser: 'firefox netscape opera edge chrome facebook twitter ie other'.split(' '), device: 'wii kindle playstation nokia blackberry palm htc acer asus lenovo lg motorola phillips samsung other'.split(' '), os: 'android webos windows symbian blackberry other'.split(' ') }; diff --git a/detect.js b/detect.js index b21e9f1..720e422 100644 --- a/detect.js +++ b/detect.js @@ -3,10 +3,10 @@ * https://github.com/darcyclarke/Detect.js * Dual licensed under the MIT and GPL licenses. * - * @version 2.2.1 + * @version 2.2.2 * @author Darcy Clarke * @url http://darcyclarke.me - * @createdat Wed Sep 23 2015 11:52:31 GMT-0300 (E. South America Standard Time) + * @createdat Mon Oct 26 2015 08:21:54 GMT-0200 (Horário brasileiro de verão) * * Based on UA-Parser (https://github.com/tobie/ua-parser) by Tobie Langel * diff --git a/package.json b/package.json index 4328ddc..122bd4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Detect.js", - "version": "2.2.1", + "version": "2.2.2", "author": "Darcy Clarke", "license": "Dual licensed under the MIT and GPL licenses.", "description": "JS Library to detect browser, os and device based on the UserAgent String", @@ -25,8 +25,5 @@ "uglify-js": "~2.2", "yamlparser": ">=0.0.2", "mocha": "*" - }, - "scripts": { - //"test": "mocha -u tdd ./tests/test.js" } -} +} \ No newline at end of file From fb01669aad98d79b38ebfac8144dfe3898c2e45a Mon Sep 17 00:00:00 2001 From: AdrianoCahete Date: Mon, 26 Oct 2015 08:40:54 -0200 Subject: [PATCH 2/2] Fix duplicate script tag + Fix New Opera detection + Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b74aab..7cb0ecf 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ Hacking Credits ------- -Thanks to [Adriano Caheté](https://github.com/AdrianoCahete) and [Julian](https://github.com/julmot), +Thanks to [Adriano Caheté](https://github.com/AdrianoCahete) and [Julian](https://github.com/julmot) Licensing ---------