webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-09-06 07:06:42 +03:00
Code Activity

#47 - Adds direct linking to comments.

Browse Source
This commit is contained in:
Abijeet
2017-06-08 01:14:53 +05:30
parent 38fe756725
commit e647ec22b1
4 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/assets/js/controllers.js
View File

@@ -776,7 +776,7 @@ module.exports = function (ngApp, events) {
}]);
// Controller used to fetch all comments for a page
ngApp.controller('CommentListController', ['$scope', '$http', '$timeout', function ($scope, $http, $timeout) {
ngApp.controller('CommentListController', ['$scope', '$http', '$timeout', '$location', function ($scope, $http, $timeout, $location) {
let vm = this;
$scope.errors = {};
// keep track of comment levels
@@ -808,7 +808,7 @@ module.exports = function (ngApp, events) {
if (vm.permissions[propOwn] && comment.created_by.id === vm.current_user_id) {
return true;
}
return false;
};
@@ -816,6 +816,9 @@ module.exports = function (ngApp, events) {
return vm.permissions.comment_create;
};
// check if there are is any direct linking
let linkedCommentId = $location.search().cm;
$timeout(function() {
$http.get(window.baseUrl(`/ajax/page/${$scope.pageId}/comments/`)).then(resp => {
if (!isCommentOpSuccess(resp)) {
@@ -829,6 +832,13 @@ module.exports = function (ngApp, events) {
vm.permissions = resp.data.permissions;
vm.current_user_id = resp.data.user_id;
setTotalCommentMsg();
if (!linkedCommentId) {
return;
}
$timeout(function() {
// wait for the UI to render.
focusLinkedComment(linkedCommentId);
});
}, checkError);
});
@@ -844,6 +854,15 @@ module.exports = function (ngApp, events) {
}
}
function focusLinkedComment(linkedCommentId) {
let comment = angular.element('#' + linkedCommentId);
if (comment.length === 0) {
return;
}
window.setupPageShow.goToText(linkedCommentId);
}
function checkError(response) {
let msg = null;
if (isCommentOpSuccess(response)) {