Unified the layout for VNC/SPICE remote consoles #186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skateman
force-pushed
the
unified-remote-console-view
branch
from
46572af to
a1bd2f5
Compare
skateman
changed the title
|
Pivotal story: https://www.pivotaltracker.com/story/show/137880407 |
app/controllers/vm_common.rb
Outdated
| @@ -156,22 +156,23 @@ def vm_selected | |||
| end | |||
|
|
|||
| def launch_html5_console | |||
| proto = request.ssl? ? 'wss' : 'ws' | |||
| prefix = request.ssl? ? 'wss' : 'ws' | |||
There was a problem hiding this comment.
why rename proto to prefix?
it's a protocol so the new one is not a better name
There was a problem hiding this comment.
Because I'm using the same variable name 2 lines lower ;)
There was a problem hiding this comment.
I saw that. Not a very good reason for a poor name ;-)
skateman
force-pushed
the
unified-remote-console-view
branch
from
a1bd2f5 to
bf5ee6f
Compare
skateman
force-pushed
the
unified-remote-console-view
branch
2 times, most recently
from
4da2da6 to
5b12143
Compare
|
@skateman The new console screen lacks tooltips for ctrl-alt-delete & fullscreen buttons |
mzazrivec
suggested changes
Feb 2, 2017
| onerror: function(e) { | ||
| spice.stop(); | ||
| $('#connection-status').removeClass('label-success label-warning').addClass('label-danger'); | ||
| $('#connection-status').text('Disconnected'); |
| }, | ||
| onsuccess: function() { | ||
| $('#connection-status').removeClass('label-danger label-warning').addClass('label-success'); | ||
| $('#connection-status').text('Connected'); |
| onUpdateState: function(_, state, _, msg) { | ||
| if (['normal', 'loaded'].includes(state)) { | ||
| $('#connection-status').removeClass('label-danger label-warning').addClass('label-success'); | ||
| $('#connection-status').text('Connected'); |
| $('#connection-status').text('Connected'); | ||
| } else if (state === 'disconnected') { | ||
| $('#connection-status').removeClass('label-success label-warning').addClass('label-danger'); | ||
| $('#connection-status').text('Disconnected'); |
skateman
force-pushed
the
unified-remote-console-view
branch
from
5b12143 to
9a4b863
Compare
|
@mzazrivec should be all fixed! |
|
Now I see bunch of errors in JS console like: |
skateman
force-pushed
the
unified-remote-console-view
branch
2 times, most recently
from
98020f0 to
e75893b
Compare
- Created a common HAML view for both console types - Separate JS files with preprocessed dependencies - Removed the old HAML views for VNC/SPICE - Removed some dead code in the related controller
skateman
force-pushed
the
unified-remote-console-view
branch
from
e75893b to
253e27d
Compare
|
Checked commit skateman@253e27d with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
mzazrivec
approved these changes
Feb 2, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #162