From ba427c220ab46804b57a4c73b60103170992539c Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 29 Mar 2017 15:27:26 +0200 Subject: [PATCH 1/4] [Backport] Fixing empty mentions box style --- app/modules/components/wysiwyg/wysiwyg.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/modules/components/wysiwyg/wysiwyg.scss b/app/modules/components/wysiwyg/wysiwyg.scss index 3ddf3e7f..391c8dca 100644 --- a/app/modules/components/wysiwyg/wysiwyg.scss +++ b/app/modules/components/wysiwyg/wysiwyg.scss @@ -154,6 +154,9 @@ background-color: $white; border: 1px solid $gray-light; position: absolute; + &:empty { + border: 0; + } ul { margin-bottom: 0; } @@ -284,4 +287,3 @@ tg-wysiwyg { fill: $primary-light; } } - From 96ec253b99589d82d586e0a0855e40ae4482d122 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Thu, 30 Mar 2017 08:41:41 +0200 Subject: [PATCH 2/4] [Backport] prevent wrong call to editableInput in wysiwyg --- app/coffee/modules/wiki/main.coffee | 2 +- app/modules/components/wysiwyg/wysiwyg.directive.coffee | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee index 1170e04d..0db130a4 100644 --- a/app/coffee/modules/wiki/main.coffee +++ b/app/coffee/modules/wiki/main.coffee @@ -255,7 +255,7 @@ $qqueue, $repo, $analytics, wikiHistoryService) -> return if not value $scope.item = value $scope.version = value.version - $scope.storageKey = $scope.project.id + "-" + value.id + "-" + $attrs.type + $scope.storageKey = $scope.project.id + "-" + value.id + "-wiki" $scope.$watch 'project', (project) -> return if !project diff --git a/app/modules/components/wysiwyg/wysiwyg.directive.coffee b/app/modules/components/wysiwyg/wysiwyg.directive.coffee index 1ef63345..936f2cbe 100644 --- a/app/modules/components/wysiwyg/wysiwyg.directive.coffee +++ b/app/modules/components/wysiwyg/wysiwyg.directive.coffee @@ -56,7 +56,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad pre.parentNode.replaceChild(p, pre) mediumInstance.checkContentChanged(mediumInstance.elements[0]) - addCodeBlockAndHightlight = (range, elm) -> + addCodeBlockAndHightlight = (range, mediumInstance) -> pre = document.createElement('pre') code = document.createElement('code') @@ -73,7 +73,8 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad start.parentNode.insertBefore(pre, start) - refreshCodeBlocks(elm) + refreshCodeBlocks(mediumInstance) + mediumInstance.checkContentChanged(mediumInstance.elements[0]) refreshCodeBlocks = (mediumInstance) -> return if !mediumInstance @@ -104,8 +105,6 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad pre.parentNode.insertBefore(p, pre.nextSibling) - mediumInstance.checkContentChanged(mediumInstance.elements[0]) - AlignRightButton = MediumEditor.extensions.button.extend({ name: 'rtl', init: () -> @@ -297,6 +296,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad discardLocalStorage() mediumInstance.trigger('blur', {}, editorMedium[0]) $scope.outdated = false + refreshCodeBlocks(mediumInstance) $scope.onCancel() From a820a3a9344705216af2c043d248b777ce6b6bdf Mon Sep 17 00:00:00 2001 From: Juanfran Date: Thu, 30 Mar 2017 14:54:38 +0200 Subject: [PATCH 3/4] [Backport] refresh user info on init project creation --- .../projects/create/create-project.controller.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/modules/projects/create/create-project.controller.coffee b/app/modules/projects/create/create-project.controller.coffee index d77903c8..21d6e9c0 100644 --- a/app/modules/projects/create/create-project.controller.coffee +++ b/app/modules/projects/create/create-project.controller.coffee @@ -22,14 +22,17 @@ class CreateProjectController "tgAppMetaService", "$translate", "tgProjectService", - "$location" + "$location", + "$tgAuth" ] - constructor: (@appMetaService, @translate, @projectService, @location) -> + constructor: (@appMetaService, @translate, @projectService, @location, @authService) -> taiga.defineImmutableProperty @, "project", () => return @projectService.project @appMetaService.setfn @._setMeta.bind(this) + @authService.refresh() + @.displayScrumDesc = false @.displayKanbanDesc = false From ea4a99d393f20adab274c941ddb0826df5bb6371 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Thu, 30 Mar 2017 08:18:01 +0200 Subject: [PATCH 4/4] [Backport] regex find links with spaces and format them --- app/modules/components/wysiwyg/wysiwyg.service.coffee | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/modules/components/wysiwyg/wysiwyg.service.coffee b/app/modules/components/wysiwyg/wysiwyg.service.coffee index ee372337..a28fbed3 100644 --- a/app/modules/components/wysiwyg/wysiwyg.service.coffee +++ b/app/modules/components/wysiwyg/wysiwyg.service.coffee @@ -79,6 +79,13 @@ class WysiwygService return '[' + title + '](' + link + ')' + + linkTitleWithSpaces: (text) -> + link = /\[[^\]]*\]\(([^\)]*)\)/g # [Title-with-spaces](Title with spaces) + + return text.replace link, (match, p1, offset, str) -> + return match.replace /\(.*\)/, '(' + taiga.slugify(p1) + ')' + replaceUrls: (html) -> el = document.createElement( 'html' ) el.innerHTML = html @@ -213,7 +220,8 @@ class WysiwygService } text = @.replaceEmojiNameByImgs(text) - text = @.pipeLinks(text) + text = @.linkTitleWithSpaces(text) + text = @.pipeLinks(text) md = window.markdownit({ breaks: true