From b15026db9f4dadac9203a7c40b61a26227018aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 16 Jun 2015 18:56:23 +0200 Subject: [PATCH] Feature #3748: Refactor getInternetExplorerVersion into a module --- .../app/tabs/files-tab/form-panels/create.js | 16 ++----------- .../app/tabs/images-tab/form-panels/create.js | 16 ++----------- src/sunstone/public/app/utils/browser-info.js | 23 +++++++++++++++++++ 3 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 src/sunstone/public/app/utils/browser-info.js diff --git a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js index 702117d8d8..c1bb29be7b 100644 --- a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js @@ -11,6 +11,7 @@ define(function(require) { var Locale = require('utils/locale'); var Tips = require('utils/tips'); var ResourceSelect = require('utils/resource-select'); + var BrowserInfo = require('utils/browser-info'); var TemplateWizardHTML = require('hbs!./create/wizard'); var TemplateAdvancedHTML = require('hbs!./create/advanced'); @@ -114,7 +115,7 @@ define(function(require) { $('#path_file', context).click(); - if (_getInternetExplorerVersion() > -1) { + if (BrowserInfo.getInternetExplorerVersion() > -1) { $("#upload_file").attr("disabled", "disabled"); } else { that.uploader = new Resumable({ @@ -264,17 +265,4 @@ define(function(require) { return false; } - - function _getInternetExplorerVersion() { - // Returns the version of Internet Explorer or a -1 - // (indicating the use of another browser). - var rv = -1; // Return value assumes failure. - if (navigator.appName == 'Microsoft Internet Explorer') { - var ua = navigator.userAgent; - var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})"); - if (re.exec(ua) != null) - rv = parseFloat(RegExp.$1); - } - return rv; - } }); diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create.js index 8ccd5bfd87..54b16b35b2 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create.js @@ -12,6 +12,7 @@ define(function(require) { var Tips = require('utils/tips'); var ResourceSelect = require('utils/resource-select'); var CustomTagsTable = require('utils/custom-tags-table'); + var BrowserInfo = require('utils/browser-info'); var TemplateWizardHTML = require('hbs!./create/wizard'); var TemplateAdvancedHTML = require('hbs!./create/advanced'); @@ -138,7 +139,7 @@ define(function(require) { CustomTagsTable.setup(context); - if (_getInternetExplorerVersion() > -1) { + if (BrowserInfo.getInternetExplorerVersion() > -1) { $("#upload_image").attr("disabled", "disabled"); } else { that.uploader = new Resumable({ @@ -311,17 +312,4 @@ define(function(require) { return false; } - - function _getInternetExplorerVersion() { - // Returns the version of Internet Explorer or a -1 - // (indicating the use of another browser). - var rv = -1; // Return value assumes failure. - if (navigator.appName == 'Microsoft Internet Explorer') { - var ua = navigator.userAgent; - var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})"); - if (re.exec(ua) != null) - rv = parseFloat(RegExp.$1); - } - return rv; - } }); diff --git a/src/sunstone/public/app/utils/browser-info.js b/src/sunstone/public/app/utils/browser-info.js new file mode 100644 index 0000000000..a8e3020447 --- /dev/null +++ b/src/sunstone/public/app/utils/browser-info.js @@ -0,0 +1,23 @@ +define(function(require) { + + /** + * Returns the version of Internet Explorer or a -1 + * (indicating the use of another browser). + * @return {integer} version + */ + function _getInternetExplorerVersion() { + var rv = -1; // Return value assumes failure. + if (navigator.appName == 'Microsoft Internet Explorer') { + var ua = navigator.userAgent; + var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})"); + if (re.exec(ua) != null) + rv = parseFloat(RegExp.$1); + } + return rv; + } + + return { + 'getInternetExplorerVersion': _getInternetExplorerVersion + }; +}); +