Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c82f4317
authored
7 years ago
by
Barnabás Czémán
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix jquery errors
parent
9f296bee
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
circle/dashboard/static/dashboard/activity.js
+2
-3
circle/dashboard/static/dashboard/vm-details.js
+1
-1
No files found.
circle/dashboard/static/dashboard/activity.js
View file @
c82f4317
...
@@ -144,13 +144,13 @@ $(function() {
...
@@ -144,13 +144,13 @@ $(function() {
if
(
data
.
connect_uri
)
{
if
(
data
.
connect_uri
)
{
$
(
"#dashboard-vm-details-connect-button"
).
removeClass
(
'disabled'
);
$
(
"#dashboard-vm-details-connect-button"
).
removeClass
(
'disabled'
);
}
}
$
(
"[data-target=
#_console
]"
).
attr
(
"data-toggle"
,
"pill"
).
attr
(
"href"
,
"#console"
).
parent
(
"li"
).
removeClass
(
"disabled"
);
$
(
"[data-target=
'#_console'
]"
).
attr
(
"data-toggle"
,
"pill"
).
attr
(
"href"
,
"#console"
).
parent
(
"li"
).
removeClass
(
"disabled"
);
$
(
"#getScreenshotButton"
).
prop
(
"disabled"
,
false
);
$
(
"#getScreenshotButton"
).
prop
(
"disabled"
,
false
);
}
else
{
}
else
{
if
(
data
.
connect_uri
)
{
if
(
data
.
connect_uri
)
{
$
(
"#dashboard-vm-details-connect-button"
).
addClass
(
'disabled'
);
$
(
"#dashboard-vm-details-connect-button"
).
addClass
(
'disabled'
);
}
}
$
(
"[data-target=
#_console]
"
).
attr
(
"data-toggle"
,
"_pill"
).
attr
(
"href"
,
"#"
).
parent
(
"li"
).
addClass
(
"disabled"
);
$
(
"[data-target=
'#_console]'
"
).
attr
(
"data-toggle"
,
"_pill"
).
attr
(
"href"
,
"#"
).
parent
(
"li"
).
addClass
(
"disabled"
);
$
(
"#getScreenshotButton"
).
prop
(
"disabled"
,
true
);
$
(
"#getScreenshotButton"
).
prop
(
"disabled"
,
true
);
}
}
...
@@ -237,4 +237,3 @@ String.prototype.hashCode = function() {
...
@@ -237,4 +237,3 @@ String.prototype.hashCode = function() {
}
}
return
hash
;
return
hash
;
};
};
This diff is collapsed.
Click to expand it.
circle/dashboard/static/dashboard/vm-details.js
View file @
c82f4317
...
@@ -193,7 +193,7 @@ $(function() {
...
@@ -193,7 +193,7 @@ $(function() {
// note: this should not work if the image is cached, but it's not
// note: this should not work if the image is cached, but it's not
// see: http://stackoverflow.com/a/3877079/1112653
// see: http://stackoverflow.com/a/3877079/1112653
// note #2: it actually gets cached, so a random number is appended
// note #2: it actually gets cached, so a random number is appended
$
(
"#vm-console-screenshot img"
).
load
(
function
(
e
)
{
$
(
"#vm-console-screenshot img"
).
on
(
'load'
,
function
(
e
)
{
$
(
"#getScreenshotButton"
).
prop
(
"disabled"
,
false
)
$
(
"#getScreenshotButton"
).
prop
(
"disabled"
,
false
)
.
find
(
"i"
).
removeClass
(
"fa-spinner fa-spin"
);
.
find
(
"i"
).
removeClass
(
"fa-spinner fa-spin"
);
...
...
This diff is collapsed.
Click to expand it.
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