Skip to content

Add PhantomJS support #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
victor-homyakov wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add PhantomJS support #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65e4f96
Add PhantomJS support
victor-homyakov Nov 30, 2015
2ae9ba4
Fix warnings
victor-homyakov Aug 27, 2016
ccdf623
Add Chrome for iOS and Fluid App detection
victor-homyakov Aug 27, 2016
ac0ea10
Merge pull request #1 from victor-homyakov/add_user_agents
victor-homyakov Aug 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*jshint quotmark:false,curly:false,maxlen:340,maxdepth:4*/
/**
* session.js 0.4.1
* (c) 2012 Iain, CodeJoust
Expand Down Expand Up @@ -79,7 +80,7 @@ var session_fetch = (function(win, doc, nav){
var start = win.session.start;
}
// Set up checking, if all modules are ready
var asynchs = 0, module, result,
var asynchs = 0, module,
check_asynch = function(deinc){
if (deinc){ asynchs--; }
if (asynchs === 0){
Expand Down Expand Up @@ -154,12 +155,15 @@ var session_fetch = (function(win, doc, nav){
browser: [
{ string: nav.userAgent, subString: "Edge", identity: "Edge"},
{ string: nav.userAgent, subString: "Chrome", identity: "Chrome" },
{ string: nav.userAgent, subString: "CriOS", identity: "Chrome", versionSearch: "CriOS" },
{ string: nav.userAgent, subString: "OmniWeb", versionSearch: "OmniWeb/", identity: "OmniWeb" },
{ string: nav.userAgent, subString: "PhantomJS", identity: "PhantomJS" },
{ string: nav.vendor, subString: "Apple", identity: "Safari", versionSearch: "Version" },
{ prop: win.opera, identity: "Opera", versionSearch: "Version" },
{ string: nav.vendor, subString: "iCab",identity: "iCab" },
{ string: nav.vendor, subString: "KDE", identity: "Konqueror" },
{ string: nav.userAgent, subString: "Firefox", identity: "Firefox" },
{ string: nav.userAgent, subString: "Fluid", identity: "Fluid", versionSearch: "FluidApp Version" },
{ string: nav.vendor, subString: "Camino", identity: "Camino" },
{ string: nav.userAgent, subString: "Netscape", identity: "Netscape" },
{ string: nav.userAgent, subString: "MSIE", identity: "Explorer", versionSearch: "MSIE" },
Expand Down Expand Up @@ -237,13 +241,13 @@ var session_fetch = (function(win, doc, nav){
var found = true;
for (var i = 0; i < versions.length; i++){
try {
var obj = new ActiveXObject("ShockwaveFlash.ShockwaveFlash" + versions[i])
, found = !0;
new ActiveXObject("ShockwaveFlash.ShockwaveFlash" + versions[i]);
found = !0;
} catch (e){ /* nil */ }
if (found) return true;
}
return false;
}
};
return {
flash: check_plugin("flash") || check_activex_flash(['.7','.6','']),
silverlight: check_plugin("silverlight"),
Expand All @@ -269,7 +273,7 @@ var session_fetch = (function(win, doc, nav){
{ name: "Ask", host: "ask.com", query: "q" },
{ name: "Baidu", host: "baidu.com", query: "wd" }
], length = search_engines.length,
engine, match, i = 0,
engine, i = 0,
fallbacks = 'q query term p wd query text'.split(' ');
for (i = 0; i < length; i++){
engine = search_engines[i];
Expand Down Expand Up @@ -335,18 +339,18 @@ var session_fetch = (function(win, doc, nav){
}};
},
architecture: function(){
var arch = n.userAgent.match(/x86_64|Win64|WOW64|x86-64|x64\;|AMD64|amd64/) ||
(n.cpuClass === 'x64') ? 'x64' : 'x86';
var arch = nav.userAgent.match(/x86_64|Win64|WOW64|x86-64|x64\;|AMD64|amd64/) ||
(nav.cpuClass === 'x64') ? 'x64' : 'x86';
return {
arch: arch,
is_x64: arch == 'x64',
is_x86: arch == 'x68'
}
};
},
ipinfodb_location: function(api_key){
return function (callback){
var location_cookie = util.get_obj(options.location_cookie);
if (!location_cookie && location_cookie.source === 'ipinfodb'){
if (!location_cookie && location_cookie.source === 'ipinfodb'){
win.ipinfocb = function(data){
if (data.statusCode === "OK"){
data.source = "ipinfodb";
Expand All @@ -361,7 +365,7 @@ var session_fetch = (function(win, doc, nav){
}};
util.embed_script("http://api.ipinfodb.com/v3/ip-city/?key=" + api_key + "&format=json&callback=ipinfocb");
} else { callback(location_cookie); }
}}
};}
};

// Utilities
Expand All @@ -385,7 +389,7 @@ var session_fetch = (function(win, doc, nav){
protocol: a.protocol,
port: a.port === '' ? 80 : a.port,
search: a.search,
query: query }
query: query };
},
set_cookie: function(cname, value, expires, options){ // from jquery.cookie.js
if (!cname){ return null; }
Expand Down
Loading