diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-31 20:20:03 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-31 20:20:03 +0200 |
| commit | 04a56cfca0e999a5af07545de51c84258d0c1288 (patch) | |
| tree | d35247416d559648dbabce2acd9a81d2dd9f8a58 /chimere/static | |
| parent | 741baf714a56ec15e38f42a5aef01868d3b80c6a (diff) | |
| parent | d768ed653a435c2ddd8fc0c1bfec72a0ec5e5a48 (diff) | |
| download | Chimère-04a56cfca0e999a5af07545de51c84258d0c1288.tar.bz2 Chimère-04a56cfca0e999a5af07545de51c84258d0c1288.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/static/chimere/js/utils.js
Diffstat (limited to 'chimere/static')
| -rw-r--r-- | chimere/static/chimere/css/forms.css | 5 | ||||
| -rw-r--r-- | chimere/static/chimere/js/textareas.js | 1 | ||||
| -rw-r--r-- | chimere/static/chimere/js/utils.js | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/chimere/static/chimere/css/forms.css b/chimere/static/chimere/css/forms.css index 5740a62..46acdb9 100644 --- a/chimere/static/chimere/css/forms.css +++ b/chimere/static/chimere/css/forms.css @@ -124,3 +124,8 @@ div.bottomform{ display:None } +.object-tools{ + width:90px; + overflow:hidden; + height:16px; +} diff --git a/chimere/static/chimere/js/textareas.js b/chimere/static/chimere/js/textareas.js index fec83b8..048718d 100644 --- a/chimere/static/chimere/js/textareas.js +++ b/chimere/static/chimere/js/textareas.js @@ -20,6 +20,7 @@ See the file COPYING for details. tinyMCE.init({ mode : "textareas", theme : "advanced", + editor_selector : "mceEditor", relative_urls : false, theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link", theme_advanced_buttons2 : "", diff --git a/chimere/static/chimere/js/utils.js b/chimere/static/chimere/js/utils.js index e8981c6..460e843 100644 --- a/chimere/static/chimere/js/utils.js +++ b/chimere/static/chimere/js/utils.js @@ -241,3 +241,11 @@ function isValidEmailAddress(emailAddress) { var pattern = new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i); return pattern.test(emailAddress); }; + +/* remove multiple, leading or trailing spaces */ +function trim(s) { + s = s.replace(/(^\s*)|(\s*$)/gi,""); + s = s.replace(/[ ]{2,}/gi," "); + s = s.replace(/\n /,"\n"); + return s; +} |