Merge pull request #581 from sstidl/dev

switch units to Mbit/s

doc.md

@@ -507,8 +507,8 @@ You can think of this as a finite state machine. These are the states (use getSt
     While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2.
 * __2__: test point selected, ready to start the test. Use `start()` to begin, this will move to state 3
 * __3__: test running. Here, your `onupdate` event callback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your `onupdate` function, with the following items:
-        - `dlStatus`: download speed in mbps
-        - `ulStatus`: upload speed in mbps
+        - `dlStatus`: download speed in Mbit/s
+        - `ulStatus`: upload speed in Mbit/s
         - `pingStatus`: ping in ms
         - `jitterStatus`: jitter in ms
         - `dlProgress`: progress of the download test as a float 0-1

docker/frontend.php

@@ -409,13 +409,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">

docker/standalone.php

@@ -301,13 +301,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">

example-multipleServers-full.html

@@ -424,13 +424,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">

example-multipleServers-pretty.html

@@ -212,12 +212,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 	<div class="testGroup">

example-singleServer-customSettings.html

@@ -157,12 +157,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 </div>

example-singleServer-full.html

@@ -298,13 +298,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">

example-singleServer-gauges.html

@@ -242,13 +242,13 @@ function initUI(){
 				<div class="testName">Download</div>
 				<canvas id="dlMeter" class="meter"></canvas>
 				<div id="dlText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 			<div class="testArea">
 				<div class="testName">Upload</div>
 				<canvas id="ulMeter" class="meter"></canvas>
 				<div id="ulText" class="meterText"></div>
-				<div class="unit">Mbps</div>
+				<div class="unit">Mbit/s</div>
 			</div>
 		</div>
 		<div id="ipArea">

example-singleServer-pretty.html

@@ -160,12 +160,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 	<div class="testGroup">

example-singleServer-progressBar.html

@@ -180,12 +180,12 @@ function I(id){return document.getElementById(id);}
 		<div class="testArea">
 			<div class="testName">Download</div>
 			<div id="dlText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 		<div class="testArea">
 			<div class="testName">Upload</div>
 			<div id="ulText" class="meterText"></div>
-			<div class="unit">Mbps</div>
+			<div class="unit">Mbit/s</div>
 		</div>
 	</div>
 	<div class="testGroup">

results/index.php

@@ -162,7 +162,7 @@ function drawImage($speedtest)
     $POSITION_Y_WATERMARK = 223 * $SCALE;
 
     // configure labels
-    $MBPS_TEXT = 'Mbps';
+    $MBPS_TEXT = 'Mbit/s';
     $MS_TEXT = 'ms';
     $PING_TEXT = 'Ping';
     $JIT_TEXT = 'Jitter';

speedtest.js

@@ -28,8 +28,8 @@
         While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2.
     - 2: test point selected, ready to start the test. Use start() to begin, this will move to state 3
     - 3: test running. Here, your onupdate event callback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your onupdate function, with the following items:
-            - dlStatus: download speed in mbps
-            - ulStatus: upload speed in mbps
+            - dlStatus: download speed in Mbit/s
+            - ulStatus: upload speed in Mbit/s
             - pingStatus: ping in ms
             - jitterStatus: jitter in ms
             - dlProgress: progress of the download test as a float 0-1