Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
65393806
Commit
65393806
authored
Oct 05, 2020
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reset design scale when design changes
Fixes zoom bug
parent
32a796a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
app/assets/javascripts/design_management/pages/design/index.vue
...sets/javascripts/design_management/pages/design/index.vue
+8
-1
changelogs/unreleased/fix-design-zoom.yml
changelogs/unreleased/fix-design-zoom.yml
+5
-0
No files found.
app/assets/javascripts/design_management/pages/design/index.vue
View file @
65393806
...
@@ -40,6 +40,8 @@ import { trackDesignDetailView } from '../../utils/tracking';
...
@@ -40,6 +40,8 @@ import { trackDesignDetailView } from '../../utils/tracking';
import
{
DESIGNS_ROUTE_NAME
}
from
'
../../router/constants
'
;
import
{
DESIGNS_ROUTE_NAME
}
from
'
../../router/constants
'
;
import
{
ACTIVE_DISCUSSION_SOURCE_TYPES
}
from
'
../../constants
'
;
import
{
ACTIVE_DISCUSSION_SOURCE_TYPES
}
from
'
../../constants
'
;
const
DEFAULT_SCALE
=
1
;
export
default
{
export
default
{
components
:
{
components
:
{
ApolloMutation
,
ApolloMutation
,
...
@@ -65,7 +67,7 @@ export default {
...
@@ -65,7 +67,7 @@ export default {
comment
:
''
,
comment
:
''
,
annotationCoordinates
:
null
,
annotationCoordinates
:
null
,
errorMessage
:
''
,
errorMessage
:
''
,
scale
:
1
,
scale
:
DEFAULT_SCALE
,
resolvedDiscussionsExpanded
:
false
,
resolvedDiscussionsExpanded
:
false
,
};
};
},
},
...
@@ -157,6 +159,11 @@ export default {
...
@@ -157,6 +159,11 @@ export default {
beforeDestroy
()
{
beforeDestroy
()
{
Mousetrap
.
unbind
(
'
esc
'
,
this
.
closeDesign
);
Mousetrap
.
unbind
(
'
esc
'
,
this
.
closeDesign
);
},
},
beforeRouteUpdate
(
to
,
from
,
next
)
{
// reset scale when the active design changes
this
.
scale
=
DEFAULT_SCALE
;
next
();
},
methods
:
{
methods
:
{
addImageDiffNoteToStore
(
addImageDiffNoteToStore
(
store
,
store
,
...
...
changelogs/unreleased/fix-design-zoom.yml
0 → 100644
View file @
65393806
---
title
:
Fix design scale bug when navigating to a design after zooming
merge_request
:
44262
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment