From 93d58b93be53fdefa62e4e3dbe4316799bbab6ba Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 17 Feb 2013 17:13:02 +0000
Subject: Update src/static/css/iframe_editor.css

---
 src/static/css/iframe_editor.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/static')

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; 
 }
+*/
-- 
cgit v1.2.3


From 9ca22754328c96b98b7ae8d98e5f1ab0f6b9e291 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 17 Feb 2013 21:35:46 +0100
Subject: Fixes #1498: Two-part locale specs in lang cookie wouldn't be read
 correctly

---
 src/static/js/l10n.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/static')

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'])
   })
-- 
cgit v1.2.3