Merge pull request #42 from AdrianoCahete/master

Fix duplicate script tag + Fix duplicated Opera in config + Update Readme

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.

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(' ')
 };

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
  *

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"
   }
-}
+}