From 490ec2f2712c6d90a03f1c16781dc89ab1c7a24c Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 22 Jun 2016 14:58:54 +0200
Subject: [PATCH] Another fix for https://github.com/martini/zammad/issues/176
 and https://github.com/martini/zammad/issues/155 related issues.

---
 .../app/lib/base/jquery.contenteditable.js    | 30 -------------------
 app/assets/stylesheets/zammad.scss            |  5 ----
 2 files changed, 35 deletions(-)

diff --git a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
index 2dea08d3a..dae383b8b 100644
--- a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
+++ b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
@@ -112,36 +112,6 @@
         }
       }
 
-      // return & space key being pressed
-      if (e.keyCode === 13 ) {
-
-        if (_this.browser === 'ff') {
-
-          // ff issue, inserts <br></br> right after contenteditable tag (still in ff47)
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=911201
-          if (node.parent().hasClass('js-textarea')) {
-            e.preventDefault()
-            document.execCommand('insertHTML', false, '<p></p>')
-            console.log('ff issue, inserts <br></br> -> <p></p>')
-            return
-          }
-
-          // ff issue, inserts <br></br> inside of <li> - not content can be inserted
-          // to reproduce
-          // 1. ctrl+alt+l
-          // 2. 1+enter, 2+enter, 3+enter, 4+enter
-          // 3. use arrows to move after 2, press enter, press arrow down, press enter
-          // 4. no content can be inserted anymore in this area
-          // see also https://github.com/martini/zammad/issues/176
-          if (node.context && node.context.localName == 'ul') {
-            e.preventDefault()
-            document.execCommand('insertHTML', false, '<p></p>')
-            console.log('ff issue, inserts <br></br> inside of <li> - not content can be inserted anymore in this area')
-            return
-          }
-        }
-      }
-
       // on zammad altKey + ctrlKey + i/b/u
       //  altKey + ctrlKey + u -> Toggles the current selection between underlined and not underlined
       //  altKey + ctrlKey + b -> Toggles the current selection between bold and non-bold
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index b0e4a8c1b..db5963196 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -51,11 +51,6 @@ p {
   }
 }
 
-ul {
-  padding-left: 0;
-  list-style-position: inside;
-}
-
 h3 + .description {
   margin-top: 0;
 }