From cead5c727147faac362e742aa7bcecf07f68cd99 Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Thu, 18 May 2006 17:24:42 -0400 Subject: [PATCH] Updated CHANGELOG --- program/js/common.js | 65 ++++++++++++++++++++++++++++++-- 1 files changed, 60 insertions(+), 5 deletions(-) diff --git a/program/js/common.js b/program/js/common.js index 5263a87..f9fb9c1 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -6,11 +6,11 @@ | Copyright (C) 2005, RoundCube Dev, - Switzerland | | Licensed under the GNU GPL | | | - | Modified: 19.08.2005 (tbr) | - | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | +-----------------------------------------------------------------------+ + + $Id$ */ @@ -47,8 +47,8 @@ this.ns4 = (this.ns && parseInt(this.ver)==4); this.ns6 = (this.ns && parseInt(this.vendver)==6); // (this.mz && this.ns) ? true : false; this.ns7 = (this.ns && parseInt(this.vendver)==7); // this.agent.indexOf('Netscape/7')>0); - this.safari = this.agent.toLowerCase().indexOf('safari')>0; - this.konq = (this.agent.toLowerCase().indexOf('konqueror')>0); + this.safari = (this.agent.toLowerCase().indexOf('safari')>0 || this.agent.toLowerCase().indexOf('applewebkit')>0); + this.konq = (this.agent.toLowerCase().indexOf('konqueror')>0); this.opera = (window.opera) ? true : false; this.opera5 = (this.opera5 && this.agent.indexOf('Opera 5')>0) ? true : false; @@ -58,11 +58,14 @@ if(this.opera && window.RegExp) this.vendver = (/opera(\s|\/)([0-9\.]+)/i.test(navigator.userAgent)) ? parseFloat(RegExp.$2) : -1; else if(!this.vendver && this.safari) - this.vendver = (/safari\/([0-9]+)/i.test(this.agent)) ? parseInt(RegExp.$1) : 0; + this.vendver = (/(safari|applewebkit)\/([0-9]+)/i.test(this.agent)) ? parseInt(RegExp.$2) : 0; else if((!this.vendver && this.mz) || this.agent.indexOf('Camino')>0) this.vendver = (/rv:([0-9\.]+)/.test(this.agent)) ? parseFloat(RegExp.$1) : 0; else if(this.ie && window.RegExp) this.vendver = (/msie\s+([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0; + else if(this.konq && window.RegExp) + this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0; + // get real language out of safari's user agent if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/i.test(this.agent))) @@ -78,6 +81,14 @@ (this.ie && this.win && this.vendver>=5.5) || this.safari); this.opacity = (this.mz || (this.ie && this.vendver>=5.5 && !this.opera) || (this.safari && this.vendver>=100)); this.cookies = navigator.cookieEnabled; + + // test for XMLHTTP support + this.xmlhttp_test = function() + { + var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}"); + this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test())) ? true : false; + return this.xmlhttp; + } } @@ -253,6 +264,19 @@ } +// check if input is a valid email address +function rcube_check_email(input, inline) + { + if (input && window.RegExp) + { + var reg_str = '([a-z0-9][-a-z0-9\.\+_&]*)\@(([-a-z0-9][\.]?)*[a-z0-9]\.[a-z]{2,9})'; + var reg1 = inline ? new RegExp(reg_str, 'i') : new RegExp('^'+reg_str+'$', 'i'); + var reg2 = /[\._\-]{2}/; + return reg1.test(input) && !reg2.test(input) ? true : false; + } + return false; + } + // find a value in a specific array and returns the index function find_in_array() @@ -339,5 +363,36 @@ return {x:iX, y:iY}; } + + +// cookie functions by GoogieSpell +function setCookie(name, value, expires, path, domain, secure) + { + var curCookie = name + "=" + escape(value) + + (expires ? "; expires=" + expires.toGMTString() : "") + + (path ? "; path=" + path : "") + + (domain ? "; domain=" + domain : "") + + (secure ? "; secure" : ""); + document.cookie = curCookie; + } + +function getCookie(name) + { + var dc = document.cookie; + var prefix = name + "="; + var begin = dc.indexOf("; " + prefix); + if (begin == -1) + { + begin = dc.indexOf(prefix); + if (begin != 0) return null; + } + else + begin += 2; + var end = document.cookie.indexOf(";", begin); + if (end == -1) + end = dc.length; + return unescape(dc.substring(begin + prefix.length, end)); + } + var bw = new roundcube_browser(); \ No newline at end of file -- Gitblit v1.9.1