Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
EECS498-uBoard
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
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
jjlustig
EECS498-uBoard
Commits
d25c31cd
Commit
d25c31cd
authored
7 years ago
by
Laurel Williams
Browse files
Options
Downloads
Patches
Plain Diff
Add loading message
parent
3299c59a
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
public/client.html
+1
-0
1 addition, 0 deletions
public/client.html
public/js/client.js
+1
-4
1 addition, 4 deletions
public/js/client.js
public/style/main.css
+8
-0
8 additions, 0 deletions
public/style/main.css
with
10 additions
and
4 deletions
public/client.html
+
1
−
0
View file @
d25c31cd
...
...
@@ -38,6 +38,7 @@
</div>
</div>
</div>
<div
class =
"loading"
id=
"loading"
>
Loading...
</div>
<div
class =
"static-bar"
>
<div
class =
"shift-toggle static-key"
>
shift
</div>
<div
class =
"ctrl-toggle static-key"
>
ctrl
</div>
...
...
This diff is collapsed.
Click to expand it.
public/js/client.js
+
1
−
4
View file @
d25c31cd
...
...
@@ -218,7 +218,7 @@ socket.on('updateKeys', function(newVals) {
ele
.
text
(
newVals
.
k
[
i
])
ele
.
css
({
position
:
'
absolute
'
,
left
:
newVals
.
x
[
i
]
+
'
%
'
,
top
:(
newVals
.
y
[
i
])
+
'
%
'
,
minHeight
:
(
keyboardWidth
*
.
02
).
toString
()
+
"
px
"
});
}
$
(
'
#loading
'
).
h
tml
(
''
);
$
(
'
#loading
'
).
h
ide
(
);
});
//Purpose: Receives information from the server to update the presentation of the keys on the client
...
...
@@ -227,7 +227,6 @@ socket.on('updateUrls', function(newVals) {
for
(
var
i
=
0
;
i
<
newVals
.
x
.
length
;
i
++
){
addHotkey
(
newVals
.
x
[
i
],
newVals
.
y
[
i
],
newVals
.
k
[
i
],
'
hotkeys
'
,
'
hotkeys-button
'
+
(
i
+
1
).
toString
())
}
$
(
'
#loading
'
).
html
(
''
);
});
//Purpose: Receives information from the server to update the presentation of the keys on the client
...
...
@@ -240,7 +239,6 @@ socket.on('updateNumPad', function(newVals) {
ele
.
css
({
position
:
'
absolute
'
,
left
:
newVals
.
x
[
i
]
+
'
%
'
,
top
:(
newVals
.
y
[
i
])
+
'
%
'
,
minHeight
:
(
keyboardWidth
*
.
02
).
toString
()
+
"
px
"
});
}
$
(
'
#loading
'
).
html
(
''
);
});
//Purpose: Receives information from the server to update the presentation of the keys on the client
...
...
@@ -264,7 +262,6 @@ socket.on('updateCustom', function(newVals) {
}
customButtonCounts
[
'
custom-
'
+
customCount
.
toString
()]
=
newVals
.
x
.
length
;
customCount
++
;
$
(
'
#loading
'
).
html
(
''
);
});
...
...
This diff is collapsed.
Click to expand it.
public/style/main.css
+
8
−
0
View file @
d25c31cd
...
...
@@ -9,6 +9,14 @@ mark {
display
:
none
;
}
.loading
{
text-align
:
center
;
font-size
:
200%
;
vertical-align
:
middle
;
height
:
20%
;
background-color
:
white
;
}
.draggable
{
/*Button Positioning and Size*/
...
...
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