diff options
author | alecpl <alec@alec.pl> | 2011-11-18 14:44:48 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-11-18 14:44:48 +0000 |
commit | c994e0e7cd9f593eb21ff80c7c1ddbeaf2a1b12a (patch) | |
tree | 44bf85e3a9f96cd13fb82d263cbf068f317fb21c /program/js | |
parent | bdb649067d8cd5bdfa584a21d0a8664f8f89f2d3 (diff) |
- Applied fixes from trunk up to r5451
Diffstat (limited to 'program/js')
-rw-r--r-- | program/js/app.js | 2 | ||||
-rw-r--r-- | program/js/googiespell.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js index 5902b1d74..8b98a4268 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -5738,7 +5738,7 @@ function rcube_webmail() this.plain2html = function(plainText, id) { var lock = this.set_busy(true, 'converting'); - $(document.getElementById(id)).val('<pre>'+plainText+'</pre>'); + $(document.getElementById(id)).val(plainText ? '<pre>'+plainText+'</pre>' : ''); this.set_busy(false, null, lock); }; diff --git a/program/js/googiespell.js b/program/js/googiespell.js index e3fdf7d3b..96d612ca2 100644 --- a/program/js/googiespell.js +++ b/program/js/googiespell.js @@ -1,6 +1,8 @@ /* SpellCheck jQuery'fied spell checker based on GoogieSpell 4.0 + (which was published under GPL "version 2 or any later version") + Copyright (C) 2006 Amir Salihefendic Copyright (C) 2009 Aleksander Machniak Copyright (C) 2011 Kolab Systems AG |