From 27b00f365fed0e9952b2859415a5160b94e136c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 23 Jun 2015 19:21:35 +0200 Subject: [PATCH] Issue#2518: Allow to include anchor links in the wiki pages --- app/coffee/modules/common/components.coffee | 9 ++++++++- app/coffee/modules/common/history.coffee | 7 +++++++ app/coffee/modules/wiki/main.coffee | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index fe42c1d8..c96ae3ae 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -547,7 +547,7 @@ module.directive("tgEditableSubject", ["$rootScope", "$tgRepo", "$tgConfirm", "$ ############################################################################# -## Editable subject directive +## Editable description directive ############################################################################# EditableDescriptionDirective = ($rootscope, $repo, $confirm, $compile, $loading, $selectedText, $qqueue, $template) -> @@ -593,6 +593,13 @@ EditableDescriptionDirective = ($rootscope, $repo, $confirm, $compile, $loading, $el.find('.view-description').hide() $el.find('textarea').focus() + $el.on "click", "a", (event) -> + target = angular.element(event.target) + href = target.attr('href') + if href.indexOf("#") == 0 + event.preventDefault() + $('body').scrollTop($(href).offset().top) + $el.on "click", ".save", (e) -> e.preventDefault() diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee index dc491dc4..1dd8e3d0 100644 --- a/app/coffee/modules/common/history.coffee +++ b/app/coffee/modules/common/history.coffee @@ -382,6 +382,13 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c target = angular.element(event.currentTarget) save(target) + $el.on "click", "a", (event) -> + target = angular.element(event.target) + href = target.attr('href') + if href.indexOf("#") == 0 + event.preventDefault() + $('body').scrollTop($(href).offset().top) + $el.on "click", ".show-more", (event) -> event.preventDefault() diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee index 2d2a203a..d9d2cd15 100644 --- a/app/coffee/modules/wiki/main.coffee +++ b/app/coffee/modules/wiki/main.coffee @@ -243,6 +243,13 @@ EditableWikiContentDirective = ($window, $document, $repo, $confirm, $loading, $ promise.finally -> $loading.finish($el.find('.save-container')) + $el.on "click", "a", (event) -> + target = angular.element(event.target) + href = target.attr('href') + if href.indexOf("#") == 0 + event.preventDefault() + $('body').scrollTop($(href).offset().top) + $el.on "mousedown", ".view-wiki-content", (event) -> target = angular.element(event.target) return if not isEditable()