Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
minerva
core
Commits
eaca1954
Commit
eaca1954
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
context menu visualization fixed - it's slightly different in bootstrap 4
parent
5a19f11e
No related branches found
No related tags found
1 merge request
!878
Resolve "MolArt is missing in the context menu (right click). // minerva v14"
Pipeline
#12734
passed
5 years ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG
+1
-0
1 addition, 0 deletions
CHANGELOG
frontend-js/src/main/js/gui/ContextMenu.js
+5
-6
5 additions, 6 deletions
frontend-js/src/main/js/gui/ContextMenu.js
frontend-js/src/main/js/gui/SubMenu.js
+2
-2
2 additions, 2 deletions
frontend-js/src/main/js/gui/SubMenu.js
with
8 additions
and
8 deletions
CHANGELOG
+
1
−
0
View file @
eaca1954
...
@@ -11,6 +11,7 @@ minerva (14.0.0~alpha.1) unstable; urgency=low
...
@@ -11,6 +11,7 @@ minerva (14.0.0~alpha.1) unstable; urgency=low
* Bug fix: upload of invalid plugin doesn't add it to plugin tab and list of
* Bug fix: upload of invalid plugin doesn't add it to plugin tab and list of
loaded plugins (#885)
loaded plugins (#885)
* Bug fix: link to molart was brokwn (#886)
* Bug fix: link to molart was brokwn (#886)
* Bug fix: context menu visualization fixed
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 12 Aug 2019 10:00:00 +0200
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 12 Aug 2019 10:00:00 +0200
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/main/js/gui/ContextMenu.js
+
5
−
6
View file @
eaca1954
...
@@ -43,7 +43,7 @@ function ContextMenu(params) {
...
@@ -43,7 +43,7 @@ function ContextMenu(params) {
self
.
_documentClickListener
=
function
(
e
)
{
self
.
_documentClickListener
=
function
(
e
)
{
var
className
=
e
.
target
.
className
;
var
className
=
e
.
target
.
className
;
if
(
typeof
className
===
'
string
'
||
className
instanceof
String
)
{
if
(
typeof
className
===
'
string
'
||
className
instanceof
String
)
{
if
(
className
.
indexOf
(
"
dropdown-
link
"
)
===
-
1
)
{
if
(
className
.
indexOf
(
"
dropdown-
item
"
)
===
-
1
)
{
self
.
hide
(
new
Date
().
getTime
()
-
self
.
MIN_SHOW_TIME
);
self
.
hide
(
new
Date
().
getTime
()
-
self
.
MIN_SHOW_TIME
);
}
}
}
else
{
}
else
{
...
@@ -83,13 +83,12 @@ ContextMenu.prototype.addOption = function (name, handler, disabled) {
...
@@ -83,13 +83,12 @@ ContextMenu.prototype.addOption = function (name, handler, disabled) {
});
});
var
link
=
Functions
.
createElement
({
var
link
=
Functions
.
createElement
({
type
:
"
a
"
,
type
:
"
a
"
,
className
:
"
dropdown-link
"
,
className
:
"
dropdown-item
"
,
href
:
"
#
"
,
content
:
name
content
:
name
});
});
if
(
!
disabled
)
{
if
(
disabled
)
{
link
.
href
=
"
#
"
;
link
.
className
=
'
dropdown-item disabled
'
;
}
else
{
link
.
className
=
'
disabled-link
'
;
}
}
$
(
link
).
data
(
"
handler
"
,
handler
);
$
(
link
).
data
(
"
handler
"
,
handler
);
option
.
appendChild
(
link
);
option
.
appendChild
(
link
);
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/main/js/gui/SubMenu.js
+
2
−
2
View file @
eaca1954
...
@@ -30,7 +30,7 @@ SubMenu.prototype._createGui = function (params) {
...
@@ -30,7 +30,7 @@ SubMenu.prototype._createGui = function (params) {
var
link
=
Functions
.
createElement
({
var
link
=
Functions
.
createElement
({
type
:
"
a
"
,
type
:
"
a
"
,
href
:
"
#
"
,
href
:
"
#
"
,
className
:
"
dropdown-
link
"
,
className
:
"
dropdown-
item
"
,
content
:
params
.
name
content
:
params
.
name
});
});
link
.
tabIndex
=
-
1
;
link
.
tabIndex
=
-
1
;
...
@@ -55,7 +55,7 @@ SubMenu.prototype.addOption = function (name, handler) {
...
@@ -55,7 +55,7 @@ SubMenu.prototype.addOption = function (name, handler) {
var
link
=
Functions
.
createElement
({
var
link
=
Functions
.
createElement
({
type
:
"
a
"
,
type
:
"
a
"
,
href
:
"
#
"
,
href
:
"
#
"
,
className
:
"
dropdown-
link
"
,
className
:
"
dropdown-
item
"
,
content
:
name
content
:
name
});
});
$
(
link
).
data
(
"
handler
"
,
handler
);
$
(
link
).
data
(
"
handler
"
,
handler
);
...
...
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