From e6b2a91ed3ed6b6dd1b80cdaead6865b81917370 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 20 Feb 2017 14:47:13 +0100
Subject: [PATCH] ie editor bugs

---
 app/coffee/modules/common.coffee                        | 6 +-----
 app/modules/components/wysiwyg/wysiwyg.directive.coffee | 9 +++++++--
 app/modules/components/wysiwyg/wysiwyg.scss             | 1 -
 app/modules/components/wysiwyg/wysiwyg.service.coffee   | 3 +--
 app/partials/common/components/wysiwyg-toolbar.jade     | 8 ++++----
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee
index 6499272d..11455fa6 100644
--- a/app/coffee/modules/common.coffee
+++ b/app/coffee/modules/common.coffee
@@ -378,11 +378,7 @@ Svg = () ->
     <svg class="{{ 'icon ' + svgIcon }}">
         <use xlink:href="" ng-attr-xlink:href="{{ '#' + svgIcon }}">
             <title ng-if="svgTitle">{{svgTitle}}</title>
-            <title
-                ng-if="svgTitleTranslate"
-                translate="{{svgTitleTranslate}}"
-                translate-values="{{svgTitleTranslateValues}}"
-                ></title>
+            <title ng-if="svgTitleTranslate">{{svgTitleTranslate | translate: svgTitleTranslateValues}}</title>
         </use>
     </svg>
     """
diff --git a/app/modules/components/wysiwyg/wysiwyg.directive.coffee b/app/modules/components/wysiwyg/wysiwyg.directive.coffee
index f937f2d6..927a767f 100644
--- a/app/modules/components/wysiwyg/wysiwyg.directive.coffee
+++ b/app/modules/components/wysiwyg/wysiwyg.directive.coffee
@@ -148,6 +148,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
         $scope.required = !!$attrs.$attr.required
         $scope.editMode = isEditOnly || false
         $scope.mode = $storage.get('editor-mode', 'html')
+        $scope.markdown = ''
 
         wysiwygService.loadEmojis()
 
@@ -166,7 +167,9 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
             $scope.mode = mode
             mediumInstance.trigger('editableBlur', {}, editorMedium[0])
 
-        $scope.save = () ->
+        $scope.save = (e) ->
+            e.preventDefault() if e
+
             if $scope.mode == 'html'
                 updateMarkdownWithCurrentHtml()
 
@@ -179,7 +182,9 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
 
             return
 
-        $scope.cancel = () ->
+        $scope.cancel = (e) ->
+            e.preventDefault() if e
+
             if !isEditOnly
                 $scope.editMode = false
 
diff --git a/app/modules/components/wysiwyg/wysiwyg.scss b/app/modules/components/wysiwyg/wysiwyg.scss
index ad20e9fd..4bfce409 100644
--- a/app/modules/components/wysiwyg/wysiwyg.scss
+++ b/app/modules/components/wysiwyg/wysiwyg.scss
@@ -78,7 +78,6 @@
     }
     p {
         margin-bottom: 1rem;
-        max-width: 80rem;
         word-wrap: break-word;
     }
     .codehilite {
diff --git a/app/modules/components/wysiwyg/wysiwyg.service.coffee b/app/modules/components/wysiwyg/wysiwyg.service.coffee
index 84b1069b..67236ffa 100644
--- a/app/modules/components/wysiwyg/wysiwyg.service.coffee
+++ b/app/modules/components/wysiwyg/wysiwyg.service.coffee
@@ -66,8 +66,7 @@ class WysiwygService
         return text
 
     removeTrailingListBr: (text) ->
-        regex = new RegExp(/<li>(.*?)<br><\/li>/, 'g')
-        return text.replace(regex, '<li>$1</li>')
+        return text.replace(/<li>(.*?)<br><\/li>/g, '<li>$1</li>')
 
     getMarkdown: (html) ->
         # https://github.com/yabwe/medium-editor/issues/543
diff --git a/app/partials/common/components/wysiwyg-toolbar.jade b/app/partials/common/components/wysiwyg-toolbar.jade
index af77eedd..67ca9673 100644
--- a/app/partials/common/components/wysiwyg-toolbar.jade
+++ b/app/partials/common/components/wysiwyg-toolbar.jade
@@ -8,8 +8,8 @@
     )
 
     textarea.markdown.e2e-markdown-textarea(
-        placeholder="{{placeholder}}"
-        ng-change="changeMarkdown()"
+        ng-attr-placeholder="{{placeholder}}"
+        ng-change="changeMarkdown(markdown)"
         ng-model="markdown"
         ng-show="mode == 'markdown' && editMode"
     )
@@ -47,12 +47,12 @@
         ng-class="{disabled: required && !markdown.length}"
         tg-loading="saving"
         href="#",
-        ng-click="save()"
+        ng-click="save($event)"
     )
         tg-svg(svg-icon="icon-save")
     a.e2e-cancel-editor(
         href="#",
-        ng-click="cancel()"
+        ng-click="cancel($event)"
         title="{{ 'COMMON.CANCEL' | translate }}"
     )
         tg-svg(svg-icon="icon-close")