Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

#47 - Adds a cancel button for edit and reply button.

Browse Source
This commit is contained in:
Abijeet 2017-06-04 20:43:56 +05:30
parent 06d75e1804
commit 689d1eb082
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/assets/js/directives.js
View File

@ -839,9 +839,13 @@ module.exports = function (ngApp, events) {
// no need for the event to do anything more. // no need for the event to do anything more.
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
scope.closeBox();
});
scope.closeBox = function () {
element.remove(); element.remove();
scope.$destroy(); scope.$destroy();
}); }
} }
} }
}]); }]);
@ -861,10 +865,14 @@ module.exports = function (ngApp, events) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
if (commentId === scope.comment.id && !scope.isNew) { if (commentId === scope.comment.id && !scope.isNew) {
element.remove(); scope.closeBox();
scope.$destroy();
} }
}); });
scope.closeBox = function () {
element.remove();
scope.$destroy();
}
} }
} }
}]); }]);

4
resources/lang/en/entities.php
View File

@ -244,5 +244,7 @@ return [
'no_comments' => 'No Comments', 'no_comments' => 'No Comments',
'x_comments' => ':numComments Comments', 'x_comments' => ':numComments Comments',
'one_comment' => '1 Comment', 'one_comment' => '1 Comment',
'comments_loading' => 'Loading...' 'comments_loading' => 'Loading...',
'comment_save' => 'Save Comment',
'comment_cancel' => 'Cancel'
]; ];

3
resources/views/comments/comment-reply.blade.php
View File

@ -4,7 +4,8 @@
@if($errors->has('markdown')) class="neg" @endif>@if(isset($model) || @if($errors->has('markdown')) class="neg" @endif>@if(isset($model) ||
old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif</textarea> old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif</textarea>
<input type="hidden" ng-model="comment.pageId" name="comment.pageId" value="{{$pageId}}" ng-init="comment.pageId = {{$pageId }}"> <input type="hidden" ng-model="comment.pageId" name="comment.pageId" value="{{$pageId}}" ng-init="comment.pageId = {{$pageId }}">
<button type="submit" class="button pos" ng-click="vm.saveComment(isReply)">Save</button> <button type="button" ng-if="::(isReply || isEdit)" class="button muted" ng-click="closeBox()">{{ trans('entities.comment_cancel') }}</button>
<button type="submit" class="button pos" ng-click="vm.saveComment(isReply)">{{ trans('entities.comment_save') }}</button>
</form> </form>
</div> </div>