mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 02:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db

Browse source
This commit is contained in:
John McLear 2013-02-17 23:44:26 +00:00
commit 6d7e709ecb
14 changed files with 104 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/static/css/iframe_editor.css
View file

@ -177,6 +177,10 @@ p {
#overlaysdiv { position: absolute; left: -1000px; top: -1000px; }
/* Stops super long lines without being spaces such as aaaaaaaaaaaaaa*100 breaking the editor
Commented out because it stops IE from being able to render the document, crazy IE bug is crazy. */
/*
.ace-line{
overflow:hidden; /* Stops super long lines without being spaces such as aaaaaaaaaaaaaa*100 breaking the editor */
overflow:hidden;
}
*/

4
src/static/js/l10n.js
View file

@ -1,8 +1,8 @@
(function(document) {
// Set language for l10n
var language = document.cookie.match(/language=((\w{2,3})(-w+)?)/);
var language = document.cookie.match(/language=((\w{2,3})(-\w+)?)/);
if(language) language = language[1];
html10n.bind('indexed', function() {
html10n.localize([language, navigator.language, navigator.userLanguage, 'en'])
})