diff options
| author | John McLear <john@mclear.co.uk> | 2013-02-17 23:44:26 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2013-02-17 23:44:26 +0000 |
| commit | 6d7e709ecb4641a48a0ef543d44421b1289424e6 (patch) | |
| tree | b536add1de5d47294ecc4cdcf26d947e559e7bcb /src/static | |
| parent | c723aefdfeb1e690282d5a5e01de7531f53a42f3 (diff) | |
| parent | 26699618ac44238a08d44b99e7e2a3b77978bb33 (diff) | |
| download | etherpad-lite-6d7e709ecb4641a48a0ef543d44421b1289424e6.zip | |
Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db
Diffstat (limited to 'src/static')
| -rw-r--r-- | src/static/css/iframe_editor.css | 6 | ||||
| -rw-r--r-- | src/static/js/l10n.js | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index dd7452b2..3e19cbbe 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -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; } +*/ diff --git a/src/static/js/l10n.js b/src/static/js/l10n.js index a67a7c1a..c79ea706 100644 --- a/src/static/js/l10n.js +++ b/src/static/js/l10n.js @@ -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']) }) |