You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/03/25 09:38:11 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1855] bulk mode
seems to work
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 11ac46f [OPENMEETINGS-1855] bulk mode seems to work
11ac46f is described below
commit 11ac46f686e0b7bb6c97e0c6087763cf55b67e18
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Mar 25 16:37:58 2018 +0700
[OPENMEETINGS-1855] bulk mode seems to work
---
.../apache/openmeetings/web/room/NetTestPanel.html | 8 ++---
.../apache/openmeetings/web/room/nettest-base.js | 33 +++++++++++++++++----
.../src/main/webapp/css/images/notrun.png | Bin 0 -> 5853 bytes
openmeetings-web/src/main/webapp/css/nettest.css | 23 +++++++++++++-
4 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
index c42b434..e783f27 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
@@ -28,28 +28,28 @@
<div class="nettest">
<div class="test-container" id="test-ping">
<div class="test" wicket:message="title:network.test.ping" data-icon="ui-icon-clock">
- <button type="button" data-measure="ping" data-start="true" data-next="jitter" wicket:message="data-lbl:network.test.ping">
+ <button type="button" class="test-btn not-started" data-measure="ping" data-start="true" data-next="jitter" wicket:message="data-lbl:network.test.ping">
<span class="value"></span>
</button>
</div>
</div>
<div class="test-container" id="test-jitter">
<div class="test" wicket:message="title:network.test.jitter" data-icon="ui-icon-clock">
- <button type="button" data-measure="jitter" data-start="true" data-next="upload" wicket:message="data-lbl:network.test.jitter">
+ <button type="button" class="test-btn not-started" data-measure="jitter" data-next="upload" wicket:message="data-lbl:network.test.jitter">
<span class="value"></span>
</button>
</div>
</div>
<div class="test-container" id="test-upload">
<div class="test" wicket:message="title:network.test.upl" data-icon="ui-icon-arrowthickstop-1-n">
- <button type="button" data-measure="upload" data-next="download" wicket:message="data-lbl:network.test.upl">
+ <button type="button" class="test-btn not-started" data-measure="upload" data-next="download" wicket:message="data-lbl:network.test.upl">
<span class="value"></span>
</button>
</div>
</div>
<div class="test-container" id="test-download">
<div class="test" wicket:message="title:network.test.dwn" data-icon="ui-icon-arrowthickstop-1-s">
- <button type="button" data-measure="download" wicket:message="data-lbl:network.test.dwn">
+ <button type="button" class="test-btn not-started" data-measure="download" wicket:message="data-lbl:network.test.dwn">
<span class="value"></span>
</button>
</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
index 672d8d9..2d65a47 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
@@ -1,7 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
var NetTest = (function() {
const self = {}, PINGS = 10, LIMIT = 2000, URL = './services/networktest/';
- let output, lbls, net, tests, testName, testLabel;
+ let output, lbls, net, tests, testName, testLabel, testNext, bulk = true;
// Based on
// https://github.com/nesk/network.js/blob/master/example/main.js
@@ -35,9 +35,11 @@ var NetTest = (function() {
.button()
.click(function() {
const btn = $(this);
+ btn.removeClass('complete').removeClass('not-started').addClass('started');
testLabel = btn.data('lbl');
testName = btn.data('measure');
tests[testName].start();
+ btn.find('.value').html('');
});
net = new Network();
@@ -107,6 +109,7 @@ var NetTest = (function() {
.on('restart', _restart)
.on('end', _end);
net.latency.on('start', _start);
+ $('.nettest button[data-start="true"]').click()
}
function __start(size, newSection) {
const msg = $('<span></span>').append(lbls['report.start']);
@@ -146,12 +149,13 @@ var NetTest = (function() {
_log($('<span></span>').append(lbls['jitter'])
.append(':').append(_value(max - avg, lbls['ms']))
.append(';').append(_value(min - avg, lbls['ms'])));
+ _setResult('')
}
function _pingEnd(avg, _all) {
_log($('<span></span>').append(lbls['ping.avg']).append(_value(avg, lbls['ms'])));
_log($('<span></span>').append(lbls['ping.rcv']).append(_value(_all.length, '')));
_log($('<span></span>').append(lbls['ping.lost']).append(_value(PINGS - _all.length, '')));
- $('#test-ping .value').html(_value(avg, lbls['ms']));
+ _setResult(_value(avg, lbls['ms']))
}
function _restart(size) {
__start(size, false);
@@ -159,11 +163,30 @@ var NetTest = (function() {
function _mbps() {
return lbls['mb'] + '/' + lbls['sec'];
}
+ function _btn() {
+ return $('#test-' + testName + ' button.test-btn');
+ }
+ function _setResult(val) {
+ const btn = _btn();
+ btn.addClass('complete').removeClass('started');
+ btn.find('.value').html(val);
+ testNext = btn.data('next');
+ if (!testNext) {
+ bulk = false;
+ return;
+ }
+ if (bulk) {
+ testName = testNext;
+ _btn().click();
+ }
+ }
function _end(avg) {
- const msg = $('<span></span>')
- .append(lbls[testName === 'upload' ? 'upl.speed' : 'dwn.speed'])
- .append(_value(avg / 1024 / 1024, _mbps()));
+ const val = _value(avg / 1024 / 1024, _mbps())
+ , msg = $('<span></span>')
+ .append(lbls[testName === 'upload' ? 'upl.speed' : 'dwn.speed'])
+ .append(val);
_log(msg);
+ _setResult(val)
}
function _delimiter(text) {
return $('<span class="delim"></span>').html(text);
diff --git a/openmeetings-web/src/main/webapp/css/images/notrun.png b/openmeetings-web/src/main/webapp/css/images/notrun.png
new file mode 100644
index 0000000..cb869eb
Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/notrun.png differ
diff --git a/openmeetings-web/src/main/webapp/css/nettest.css b/openmeetings-web/src/main/webapp/css/nettest.css
index 725703a..c3750db 100644
--- a/openmeetings-web/src/main/webapp/css/nettest.css
+++ b/openmeetings-web/src/main/webapp/css/nettest.css
@@ -30,11 +30,32 @@
width: 200px;
height: 100px;
}
-.nettest .test-container .value {
+.nettest .test-container button .value {
display: inline-block;
width: 80px;
height: 40px;
}
+.nettest .test-container button.not-started
+ , .nettest .test-container button.started
+{
+ background-color: #cccccc;
+}
+.nettest .test-container button.not-started .value
+ , .nettest .test-container button.started .value
+{
+ background-size: 40px;
+ background-repeat: no-repeat;
+ background-position-x: 20px;
+}
+.nettest .test-container button.not-started .value {
+ background-image: url(images/notrun.png);
+}
+.nettest .test-container button.started .value {
+ background-image: url(images/ajax-loader.gif);
+}
+.nettest .test-container button.complete {
+ background-color: lawngreen;
+}
.nettest .nettest-dialog {
padding: 0;
}
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.