Skip to content

Migrate core/utils/useragent.js to goog.module syntax #5435

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

Merged
cpcallen merged 4 commits into from
Sep 7, 2021
Merged

Migrate core/utils/useragent.js to goog.module syntax #5435

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
2488543
Migrate core/utils/useragent.js to ES6 const/let
cpcallen Sep 7, 2021
588139a
Migrate core/utils/useragent.js to goog.module
cpcallen Sep 7, 2021
0465c80
Migrate core/utils/useragent.js named requires
cpcallen Sep 7, 2021
49ebe77
clang-format core/utils/useragent.js
cpcallen Sep 7, 2021
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
178 changes: 109 additions & 69 deletions core/utils/useragent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,100 +16,140 @@
* @name Blockly.utils.userAgent
* @namespace
*/
goog.provide('Blockly.utils.userAgent');
goog.module('Blockly.utils.userAgent');
goog.module.declareLegacyNamespace();

goog.require('Blockly.utils.global');
const global = goog.require('Blockly.utils.global');


/** @const {boolean} */
Blockly.utils.userAgent.IE;
/**
* @type {string}
* The raw useragent string.
*/
let rawUserAgent;

/** @type {boolean} */
let isIe;

/** @type {boolean} */
let isEdge;

/** @type {boolean} */
let isJavaFx;

/** @type {boolean} */
let isChrome;

/** @type {boolean} */
let isWebKit;

/** @type {boolean} */
let isGecko;

/** @type {boolean} */
let isAndroid;

/** @type {boolean} */
let isIPad;

/** @type {boolean} */
let isIPod;

/** @type {boolean} */
let isIPhone;

/** @type {boolean} */
let isMac;

/** @type {boolean} */
let isTablet;

/** @type {boolean} */
let isMobile;

(function(raw) {
rawUserAgent = raw;
const rawUpper = rawUserAgent.toUpperCase();
/**
* Case-insensitive test of whether name is in the useragent string.
* @param {string} name Name to test.
* @return {boolean} True if name is present.
*/
function has(name) {
return rawUpper.indexOf(name.toUpperCase()) != -1;
}

// Browsers. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/browser.js
isIe = has('Trident') || has('MSIE');
isEdge = has('Edge');
// Useragent for JavaFX:
// Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.44
// (KHTML, like Gecko) JavaFX/8.0 Safari/537.44
isJavaFx = has('JavaFX');
isChrome = (has('Chrome') || has('CriOS')) && !isEdge;

// Engines. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/engine.js
isWebKit = has('WebKit') && !isEdge;
isGecko = has('Gecko') && !isWebKit && !isIe && !isEdge;

// Platforms. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/platform.js
// and
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/extra.js
isAndroid = has('Android');
const maxTouchPoints =
global['navigator'] && global['navigator']['maxTouchPoints'];
isIPad = has('iPad') || has('Macintosh') && maxTouchPoints > 0;
isIPod = has('iPod');
isIPhone = has('iPhone') && !isIPad && !isIPod;
isMac = has('Macintosh');

// Devices. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/device.js
isTablet = isIPad || (isAndroid && !has('Mobile')) || has('Silk');
isMobile = !isTablet && (isIPod || isIPhone || isAndroid || has('IEMobile'));
})((global['navigator'] && global['navigator']['userAgent']) || '');

/** @const {string} */
exports.raw = rawUserAgent;

/** @const {boolean} */
Blockly.utils.userAgent.EDGE;
exports.IE = isIe;

/** @const {boolean} */
Blockly.utils.userAgent.JAVA_FX;
exports.EDGE = isEdge;

/** @const {boolean} */
Blockly.utils.userAgent.CHROME;
exports.JavaFx = isJavaFx;

/** @const {boolean} */
Blockly.utils.userAgent.WEBKIT;
exports.CHROME = isChrome;

/** @const {boolean} */
Blockly.utils.userAgent.GECKO;
exports.WEBKIT = isWebKit;

/** @const {boolean} */
Blockly.utils.userAgent.ANDROID;
exports.GECKO = isGecko;

/** @const {boolean} */
Blockly.utils.userAgent.IPAD;
exports.ANDROID = isAndroid;

/** @const {boolean} */
Blockly.utils.userAgent.IPOD;
exports.IPAD = isIPad;

/** @const {boolean} */
Blockly.utils.userAgent.IPHONE;
exports.IPOD = isIPod;

/** @const {boolean} */
Blockly.utils.userAgent.MAC;
exports.IPHONE = isIPhone;

/** @const {boolean} */
Blockly.utils.userAgent.TABLET;
exports.MAC = isMac;

/** @const {boolean} */
Blockly.utils.userAgent.MOBILE;
exports.TABLET = isTablet;

(function(raw) {
Blockly.utils.userAgent.raw = raw;
var rawUpper = Blockly.utils.userAgent.raw.toUpperCase();
/**
* Case-insensitive test of whether name is in the useragent string.
* @param {string} name Name to test.
* @return {boolean} True if name is present.
*/
function has(name) {
return rawUpper.indexOf(name.toUpperCase()) != -1;
}

// Browsers. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/browser.js
Blockly.utils.userAgent.IE = has('Trident') || has('MSIE');
Blockly.utils.userAgent.EDGE = has('Edge');
// Useragent for JavaFX:
// Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.44
// (KHTML, like Gecko) JavaFX/8.0 Safari/537.44
Blockly.utils.userAgent.JAVA_FX = has('JavaFX');
Blockly.utils.userAgent.CHROME = (has('Chrome') || has('CriOS')) &&
!Blockly.utils.userAgent.EDGE;

// Engines. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/engine.js
Blockly.utils.userAgent.WEBKIT = has('WebKit') &&
!Blockly.utils.userAgent.EDGE;
Blockly.utils.userAgent.GECKO = has('Gecko') &&
!Blockly.utils.userAgent.WEBKIT &&
!Blockly.utils.userAgent.IE &&
!Blockly.utils.userAgent.EDGE;

// Platforms. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/platform.js and
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/extra.js
Blockly.utils.userAgent.ANDROID = has('Android');
var maxTouchPoints = Blockly.utils.global['navigator'] &&
Blockly.utils.global['navigator']['maxTouchPoints'];
Blockly.utils.userAgent.IPAD = has('iPad') ||
has('Macintosh') && maxTouchPoints > 0;
Blockly.utils.userAgent.IPOD = has('iPod');
Blockly.utils.userAgent.IPHONE = has('iPhone') &&
!Blockly.utils.userAgent.IPAD && !Blockly.utils.userAgent.IPOD;
Blockly.utils.userAgent.MAC = has('Macintosh');

// Devices. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/device.js
Blockly.utils.userAgent.TABLET = Blockly.utils.userAgent.IPAD ||
(Blockly.utils.userAgent.ANDROID && !has('Mobile')) || has('Silk');
Blockly.utils.userAgent.MOBILE = !Blockly.utils.userAgent.TABLET &&
(Blockly.utils.userAgent.IPOD || Blockly.utils.userAgent.IPHONE ||
Blockly.utils.userAgent.ANDROID || has('IEMobile'));
})((Blockly.utils.global['navigator'] && Blockly.utils.global['navigator']['userAgent']) || '');
/** @const {boolean} */
exports.MOBILE = isMobile;
2 changes: 1 addition & 1 deletion tests/deps.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.