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
3283e439
Commit
3283e439
authored
Aug 06, 2019
by
Natalia Tepluhina
Committed by
Kushal Pandya
Aug 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fixed comparing value to undefined"
This reverts commit d754beb74fbc06a2c744e15be4aa2831d8cef1c0.
parent
fd92bd24
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
4 deletions
+31
-4
app/assets/javascripts/behaviors/preview_markdown.js
app/assets/javascripts/behaviors/preview_markdown.js
+4
-0
app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
...shared/components/content_viewer/viewers/image_viewer.vue
+0
-3
doc/user/project/issues/design_management.md
doc/user/project/issues/design_management.md
+12
-1
doc/user/project/issues/img/adding_note_to_design_1.png
doc/user/project/issues/img/adding_note_to_design_1.png
+0
-0
doc/user/project/issues/img/adding_note_to_design_2.png
doc/user/project/issues/img/adding_note_to_design_2.png
+0
-0
spec/frontend/test_setup.js
spec/frontend/test_setup.js
+15
-0
No files found.
app/assets/javascripts/behaviors/preview_markdown.js
View file @
3283e439
...
@@ -36,6 +36,10 @@ MarkdownPreview.prototype.showPreview = function($form) {
...
@@ -36,6 +36,10 @@ MarkdownPreview.prototype.showPreview = function($form) {
mdText
=
$form
.
find
(
'
textarea.markdown-area
'
).
val
();
mdText
=
$form
.
find
(
'
textarea.markdown-area
'
).
val
();
if
(
mdText
===
undefined
)
{
return
;
}
if
(
mdText
.
trim
().
length
===
0
)
{
if
(
mdText
.
trim
().
length
===
0
)
{
preview
.
text
(
this
.
emptyMessage
);
preview
.
text
(
this
.
emptyMessage
);
this
.
hideReferencedUsers
(
$form
);
this
.
hideReferencedUsers
(
$form
);
...
...
app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
View file @
3283e439
...
@@ -27,7 +27,6 @@ export default {
...
@@ -27,7 +27,6 @@ export default {
return
{
return
{
width
:
0
,
width
:
0
,
height
:
0
,
height
:
0
,
isLoaded
:
false
,
};
};
},
},
computed
:
{
computed
:
{
...
@@ -63,8 +62,6 @@ export default {
...
@@ -63,8 +62,6 @@ export default {
this
.
height
=
contentImg
.
naturalHeight
;
this
.
height
=
contentImg
.
naturalHeight
;
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
isLoaded
=
true
;
this
.
$emit
(
'
imgLoaded
'
,
{
this
.
$emit
(
'
imgLoaded
'
,
{
width
:
this
.
width
,
width
:
this
.
width
,
height
:
this
.
height
,
height
:
this
.
height
,
...
...
doc/user/project/issues/design_management.md
View file @
3283e439
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/660) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.2.
> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/660) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.2.
CAUTION:
**Warning:**
CAUTION:
**Warning:**
This an
__alpha__
feature and is subject to change at any time without
This an
**alpha**
feature and is subject to change at any time without
prior notice.
prior notice.
## Overview
## Overview
...
@@ -56,3 +56,14 @@ of the design, and will replace the previous version.
...
@@ -56,3 +56,14 @@ of the design, and will replace the previous version.
Images on the Design Management page can be enlarged by clicking on them.
Images on the Design Management page can be enlarged by clicking on them.
## Adding annotations to designs
When a design image is displayed, you can add annotations to it by clicking on
the image. A badge is added to the image and a form is displayed to start a new
discussion. For example:
![
Starting a new discussion on design
](
img/adding_note_to_design_1.png
)
When submitted, the form saves a badge linked to the discussion on the image. Different discussions have different badge numbers. For example:
![
Discussions on design annotations
](
img/adding_note_to_design_2.png
)
doc/user/project/issues/img/adding_note_to_design_1.png
0 → 100644
View file @
3283e439
1.08 MB
doc/user/project/issues/img/adding_note_to_design_2.png
0 → 100644
View file @
3283e439
1.11 MB
spec/frontend/test_setup.js
View file @
3283e439
...
@@ -75,3 +75,18 @@ global.MutationObserver = () => ({
...
@@ -75,3 +75,18 @@ global.MutationObserver = () => ({
disconnect
:
()
=>
{},
disconnect
:
()
=>
{},
observe
:
()
=>
{},
observe
:
()
=>
{},
});
});
Object
.
assign
(
global
,
{
requestIdleCallback
(
cb
)
{
const
start
=
Date
.
now
();
return
setTimeout
(()
=>
{
cb
({
didTimeout
:
false
,
timeRemaining
:
()
=>
Math
.
max
(
0
,
50
-
(
Date
.
now
()
-
start
)),
});
});
},
cancelIdleCallback
(
id
)
{
clearTimeout
(
id
);
},
});
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