Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
e63192ab
Commit
e63192ab
authored
Jun 19, 2015
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GUI: always use noVNC instead of java applet
parent
e1049eb1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
Utils.js
www/manager/Utils.js
+2
-4
OptionView.js
www/manager/dc/OptionView.js
+1
-1
No files found.
www/manager/Utils.js
View file @
e63192ab
...
@@ -233,11 +233,9 @@ Ext.define('PVE.Utils', { statics: {
...
@@ -233,11 +233,9 @@ Ext.define('PVE.Utils', { statics: {
render_console_viewer
:
function
(
value
)
{
render_console_viewer
:
function
(
value
)
{
if
(
!
value
)
{
if
(
!
value
)
{
return
PVE
.
Utils
.
defaultText
+
'
(HTML5)
'
;
return
PVE
.
Utils
.
defaultText
+
'
(HTML5)
'
;
}
else
if
(
value
===
'
applet
'
)
{
return
'
Java VNC Applet
'
;
}
else
if
(
value
===
'
vv
'
)
{
}
else
if
(
value
===
'
vv
'
)
{
return
'
SPICE (remote-viewer)
'
;
return
'
SPICE (remote-viewer)
'
;
}
else
if
(
value
===
'
html5
'
)
{
}
else
if
(
value
===
'
applet
'
||
value
===
'
html5
'
)
{
return
'
HTML5 (noVNC)
'
;
return
'
HTML5 (noVNC)
'
;
}
else
{
}
else
{
return
value
;
return
value
;
...
@@ -946,7 +944,7 @@ Ext.define('PVE.Utils', { statics: {
...
@@ -946,7 +944,7 @@ Ext.define('PVE.Utils', { statics: {
}
}
if
(
viewer
===
'
applet
'
||
viewer
===
'
html5
'
)
{
if
(
viewer
===
'
applet
'
||
viewer
===
'
html5
'
)
{
PVE
.
Utils
.
openVNCViewer
(
vmtype
,
vmid
,
nodename
,
vmname
,
viewer
===
'
html5
'
);
PVE
.
Utils
.
openVNCViewer
(
vmtype
,
vmid
,
nodename
,
vmname
,
true
);
}
else
if
(
viewer
===
'
vv
'
)
{
}
else
if
(
viewer
===
'
vv
'
)
{
var
url
;
var
url
;
var
params
=
{
proxy
:
PVE
.
Utils
.
windowHostname
()
};
var
params
=
{
proxy
:
PVE
.
Utils
.
windowHostname
()
};
...
...
www/manager/dc/OptionView.js
View file @
e63192ab
...
@@ -53,7 +53,7 @@ Ext.define('PVE.dc.ConsoleViewerEdit', {
...
@@ -53,7 +53,7 @@ Ext.define('PVE.dc.ConsoleViewerEdit', {
var
data
=
[];
var
data
=
[];
Ext
.
Array
.
each
([
''
,
'
applet
'
,
'
vv
'
,
'
html5
'
],
function
(
value
)
{
Ext
.
Array
.
each
([
''
,
'
vv
'
,
'
html5
'
],
function
(
value
)
{
data
.
push
([
value
,
PVE
.
Utils
.
render_console_viewer
(
value
)]);
data
.
push
([
value
,
PVE
.
Utils
.
render_console_viewer
(
value
)]);
});
});
...
...
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