Skip to content

Commit

Permalink
Merge pull request #165 from gopro/alps-plugins-fixes
Browse files Browse the repository at this point in the history
Device: correct the bad safari recognition of an iOS chrome browser.
  • Loading branch information
rroux-gpsw committed Jan 9, 2018
2 parents 12b7c5e + 228643f commit b3b33cd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/system/Device.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ FORGE.Device = (function(c)
this._browser = "chrome";
if (/CriOS\/(\d+)/.test(this._ua))
{
this._safari = false;
this._browserVersion = this._chromeVersion = parseInt(RegExp.$1, 10);
}
else if (/Chrome\/(\d+)/.test(this._ua))
Expand Down Expand Up @@ -965,7 +966,7 @@ FORGE.Device = (function(c)
* @static
* @param {Object} config - The device requirement configuration of the configuration/manifest.
* @param {Object} [device=FORGE.Device] - The device environment to test. The default is FORGE.Device detection, but we need to modify it in test suites.
* @param {string} [condition="and"] [description]
* @param {string} [condition="and"] - The condition to reach.
* @return {boolean} Returns true if the object is compatible with the device environment, false if not.
*/
Tmp.prototype.check = function(config, device, condition)
Expand Down

0 comments on commit b3b33cd

Please sign in to comment.