sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

merging changes

Browse source
This commit is contained in:
rlx 2011-09-03 02:12:44 +00:00
commit 182225ebc4
66 changed files with 206 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

23
source/Ox.UI/Ox.UI.js
View file

@ -9,6 +9,10 @@ Ox.load.UI = function(options, callback) {
}, options);
var browsers = [
{
name: 'Chrome Frame',
url: 'http://www.google.com/chromeframe/',
},
{
name: 'Chrome',
regexp: /Chrome\/(\d+)\./,
@ -26,15 +30,21 @@ Ox.load.UI = function(options, callback) {
regexp: /Version\/(\d+).*? Safari/,
url: 'http://www.apple.com/safari/',
version: 5
},
{
name: 'Internet Explorer',
url: 'http://windows.microsoft.com/en-US/internet-explorer/products/ie/home',
version: 9
}
],
browserSupported = false,
imageNames = {},
imageURLs = {},
isInternetExplorer = /MSIE/.test(navigator.userAgent),
loadingInterval;
browsers.forEach(function(browser) {
var match = browser.regexp.exec(navigator.userAgent);
var match = browser.regexp && browser.regexp.exec(navigator.userAgent);
if (match && match[1] >= browser.version) {
browserSupported = true;
}
@ -126,16 +136,19 @@ Ox.load.UI = function(options, callback) {
}
function showWarning() {
var counter = 0,
var counter = 0;
/*
message = 'Browser not supported, use ' + browsers.map(function(browser, i) {
return browser.name + (
i == browsers.length - 1 ? '.' :
i == browsers.length - 2 ? ' or' : ','
);
}).join(' ');
*/
div.addClass('OxError');
isInternetExplorer ? browsers.pop() : browsers.shift();
browsers.forEach(function(browser) {
browser.src = Ox.PATH + 'Ox.UI/png/browser' + browser.name + '128.png';
browser.src = Ox.PATH + 'Ox.UI/png/browser' + browser.name.replace(' ', '') + '128.png';
Ox.loadFile(browser.src, function() {
++counter == browsers.length && showIcons();
});
@ -151,7 +164,9 @@ Ox.load.UI = function(options, callback) {
var link = Ox.element('<a>')
.attr({
href: browser.url,
title: browser.name + ' ' + browser.version
title: isInternetExplorer
? (browser.name == 'Chrome Frame' ? 'Install' : 'Download') + ' ' + browser.name
: browser.name + ' ' + browser.version
})
.css({
position: 'absolute',