Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2016-04-09 13:36:32 +0100
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
2e7345f4f0764022bbc56407f23ecaa4b8787061
2e7345f4
1 parent
1a7de4c2
Localised draft save time display
In reference to #83.
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
app/Http/Controllers/PageController.php
package.json
resources/assets/js/controllers.js
app/Http/Controllers/PageController.php
View file @
2e7345f
...
...
@@ -4,6 +4,7 @@ use Activity;
use
BookStack\Exceptions\NotFoundException
;
use
BookStack\Repos\UserRepo
;
use
BookStack\Services\ExportService
;
use
Carbon\Carbon
;
use
Illuminate\Http\Request
;
use
BookStack\Http\Requests
;
use
BookStack\Repos\BookRepo
;
...
...
@@ -214,8 +215,14 @@ class PageController extends Controller
}
else
{
$draft
=
$this
->
pageRepo
->
saveUpdateDraft
(
$page
,
$request
->
only
([
'name'
,
'html'
,
'markdown'
]));
}
$updateTime
=
$draft
->
updated_at
->
format
(
'H:i'
);
return
response
()
->
json
([
'status'
=>
'success'
,
'message'
=>
'Draft saved at '
.
$updateTime
]);
$updateTime
=
$draft
->
updated_at
->
timestamp
;
$utcUpdateTimestamp
=
$updateTime
+
Carbon
::
createFromTimestamp
(
0
)
->
offset
;
return
response
()
->
json
([
'status'
=>
'success'
,
'message'
=>
'Draft saved at '
,
'timestamp'
=>
$utcUpdateTimestamp
]);
}
/**
...
...
package.json
View file @
2e7345f
...
...
@@ -13,6 +13,7 @@
"dropzone"
:
"^4.0.1"
,
"laravel-elixir"
:
"^3.4.0"
,
"marked"
:
"^0.3.5"
,
"moment"
:
"^2.12.0"
,
"zeroclipboard"
:
"^2.2.0"
}
}
...
...
resources/assets/js/controllers.js
View file @
2e7345f
"use strict"
;
var
moment
=
require
(
'moment'
);
module
.
exports
=
function
(
ngApp
,
events
)
{
ngApp
.
controller
(
'ImageManagerController'
,
[
'$scope'
,
'$attrs'
,
'$http'
,
'$timeout'
,
'imageManagerService'
,
...
...
@@ -367,7 +369,8 @@ module.exports = function (ngApp, events) {
if
(
isMarkdown
)
data
.
markdown
=
$scope
.
editContent
;
$http
.
put
(
'/ajax/page/'
+
pageId
+
'/save-draft'
,
data
).
then
((
responseData
)
=>
{
$scope
.
draftText
=
responseData
.
data
.
message
;
var
updateTime
=
moment
.
utc
(
moment
.
unix
(
responseData
.
data
.
timestamp
)).
toDate
();
$scope
.
draftText
=
responseData
.
data
.
message
+
moment
(
updateTime
).
format
(
'H:m'
);
if
(
!
$scope
.
isNewPageDraft
)
$scope
.
isUpdateDraft
=
true
;
});
}
...
...
Please
register
or
sign in
to post a comment