Change license paragraph in readme from GPL2 to MIT

This commit is contained in:
Faisal Salman 2012-09-14 02:42:11 +07:00
parent eaacb14ef2
commit ac1f92d3c6
3 changed files with 32 additions and 31 deletions

View File

@ -1,7 +1,7 @@
{ {
"title": "UA-Parser.js", "title": "UA-Parser.JS",
"name": "ua-parser-js", "name": "ua-parser-js",
"version": "0.3.2", "version": "0.3.3",
"author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)", "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
"description": "Lightweight JavaScript-based user-agent string parser", "description": "Lightweight JavaScript-based user-agent string parser",
"keywords": [ "keywords": [

View File

@ -1,6 +1,6 @@
# UA-Parser.js # UA-Parser.JS
Light-weight JavaScript-based all-in-one user-agent parser Lightweight JavaScript-based User-Agent string parser
* Author : Faisalman <<fyzlman@gmail.com>> * Author : Faisalman <<fyzlman@gmail.com>>
* Home : http://faisalman.github.com/ua-parser-js * Home : http://faisalman.github.com/ua-parser-js
@ -9,14 +9,15 @@ Light-weight JavaScript-based all-in-one user-agent parser
## Features ## Features
Get detailed type and version of web browser, layout engine, operating system, and device. Extract detailed type of web browser, layout engine, operating system, and device purely from user-agent string.
## Methods ## Methods
* `getBrowser([uastring])` * `getBrowser()`
* `getDevice([uastring])` * `getDevice()`
* `getEngine([uastring])` * `getEngine()`
* `getOS([uastring])` * `getOS()`
* `getUA()`
* `setUA(uastring)` * `setUA(uastring)`
## Properties ## Properties
@ -31,7 +32,7 @@ Get detailed type and version of web browser, layout engine, operating system, a
var parser = new UAParser(); var parser = new UAParser();
// by default it takes ua string from current browser's window.navigator // by default it takes ua string from current browser's window.navigator.userAgent
console.log(parser.result); console.log(parser.result);
/* /*
/// this will print an object structured like this: /// this will print an object structured like this:
@ -77,23 +78,23 @@ var parser = new UAParser();
var ua1 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11'; var ua1 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';
var ua2 = 'Midori/0.2 (X11; Linux; U; cs-cz) WebKit/531.2+'; var ua2 = 'Midori/0.2 (X11; Linux; U; cs-cz) WebKit/531.2+';
parser.setUA(ua1).getDevice().name; // "PlayBook" console.log(parser.setUA(ua1).getDevice().name); // "PlayBook"
parser.getOS() // {name: "RIM Tablet OS", version: "1.0.0"} console.log(parser.getOS()) // {name: "RIM Tablet OS", version: "1.0.0"}
parser.getOS(ua2) // {name: "Linux", version: undefined} console.log(parser.getOS(ua2)) // {name: "Linux", version: undefined}
parser.getOS() // {name: "RIM Tablet OS", version: "1.0.0"} console.log(parser.getOS()) // {name: "RIM Tablet OS", version: "1.0.0"}
parser.getEngine().name; // "AppleWebKit" console.log(parser.getEngine().name); // "AppleWebKit"
``` ```
## License ## License
Copyright © 2012 Faisalman <<fyzlman@gmail.com>> Copyright © 2012 Faisalman <<fyzlman@gmail.com>>
This program is free software; you can redistribute it and/or Permission is hereby granted, free of charge, to any person obtaining a copy of
modify it under the terms of the GNU General Public License this software and associated documentation files (the "Software"), to deal in
as published by the Free Software Foundation; either version 2 the Software without restriction, including without limitation the rights to use,
of the License, or (at your option) any later version. copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
This program is distributed in the hope that it will be useful, The above copyright notice and this permission notice shall be included in all
but WITHOUT ANY WARRANTY; without even the implied warranty of copies or substantial portions of the Software.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

View File

@ -1,4 +1,4 @@
// UA-Parser.js v0.3.2 // UA-Parser.JS v0.3.3
// Lightweight JavaScript-based User-Agent string parser // Lightweight JavaScript-based User-Agent string parser
// https://github.com/faisalman/ua-parser-js // https://github.com/faisalman/ua-parser-js
// //
@ -12,10 +12,10 @@
// regexp mapper // regexp mapper
var regxMap = function (ua) { var regxMap = function (ua) {
var result = {}, i, j, k, l; var result = {}, i, j, k, l, m;
for (i = 1; i < arguments.length; i += 2) { for (i = 1; i < arguments.length; i += 2) {
var regex = arguments[i], // odd sequence (2,4,6,..) var regex = arguments[i], // odd sequence (2,4,6,..)
props = arguments[i + 1]; // even sequence (3,5,7,..) props = arguments[i + 1]; // even sequence (3,5,7,..)
for (k = 0; k < props.length; k++) { for (k = 0; k < props.length; k++) {
if (typeof props[k] == 'object') { if (typeof props[k] == 'object') {
result[props[k][0]] = undefined; result[props[k][0]] = undefined;
@ -24,17 +24,17 @@
} }
} }
for (j = 0; j < regex.length; j++) { for (j = 0; j < regex.length; j++) {
var match = regex[j].exec(ua); m = regex[j].exec(ua);
if (!!match) { if (!!m) {
l = 1; l = 1;
for (k = 0; k < props.length; k++) { for (k = 0; k < props.length; k++) {
if (typeof props[k] === 'object' && props[k].length === 2) { if (typeof props[k] === 'object' && props[k].length === 2) {
result[props[k][0]] = props[k][1]; result[props[k][0]] = props[k][1];
l -= 1; l -= 1;
} else if (typeof props[k] === 'object' && props[k].length === 3) { } else if (typeof props[k] === 'object' && props[k].length === 3) {
result[props[k][0]] = (!!match[k + l]) ? match[k + l].replace(props[k][1], props[k][2]) : undefined; result[props[k][0]] = (!!m[k + l]) ? m[k + l].replace(props[k][1], props[k][2]) : undefined;
} else { } else {
result[props[k]] = (!!match[k + l]) ? match[k + l] : undefined; result[props[k]] = (!!m[k + l]) ? m[k + l] : undefined;
} }
} }
break; break;