From db8110c70d40b4e8864292f94c19248bb5a63b67 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 09 Jun 2012 14:20:59 -0400
Subject: [PATCH] Display attachment icon for multipart/signed messages (#1488525)
---
program/js/common.js | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index 69ec28c..b6407c5 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -3,14 +3,15 @@
| 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 |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
*/
// Constants
@@ -52,6 +53,7 @@
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.ie9 = (this.dom && this.appver.indexOf('MSIE 9')>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);
@@ -102,30 +104,25 @@
{
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.safari || this.chrome)
+ classname += ' webkit';
if (document.documentElement)
document.documentElement.className += classname;
@@ -697,11 +694,9 @@
}
// Make getElementById() case-sensitive on IE
-if (bw.ie)
-{
+if (bw.ie) {
document._getElementById = document.getElementById;
- document.getElementById = function(id)
- {
+ document.getElementById = function(id) {
var i = 0, obj = document._getElementById(id);
if (obj && obj.id != id)
@@ -712,6 +707,39 @@
}
}
+// jQuery plugin to emulate HTML5 placeholder attributes on input elements
+jQuery.fn.placeholder = function(text) {
+ return this.each(function() {
+ var elem = $(this);
+ this.title = text;
+
+ if ('placeholder' in this) {
+ elem.attr('placeholder', text); // Try HTML5 placeholder attribute first
+ }
+ else { // Fallback to Javascript emulation of placeholder
+ 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);
+ });
+
+ if (this != document.activeElement) // Do not blur currently focused element
+ elem.blur();
+ }
+ });
+};
+
+
// 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.
// Base64 code from Tyler Akins -- http://rumkin.com
--
Gitblit v1.9.1