Skip to content

Commit

Permalink
[TIMOB-6010] Added runtime to the Ti.Platform. Also changed the Ti.Pl…
Browse files Browse the repository at this point in the history
…atform name and osname.
  • Loading branch information
cb1kenobi committed Nov 8, 2011
1 parent 69c134f commit dc1091d
Showing 1 changed file with 9 additions and 147 deletions.
156 changes: 9 additions & 147 deletions mobileweb/src/Ti.Platform/platform.js
@@ -1,149 +1,4 @@
(function(api){
/** Browser detect is from http://www.quirksmode.org/js/detect.html **/

var BrowserDetect = {
init: function () {
this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
this.version = this.searchVersion(navigator.userAgent)
|| this.searchVersion(navigator.appVersion)
|| "an unknown version";
this.OS = this.searchString(this.dataOS) || "an unknown OS";
},
searchString: function (data) {
for (var i=0;i<data.length;i++) {
var dataString = data[i].string;
var dataProp = data[i].prop;
this.versionSearchString = data[i].versionSearch || data[i].identity;
if (dataString) {
if (dataString.indexOf(data[i].subString) != -1)
return data[i].identity;
}
else if (dataProp)
return data[i].identity;
}
},
searchVersion: function (dataString) {
var index = dataString.indexOf(this.versionSearchString);
if (index == -1) return;
return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
},
dataBrowser: [
{
string: navigator.userAgent,
subString: "Chrome",
identity: "Chrome"
},
{ string: navigator.userAgent,
subString: "OmniWeb",
versionSearch: "OmniWeb/",
identity: "OmniWeb"
},
{
string: navigator.vendor,
subString: "Apple",
identity: "Safari",
versionSearch: "Version"
},
{
prop: window.opera,
identity: "Opera"
},
{
string: navigator.vendor,
subString: "iCab",
identity: "iCab"
},
{
string: navigator.vendor,
subString: "KDE",
identity: "Konqueror"
},
{
string: navigator.userAgent,
subString: "Firefox",
identity: "Firefox"
},
{
string: navigator.vendor,
subString: "Camino",
identity: "Camino"
},
{ // for newer Netscapes (6+)
string: navigator.userAgent,
subString: "Netscape",
identity: "Netscape"
},
{
string: navigator.userAgent,
subString: "MSIE",
identity: "Explorer",
versionSearch: "MSIE"
},
{
string: navigator.userAgent,
subString: "Gecko",
identity: "Mozilla",
versionSearch: "rv"
},
{ // for older Netscapes (4-)
string: navigator.userAgent,
subString: "Mozilla",
identity: "Netscape",
versionSearch: "Mozilla"
}
],
dataOS : [
{
string: navigator.platform,
subString: "Win",
identity: "Windows"
},
{
string: navigator.platform,
subString: "Mac",
identity: "Mac"
},
{
string: navigator.userAgent,
subString: "iPhone",
identity: "iphone"
},
{
string: navigator.platform,
subString: "Linux",
identity: "Linux"
},
{
string: navigator.userAgent,
subString: "Android",
identity: "android"
},
{
string: navigator.userAgent,
subString: "iPod",
identity: "ipod"
},
{
string: navigator.userAgent,
subString: "Symbian",
identity: "symbian"
},
{
string: navigator.userAgent,
subString: "Blackberry",
identity: "blackberry"
},
{
string: navigator.userAgent,
subString: "iPad",
identity: "ipad"
}
]

};

BrowserDetect.init();

// Interfaces
Ti._5.EventDriven(api);

Expand Down Expand Up @@ -214,7 +69,7 @@
});

Object.defineProperty(api, 'name', {
get: function(){return BrowserDetect.browser;},
get: function(){return navigator.userAgent;},
set: function(val){return false;}
});

Expand All @@ -225,7 +80,7 @@
});

Object.defineProperty(api, 'osname', {
get: function(){return BrowserDetect.OS;},
get: function(){return "mobileweb";},
set: function(val){return false;}
});

Expand All @@ -234,6 +89,13 @@
set: function(val){return false;}
});

var match = navigator.userAgent.toLowerCase().match(/(webkit|gecko|trident|presto)/),
runtime = match ? match[0] : "unknown";
Object.defineProperty(api, 'runtime', {
get: function(){return runtime;},
set: function(val){return false;}
});

var _processorCount = null;
Object.defineProperty(api, 'processorCount', {
get: function(){return _processorCount;},
Expand Down

0 comments on commit dc1091d

Please sign in to comment.