From 77b5d7ee304a688a2eb115ce04b460b43c0dd700 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Sun, 22 May 2016 08:43:54 -0400 Subject: [PATCH] Fix priority icon(s) position --- program/js/common.js | 553 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 292 insertions(+), 261 deletions(-) diff --git a/program/js/common.js b/program/js/common.js index 69ec28c..158f8cc 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -1,23 +1,35 @@ -/* - +-----------------------------------------------------------------------+ - | Roundcube common js library | - | | - | This file is part of the Roundcube web development suite | - | Copyright (C) 2005-2007, The Roundcube Dev Team | - | Licensed under the GNU GPL | - | | - +-----------------------------------------------------------------------+ - | Author: Thomas Bruederli <roundcube@gmail.com> | - +-----------------------------------------------------------------------+ - - $Id$ -*/ +/** + * Roundcube common js library + * + * This file is part of the Roundcube Webmail client + * + * @licstart The following is the entire license notice for the + * JavaScript code in this file. + * + * Copyright (c) 2005-2014, The Roundcube Dev Team + * + * The JavaScript code in this page is free software: you can + * redistribute it and/or modify it under the terms of the GNU + * General Public License (GNU GPL) as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) + * any later version. The code is distributed WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU GPL for more details. + * + * As additional permission under GNU GPL version 3 section 7, you + * may distribute non-source (e.g., minimized or compacted) forms of + * that code without the copy of the GNU GPL normally required by + * section 4, provided you include this license notice and a URL + * through which recipients can access the Corresponding Source. + * + * @licend The above is the entire license notice + * for the JavaScript code in this file. + */ // Constants var CONTROL_KEY = 1; var SHIFT_KEY = 2; var CONTROL_SHIFT_KEY = 3; - /** * Default browser check class @@ -27,8 +39,6 @@ { var n = navigator; - this.ver = parseFloat(n.appVersion); - this.appver = n.appVersion; this.agent = n.userAgent; this.agent_lc = n.userAgent.toLowerCase(); this.name = n.appName; @@ -36,63 +46,63 @@ this.vendver = n.vendorSub ? parseFloat(n.vendorSub) : 0; this.product = n.product ? n.product : ''; this.platform = String(n.platform).toLowerCase(); - this.lang = (n.language) ? n.language.substring(0,2) : - (n.browserLanguage) ? n.browserLanguage.substring(0,2) : - (n.systemLanguage) ? n.systemLanguage.substring(0,2) : 'en'; + this.lang = n.language ? n.language.substring(0,2) : + n.browserLanguage ? n.browserLanguage.substring(0,2) : + n.systemLanguage ? n.systemLanguage.substring(0,2) : 'en'; - this.win = (this.platform.indexOf('win') >= 0); - this.mac = (this.platform.indexOf('mac') >= 0); - this.linux = (this.platform.indexOf('linux') >= 0); - this.unix = (this.platform.indexOf('unix') >= 0); + this.win = this.platform.indexOf('win') >= 0; + this.mac = this.platform.indexOf('mac') >= 0; + this.linux = this.platform.indexOf('linux') >= 0; + this.unix = this.platform.indexOf('unix') >= 0; this.dom = document.getElementById ? true : false; - this.dom2 = (document.addEventListener && document.removeEventListener); + this.dom2 = document.addEventListener && document.removeEventListener; - this.ie = (document.all && !window.opera); - this.ie4 = (this.ie && !this.dom); - this.ie5 = (this.dom && this.appver.indexOf('MSIE 5')>0); - this.ie8 = (this.dom && this.appver.indexOf('MSIE 8')>0); - this.ie7 = (this.dom && this.appver.indexOf('MSIE 7')>0); - this.ie6 = (this.dom && !this.ie8 && !this.ie7 && this.appver.indexOf('MSIE 6')>0); + this.webkit = this.agent_lc.indexOf('applewebkit') > 0; + this.ie = (document.all && !window.opera) || (this.win && this.agent_lc.indexOf('trident/') > 0); - this.ns = ((this.ver < 5 && this.name == 'Netscape') || (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0)); - this.chrome = (this.agent_lc.indexOf('chrome') > 0); - this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent_lc.indexOf('applewebkit') > 0)); - this.mz = (this.dom && !this.ie && !this.ns && !this.chrome && !this.safari && this.agent.indexOf('Mozilla') >= 0); - this.konq = (this.agent_lc.indexOf('konqueror') > 0); - this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0); - this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0); - this.opera = window.opera ? true : false; + if (this.ie) { + this.ie7 = n.appVersion.indexOf('MSIE 7') > 0; + this.ie8 = n.appVersion.indexOf('MSIE 8') > 0; + this.ie9 = n.appVersion.indexOf('MSIE 9') > 0; + } + else if (window.opera) { + this.opera = true; // Opera < 15 + this.vendver = opera.version(); + } + else { + this.chrome = this.agent_lc.indexOf('chrome') > 0; + this.opera = this.webkit && this.agent.indexOf(' OPR/') > 0; // Opera >= 15 + this.safari = !this.chrome && !this.opera && (this.webkit || this.agent_lc.indexOf('safari') > 0); + this.konq = this.agent_lc.indexOf('konqueror') > 0; + this.mz = this.dom && !this.chrome && !this.safari && !this.konq && !this.opera && this.agent.indexOf('Mozilla') >= 0; + this.iphone = this.safari && (this.agent_lc.indexOf('iphone') > 0 || this.agent_lc.indexOf('ipod') > 0); + this.ipad = this.safari && this.agent_lc.indexOf('ipad') > 0; + } - if (this.opera && window.RegExp) - this.vendver = (/opera(\s|\/)([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$2) : -1; - else if (this.chrome && window.RegExp) - this.vendver = (/chrome\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0; - else if (!this.vendver && this.safari) - this.vendver = (/(safari|applewebkit)\/([0-9]+)/.test(this.agent_lc)) ? 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\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0; - else if (this.konq && window.RegExp) - this.vendver = (/khtml\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0; + if (!this.vendver) { + // common version strings + this.vendver = /(opera|opr|khtml|chrome|safari|applewebkit|msie)(\s|\/)([0-9\.]+)/.test(this.agent_lc) ? parseFloat(RegExp.$3) : 0; + + // any other (Mozilla, Camino, IE>=11) + if (!this.vendver) + this.vendver = /rv:([0-9\.]+)/.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}\)/.test(this.agent_lc))) this.lang = RegExp.$1; - this.dhtml = ((this.ie4 && this.win) || this.ie5 || this.ie6 || this.ns4 || this.mz); - this.vml = (this.win && this.ie && this.dom && !this.opera); - this.pngalpha = (this.mz || (this.opera && this.vendver >= 6) || (this.ie && this.mac && this.vendver >= 5) || - (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.tablet = /ipad|android|xoom|sch-i800|playbook|tablet|kindle/i.test(this.agent_lc); + this.mobile = /iphone|ipod|blackberry|iemobile|opera mini|opera mobi|mobile/i.test(this.agent_lc); + this.touch = this.mobile || this.tablet; this.cookies = n.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())); + this.xmlhttp = window.XMLHttpRequest || (('ActiveXObject' in window) && activeX_test()); return this.xmlhttp; }; @@ -102,30 +112,30 @@ { var classname = ' js'; - if (this.ie) { - classname += ' ie'; - if (this.ie5) - classname += ' ie5'; - else if (this.ie6) - classname += ' ie6'; - else if (this.ie7) - classname += ' ie7'; - else if (this.ie8) - classname += ' ie8'; - } + if (this.ie) + classname += ' ie ie'+parseInt(this.vendver); else if (this.opera) classname += ' opera'; else if (this.konq) classname += ' konqueror'; else if (this.safari) - classname += ' safari'; - - if (this.chrome) classname += ' chrome'; - else if (this.iphone) + else if (this.chrome) + classname += ' chrome'; + else if (this.mz) + classname += ' mozilla'; + + if (this.iphone) classname += ' iphone'; else if (this.ipad) classname += ' ipad'; + else if (this.webkit) + classname += ' webkit'; + + if (this.mobile) + classname += ' mobile'; + if (this.tablet) + classname += ' tablet'; if (document.documentElement) document.documentElement.className += classname; @@ -212,7 +222,7 @@ p.element = document; if (!p.object._rc_events) - p.object._rc_events = []; + p.object._rc_events = {}; var key = p.event + '*' + p.method; if (!p.object._rc_events[key]) @@ -250,19 +260,45 @@ }, /** - * Prevent event propagation and bubbeling + * Prevent event propagation and bubbling */ cancel: function(evt) { var e = evt ? evt : window.event; + if (e.preventDefault) e.preventDefault(); + else + e.returnValue = false; + if (e.stopPropagation) e.stopPropagation(); e.cancelBubble = true; - e.returnValue = false; + return false; +}, + +/** + * Determine whether the given event was trigered from keyboard + */ +is_keyboard: function(e) +{ + return e && ( + (e.pointerType !== undefined && e.pointerType !== 'mouse') || // IE 11+ + (e.mozInputSource && e.mozInputSource == e.MOZ_SOURCE_KEYBOARD) || // Firefox + (e.offsetX === 0 && e.offsetY === 0) || // Opera + (!e.pageX && (e.pageY || 0) <= 0 && !e.clientX && (e.clientY || 0) <= 0) || // others + (bw.ie && rcube_event._last_keyboard_event && rcube_event._last_keyboard_event.target == e.target) // hack for IE <= 10 + ); +}, + +/** + * Accept event if triggered from keyboard action (e.g. <Enter>) + */ +keyboard_only: function(e) +{ + return rcube_event.is_keyboard(e) ? true : rcube_event.cancel(e); }, touchevent: function(e) @@ -288,7 +324,6 @@ * * @param {String} Event name * @param {Function} Handler function - * @return Listener ID (used to remove this handler later on) */ addEventListener: function(evt, func, obj) { @@ -297,8 +332,9 @@ if (!this._events[evt]) this._events[evt] = []; - var e = {func:func, obj:obj ? obj : window}; - this._events[evt][this._events[evt].length] = e; + this._events[evt].push({func:func, obj:obj ? obj : window}); + + return this; // chainable }, /** @@ -326,13 +362,17 @@ triggerEvent: function(evt, e) { var ret, h; + if (e === undefined) e = this; else if (typeof e === 'object') e.event = evt; - if (this._events && this._events[evt] && !this._event_exec) { - this._event_exec = true; + if (!this._event_exec) + this._event_exec = {}; + + if (this._events && this._events[evt] && !this._event_exec[evt]) { + this._event_exec[evt] = true; for (var i=0; i < this._events[evt].length; i++) { if ((h = this._events[evt][i])) { if (typeof h.func === 'function') @@ -355,7 +395,8 @@ } } - this._event_exec = false; + delete this._event_exec[evt]; + if (e.event) { try { delete e.event; @@ -371,117 +412,6 @@ }; // end rcube_event_engine.prototype - -/** - * Roundcube generic layer (floating box) class - * - * @constructor - */ -function rcube_layer(id, attributes) -{ - this.name = id; - - // create a new layer in the current document - this.create = function(arg) - { - var l = (arg.x) ? arg.x : 0, - t = (arg.y) ? arg.y : 0, - w = arg.width, - h = arg.height, - z = arg.zindex, - vis = arg.vis, - parent = arg.parent, - obj = document.createElement('DIV'); - - obj.id = this.name; - obj.style.position = 'absolute'; - obj.style.visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden'; - obj.style.left = l+'px'; - obj.style.top = t+'px'; - if (w) - obj.style.width = w.toString().match(/\%$/) ? w : w+'px'; - if (h) - obj.style.height = h.toString().match(/\%$/) ? h : h+'px'; - if (z) - obj.style.zIndex = z; - - if (parent) - parent.appendChild(obj); - else - document.body.appendChild(obj); - - this.elm = obj; - }; - - // create new layer - if (attributes != null) { - this.create(attributes); - this.name = this.elm.id; - } - else // just refer to the object - this.elm = document.getElementById(id); - - if (!this.elm) - return false; - - - // ********* layer object properties ********* - - this.css = this.elm.style; - this.event = this.elm; - this.width = this.elm.offsetWidth; - this.height = this.elm.offsetHeight; - this.x = parseInt(this.elm.offsetLeft); - this.y = parseInt(this.elm.offsetTop); - this.visible = (this.css.visibility=='visible' || this.css.visibility=='show' || this.css.visibility=='inherit') ? true : false; - - - // ********* layer object methods ********* - - // move the layer to a specific position - this.move = function(x, y) - { - this.x = x; - this.y = y; - this.css.left = Math.round(this.x)+'px'; - this.css.top = Math.round(this.y)+'px'; - }; - - // change the layers width and height - this.resize = function(w,h) - { - this.css.width = w+'px'; - this.css.height = h+'px'; - this.width = w; - this.height = h; - }; - - // show or hide the layer - this.show = function(a) - { - if(a == 1) { - this.css.visibility = 'visible'; - this.visible = true; - } - else if(a == 2) { - this.css.visibility = 'inherit'; - this.visible = true; - } - else { - this.css.visibility = 'hidden'; - this.visible = false; - } - }; - - // write new content into a Layer - this.write = function(cont) - { - this.elm.innerHTML = cont; - }; - -}; - - // check if input is a valid email address // By Cal Henderson <cal@iamcal.com> // http://code.iamcal.com/php/rfc822/ @@ -493,12 +423,15 @@ atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+', quoted_pair = '\\x5c[\\x00-\\x7f]', quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22', + ipv4 = '\\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\\]', + ipv6 = '\\[IPv6:[0-9a-f:.]+\\]', + ip_addr = '(' + ipv4 + ')|(' + ipv6 + ')', // Use simplified domain matching, because we need to allow Unicode characters here // So, e-mail address should be validated also on server side after idn_to_ascii() use //domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d', //sub_domain = '('+atom+'|'+domain_literal+')', // allow punycode/unicode top-level domain - domain = '([^@\\x2e]+\\x2e)+([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})', + domain = '(('+ip_addr+')|(([^@\\x2e]+\\x2e)+([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})))', // ICANN e-mail test (http://idn.icann.org/E-mail_test) icann_domains = [ '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631', @@ -515,7 +448,7 @@ ], icann_addr = 'mailtest\\x40('+icann_domains.join('|')+')', word = '('+atom+'|'+quoted_string+')', - delim = '[,;\s\n]', + delim = '[,;\\s\\n]', local_part = word+'(\\x2e'+word+')*', addr_spec = '(('+local_part+'\\x40'+domain+')|('+icann_addr+'))', reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i'); @@ -526,7 +459,6 @@ return false; }; - // recursively copy an object function rcube_clone_object(obj) { @@ -534,7 +466,7 @@ for (var key in obj) { if (obj[key] && typeof obj[key] === 'object') - out[key] = clone_object(obj[key]); + out[key] = rcube_clone_object(obj[key]); else out[key] = obj[key]; } @@ -560,21 +492,25 @@ function rcube_find_object(id, d) { var n, f, obj, e; - if(!d) d = document; - if(d.getElementsByName && (e = d.getElementsByName(id))) + if (!d) d = document; + + if (d.getElementById) + if (obj = d.getElementById(id)) + return obj; + + if (!obj && d.getElementsByName && (e = d.getElementsByName(id))) obj = e[0]; - if(!obj && d.getElementById) - obj = d.getElementById(id); - if(!obj && d.all) + + if (!obj && d.all) obj = d.all[id]; - if(!obj && d.images.length) + if (!obj && d.images.length) obj = d.images[id]; if (!obj && d.forms.length) { for (f=0; f<d.forms.length; f++) { - if(d.forms[f].name == id) + if (d.forms[f].name == id) obj = d.forms[f]; else if(d.forms[f].elements[id]) obj = d.forms[f].elements[id]; @@ -582,7 +518,8 @@ } if (!obj && d.layers) { - if (d.layers[id]) obj = d.layers[id]; + if (d.layers[id]) + obj = d.layers[id]; for (n=0; !obj && n<d.layers.length; n++) obj = rcube_find_object(id, d.layers[n].document); } @@ -596,8 +533,8 @@ var mouse = rcube_event.get_mouse_pos(ev), pos = $(obj).offset(); - return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) && - (mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight))); + return (mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) && + (mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)); }; @@ -609,6 +546,7 @@ (path ? "; path=" + path : "") + (domain ? "; domain=" + domain : "") + (secure ? "; secure" : ""); + document.cookie = curCookie; }; @@ -634,38 +572,9 @@ return unescape(dc.substring(begin + prefix.length, end)); }; +// deprecated aliases, to be removed, use rcmail.set_cookie/rcmail.get_cookie roundcube_browser.prototype.set_cookie = setCookie; roundcube_browser.prototype.get_cookie = getCookie; - -// tiny replacement for Firebox functionality -function rcube_console() -{ - this.log = function(msg) - { - var box = rcube_find_object('dbgconsole'); - - if (box) { - if (msg.charAt(msg.length-1)=='\n') - msg += '--------------------------------------\n'; - else - msg += '\n--------------------------------------\n'; - - // Konqueror doesn't allow to just change the value of hidden element - if (bw.konq) { - box.innerText += msg; - box.value = box.innerText; - } else - box.value += msg; - } - }; - - this.reset = function() - { - var box = rcube_find_object('dbgconsole'); - if (box) - box.innerText = box.value = ''; - }; -}; var bw = new roundcube_browser(); bw.set_html_class(); @@ -696,27 +605,138 @@ return tzo; } -// Make getElementById() case-sensitive on IE -if (bw.ie) -{ - document._getElementById = document.getElementById; - document.getElementById = function(id) - { - var i = 0, obj = document._getElementById(id); - - if (obj && obj.id != id) - while ((obj = document.all[i]) && obj.id != id) - i++; - - return obj; - } +// define String's startsWith() method for old browsers +if (!String.prototype.startsWith) { + String.prototype.startsWith = function(search, position) { + position = position || 0; + return this.slice(position, search.length) === search; + }; } -// This code was written by Tyler Akins and has been placed in the -// public domain. It would be nice if you left this header intact. +// array utility function +jQuery.last = function(arr) { + return arr && arr.length ? arr[arr.length-1] : undefined; +} + +// jQuery plugin to emulate HTML5 placeholder attributes on input elements +jQuery.fn.placeholder = function(text) { + return this.each(function() { + var active = false, elem = $(this); + this.title = text; + + // Try HTML5 placeholder attribute first + if ('placeholder' in this) { + elem.attr('placeholder', text); + } + // Fallback to Javascript emulation of placeholder + else { + this._placeholder = text; + elem.blur(function(e) { + if ($.trim(elem.val()) == "") + elem.val(text); + elem.triggerHandler('change'); + }) + .focus(function(e) { + if ($.trim(elem.val()) == text) + elem.val(""); + elem.triggerHandler('change'); + }) + .change(function(e) { + var active = elem.val() == text; + elem[(active ? 'addClass' : 'removeClass')]('placeholder').attr('spellcheck', active); + }); + + // Do not blur currently focused element (catch exception: #1489008) + try { active = this == document.activeElement; } catch(e) {} + if (!active) + elem.blur(); + } + }); +}; + +// function to parse query string into an object +rcube_parse_query = function(query) +{ + if (!query) + return {}; + + var params = {}, e, k, v, + re = /([^&=]+)=?([^&]*)/g, + decodeRE = /\+/g, // Regex for replacing addition symbol with a space + decode = function (str) { return decodeURIComponent(str.replace(decodeRE, ' ')); }; + + query = query.replace(/\?/, ''); + + while (e = re.exec(query)) { + k = decode(e[1]); + v = decode(e[2]); + + if (k.substring(k.length - 2) === '[]') { + k = k.substring(0, k.length - 2); + (params[k] || (params[k] = [])).push(v); + } + else + params[k] = v; + } + + return params; +}; + + // Base64 code from Tyler Akins -- http://rumkin.com var Base64 = (function () { var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + + // private method for UTF-8 encoding + var utf8_encode = function(string) { + string = string.replace(/\r\n/g, "\n"); + var utftext = ''; + + for (var n = 0; n < string.length; n++) { + var c = string.charCodeAt(n); + + if (c < 128) { + utftext += String.fromCharCode(c); + } + else if(c > 127 && c < 2048) { + utftext += String.fromCharCode((c >> 6) | 192); + utftext += String.fromCharCode((c & 63) | 128); + } + else { + utftext += String.fromCharCode((c >> 12) | 224); + utftext += String.fromCharCode(((c >> 6) & 63) | 128); + utftext += String.fromCharCode((c & 63) | 128); + } + } + + return utftext; + }; + + // private method for UTF-8 decoding + var utf8_decode = function (utftext) { + var i = 0, string = '', c = c2 = c3 = 0; + + while (i < utftext.length) { + c = utftext.charCodeAt(i); + if (c < 128) { + string += String.fromCharCode(c); + i++; + } + else if (c > 191 && c < 224) { + c2 = utftext.charCodeAt(i + 1); + string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); + i += 2; + } + else { + c2 = utftext.charCodeAt(i + 1); + c3 = utftext.charCodeAt(i + 2); + string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); + i += 3; + } + } + + return string; + }; var obj = { /** @@ -724,12 +744,19 @@ * @param {String} input The string to encode in base64. */ encode: function (input) { - if (typeof(window.btoa) === 'function') - return btoa(input); + // encode UTF8 as btoa() may fail on some characters + input = utf8_encode(input); + + if (typeof(window.btoa) === 'function') { + try { + return btoa(input); + } + catch (e) {}; + } var chr1, chr2, chr3, enc1, enc2, enc3, enc4, i = 0, output = '', len = input.length; - do { + while (i < len) { chr1 = input.charCodeAt(i++); chr2 = input.charCodeAt(i++); chr3 = input.charCodeAt(i++); @@ -747,7 +774,7 @@ output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4); - } while (i < len); + } return output; }, @@ -757,8 +784,12 @@ * @param {String} input The string to decode. */ decode: function (input) { - if (typeof(window.atob) === 'function') - return atob(input); + if (typeof(window.atob) === 'function') { + try { + return utf8_decode(atob(input)); + } + catch (e) {}; + } var chr1, chr2, chr3, enc1, enc2, enc3, enc4, len, i = 0, output = ''; @@ -766,7 +797,7 @@ input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); len = input.length; - do { + while (i < len) { enc1 = keyStr.indexOf(input.charAt(i++)); enc2 = keyStr.indexOf(input.charAt(i++)); enc3 = keyStr.indexOf(input.charAt(i++)); @@ -782,9 +813,9 @@ output = output + String.fromCharCode(chr2); if (enc4 != 64) output = output + String.fromCharCode(chr3); - } while (i < len); + } - return output; + return utf8_decode(output); } }; -- Gitblit v1.9.1