Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Pleroma
pleroma-fe
Commits
9503b8fa
Commit
9503b8fa
authored
7 years ago
by
Shpuld Shpuldson
Browse files
Options
Downloads
Patches
Plain Diff
Remove the profile pic change from the old settings menu since it's in the new profile edit menu.
parent
1526b456
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/settings/settings.js
+1
-40
1 addition, 40 deletions
src/components/settings/settings.js
src/components/settings/settings.vue
+0
-12
0 additions, 12 deletions
src/components/settings/settings.vue
with
1 addition
and
52 deletions
src/components/settings/settings.js
+
1
−
40
View file @
9503b8fa
...
...
@@ -9,8 +9,7 @@ const settings = {
hideNsfwLocal
:
this
.
$store
.
state
.
config
.
hideNsfw
,
muteWordsString
:
this
.
$store
.
state
.
config
.
muteWords
.
join
(
'
\n
'
),
autoLoadLocal
:
this
.
$store
.
state
.
config
.
autoLoad
,
hoverPreviewLocal
:
this
.
$store
.
state
.
config
.
hoverPreview
,
previewfile
:
null
hoverPreviewLocal
:
this
.
$store
.
state
.
config
.
hoverPreview
}
},
components
:
{
...
...
@@ -21,44 +20,6 @@ const settings = {
return
this
.
$store
.
state
.
users
.
currentUser
}
},
methods
:
{
uploadAvatar
({
target
})
{
const
file
=
target
.
files
[
0
]
// eslint-disable-next-line no-undef
const
reader
=
new
FileReader
()
reader
.
onload
=
({
target
})
=>
{
const
img
=
target
.
result
this
.
previewfile
=
img
}
reader
.
readAsDataURL
(
file
)
},
submitAvatar
()
{
if
(
!
this
.
previewfile
)
{
return
}
const
img
=
this
.
previewfile
// eslint-disable-next-line no-undef
let
imginfo
=
new
Image
()
let
cropX
,
cropY
,
cropW
,
cropH
imginfo
.
src
=
this
.
previewfile
if
(
imginfo
.
height
>
imginfo
.
width
)
{
cropX
=
0
cropW
=
imginfo
.
width
cropY
=
Math
.
floor
((
imginfo
.
height
-
imginfo
.
width
)
/
2
)
cropH
=
imginfo
.
width
}
else
{
cropY
=
0
cropH
=
imginfo
.
height
cropX
=
Math
.
floor
((
imginfo
.
width
-
imginfo
.
height
)
/
2
)
cropW
=
imginfo
.
height
}
this
.
$store
.
state
.
api
.
backendInteractor
.
updateAvatar
({
params
:
{
img
,
cropX
,
cropY
,
cropW
,
cropH
}}).
then
((
user
)
=>
{
if
(
!
user
.
error
)
{
this
.
$store
.
commit
(
'
addNewUsers
'
,
[
user
])
this
.
$store
.
commit
(
'
setCurrentUser
'
,
user
)
}
})
}
},
watch
:
{
hideAttachmentsLocal
(
value
)
{
this
.
$store
.
dispatch
(
'
setOption
'
,
{
name
:
'
hideAttachments
'
,
value
})
...
...
This diff is collapsed.
Click to expand it.
src/components/settings/settings.vue
+
0
−
12
View file @
9503b8fa
...
...
@@ -8,18 +8,6 @@
<h2>
Theme
</h2>
<style
-switcher
></style-switcher>
</div>
<div
class=
"setting-item"
v-if=
"user"
>
<h2>
Avatar
</h2>
<p>
Your current avatar:
</p>
<img
:src=
"user.profile_image_url_original"
class=
"old-avatar"
></img>
<p>
Set new avatar:
</p>
<img
class=
"new-avatar"
v-bind:src=
"previewfile"
v-if=
"previewfile"
>
</img>
<div>
<input
name=
"avatar-upload"
id=
"avatar-upload"
type=
"file"
@
change=
"uploadAvatar"
></input>
</div>
<button
class=
"btn btn-default base05 base01-background"
v-if=
"previewfile"
@
click=
"submitAvatar"
>
Submit
</button>
</div>
<div
class=
"setting-item"
>
<h2>
Filtering
</h2>
<p>
All notices containing these words will be muted, one per line
</p>
...
...
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