mirror of
https://github.com/google/blockly.git
synced 2026-01-06 08:30:13 +01:00
Migrate core/utils/useragent.js to goog.module syntax (#5435)
* Migrate core/utils/useragent.js to ES6 const/let * Migrate core/utils/useragent.js to goog.module * Migrate core/utils/useragent.js named requires * clang-format core/utils/useragent.js
This commit is contained in:
Christopher Allen
committed by
GitHub
GitHub
parent
c31895dc60
commit
2d89a36e7d
@@ -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;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.EDGE;
|
||||
/** @type {boolean} */
|
||||
let isIe;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.JAVA_FX;
|
||||
/** @type {boolean} */
|
||||
let isEdge;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.CHROME;
|
||||
/** @type {boolean} */
|
||||
let isJavaFx;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.WEBKIT;
|
||||
/** @type {boolean} */
|
||||
let isChrome;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.GECKO;
|
||||
/** @type {boolean} */
|
||||
let isWebKit;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.ANDROID;
|
||||
/** @type {boolean} */
|
||||
let isGecko;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.IPAD;
|
||||
/** @type {boolean} */
|
||||
let isAndroid;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.IPOD;
|
||||
/** @type {boolean} */
|
||||
let isIPad;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.IPHONE;
|
||||
/** @type {boolean} */
|
||||
let isIPod;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.MAC;
|
||||
/** @type {boolean} */
|
||||
let isIPhone;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.TABLET;
|
||||
/** @type {boolean} */
|
||||
let isMac;
|
||||
|
||||
/** @const {boolean} */
|
||||
Blockly.utils.userAgent.MOBILE;
|
||||
/** @type {boolean} */
|
||||
let isTablet;
|
||||
|
||||
/** @type {boolean} */
|
||||
let isMobile;
|
||||
|
||||
(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;
|
||||
}
|
||||
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
|
||||
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;
|
||||
// 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
|
||||
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;
|
||||
// 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
|
||||
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');
|
||||
// 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
|
||||
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']) || '');
|
||||
// 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} */
|
||||
exports.IE = isIe;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.EDGE = isEdge;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.JavaFx = isJavaFx;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.CHROME = isChrome;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.WEBKIT = isWebKit;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.GECKO = isGecko;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.ANDROID = isAndroid;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.IPAD = isIPad;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.IPOD = isIPod;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.IPHONE = isIPhone;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.MAC = isMac;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.TABLET = isTablet;
|
||||
|
||||
/** @const {boolean} */
|
||||
exports.MOBILE = isMobile;
|
||||
|
||||
@@ -228,7 +228,7 @@ goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Block
|
||||
goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
|
||||
goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
|
||||
goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
|
||||
|
||||
Reference in New Issue
Block a user