Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
7b397b14
Commit
7b397b14
authored
7 years ago
by
Zac Anger
Committed by
Eugen
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Return early from submit if no text. (#1962)
parent
8fd6552b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/assets/javascripts/components/actions/compose.jsx
+5
-1
5 additions, 1 deletion
app/assets/javascripts/components/actions/compose.jsx
app/assets/javascripts/components/locales/no.jsx
+1
-1
1 addition, 1 deletion
app/assets/javascripts/components/locales/no.jsx
with
6 additions
and
2 deletions
app/assets/javascripts/components/actions/compose.jsx
+
5
−
1
View file @
7b397b14
...
...
@@ -73,9 +73,13 @@ export function mentionCompose(account, router) {
export
function
submitCompose
()
{
return
function
(
dispatch
,
getState
)
{
const
status
=
emojione
.
shortnameToUnicode
(
getState
().
getIn
([
'
compose
'
,
'
text
'
],
''
));
if
(
!
status
||
!
status
.
length
)
{
return
;
}
dispatch
(
submitComposeRequest
());
api
(
getState
).
post
(
'
/api/v1/statuses
'
,
{
status
:
emojione
.
shortnameToUnicode
(
getState
().
getIn
([
'
compose
'
,
'
text
'
],
''
))
,
status
,
in_reply_to_id
:
getState
().
getIn
([
'
compose
'
,
'
in_reply_to
'
],
null
),
media_ids
:
getState
().
getIn
([
'
compose
'
,
'
media_attachments
'
]).
map
(
item
=>
item
.
get
(
'
id
'
)),
sensitive
:
getState
().
getIn
([
'
compose
'
,
'
sensitive
'
]),
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/components/locales/no.jsx
+
1
−
1
View file @
7b397b14
...
...
@@ -33,7 +33,7 @@ const no = {
"
empty_column.community
"
:
"
Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!
"
,
"
empty_column.hashtag
"
:
"
Det er ingenting i denne hashtagen ennå.
"
,
"
empty_column.home.public_timeline
"
:
"
en offentlig tidslinje
"
,
"
empty_column.home
"
:
"
Du har ikke fulgt noen ennå. Besøk {publlic} eller bruk søk for å komme i gang og møte andre brukere.
"
,
"
empty_column.home
"
:
"
Du har ikke fulgt noen ennå. Besøk {publlic} eller bruk søk for å komme i gang og møte andre brukere.
"
,
"
empty_column.notifications
"
:
"
Du har ingen varsler ennå. Kommuniser med andre for å begynne samtalen.
"
,
"
empty_column.public
"
:
"
Det er ingenting her! Skriv noe offentlig, eller følg brukere manuelt fra andre instanser for å fylle den opp
"
,
"
follow_request.authorize
"
:
"
Autorisér
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment