Merge branch 'master' of github.com:faisalman/ua-parser-js

This commit is contained in:
Faisal Salman
2015-07-19 02:03:50 +07:00
3 changed files with 6 additions and 178 deletions

View File

@@ -686,7 +686,7 @@
], [[NAME, 'BlackBerry'], VERSION], [
/(blackberry)\w*\/?([\w\.]+)*/i, // Blackberry
/(tizen)[\/\s]([\w\.]+)/i, // Tizen
/(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego|contiki)[\/\s-]?([\w\.]+)*/i,
/(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|contiki)[\/\s-]?([\w\.]+)*/i,
// Android/WebOS/Palm/QNX/Bada/RIM/MeeGo/Contiki
/linux;.+(sailfish);/i // Sailfish OS
], [NAME, VERSION], [
@@ -867,4 +867,4 @@
};
}
})(this);
})(typeof window === 'object' ? window : this);