shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

Feature #3748: Refactor getInternetExplorerVersion into a module

Browse Source
This commit is contained in:
Carlos Martín 2015-06-16 18:56:23 +02:00
parent 8c1acdc07b
commit b15026db9f
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sunstone/public/app/tabs/files-tab/form-panels/create.js
View File

@ -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;
}
});

16
src/sunstone/public/app/tabs/images-tab/form-panels/create.js
View File

@ -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;
}
});

23
src/sunstone/public/app/utils/browser-info.js Normal file
View File

@ -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
};
});