ndt-dev - [ndt-dev] [ndt] r953 committed - Merge FlashIssue112 branch into trunk
Subject: NDT-DEV email list created
List archive
- From:
- To:
- Subject: [ndt-dev] [ndt] r953 committed - Merge FlashIssue112 branch into trunk
- Date: Fri, 21 Feb 2014 08:01:47 +0000
Revision: 953
Author:
Date: Fri Feb 21 08:01:33 2014 UTC
Log: Merge FlashIssue112 branch into trunk
http://code.google.com/p/ndt/source/detail?r=953
Modified:
/trunk
/trunk/flash-client/src/GUI.as
/trunk/flash-client/src/Main.as
/trunk/flash-client/src/NDTConstants.as
/trunk/flash-client/src/NDTUtils.as
=======================================
--- /trunk/flash-client/src/GUI.as Fri Feb 21 07:54:26 2014 UTC
+++ /trunk/flash-client/src/GUI.as Fri Feb 21 08:01:33 2014 UTC
@@ -77,17 +77,7 @@
_aboutNDTText.height = 0.40 * _stageHeight;
_aboutNDTText.wordWrap = true;
_aboutNDTText.selectable = false;
- _aboutNDTText.text = "Network Diagnostic Tool (NDT) provides a "
- + "sophisticated speed and diagnostic test. An NDT "
- + "test reports more than just the upload and "
- + "download speeds -- it also attempts to determine "
- + "what, if any, problems limited these speeds, "
- + "differentiating between computer configuration "
- + "and network infrastructure problems. While the "
- + "diagnostic messages are most useful for expert "
- + "users, they can also help novice users by "
- + "allowing them to provide detailed trouble "
- + "reports to their network administrator.";
+ _aboutNDTText.text = Main.ndt_description;
// 3) Learn more link
_urlRequest = new URLRequest(NDTConstants.MLAB_SITE);
=======================================
--- /trunk/flash-client/src/Main.as Thu Feb 20 20:24:05 2014 UTC
+++ /trunk/flash-client/src/Main.as Fri Feb 21 08:01:33 2014 UTC
@@ -27,6 +27,7 @@
public static var gui:GUI;
public static var server_hostname:String = NDTConstants.SERVER_HOSTNAME;
public static var client_application:String = NDTConstants.CLIENT_ID;
+ public static var ndt_description:String = NDTConstants.NDT_DESCRIPTION;
public function Main():void {
if (stage)
@@ -46,7 +47,7 @@
// Set the properties of the SWF from HTML tags.
NDTUtils.initializeFromHTML(this.root.loaderInfo.parameters);
- var frame:NDTPController = new NDTPController(server_hostname,
+ var frame:NDTPController = new NDTPController(server_hostname,
client_application);
stage.showDefaultContextMenu = false;
=======================================
--- /trunk/flash-client/src/NDTConstants.as Sun Feb 2 19:14:17 2014 UTC
+++ /trunk/flash-client/src/NDTConstants.as Fri Feb 21 08:01:33 2014 UTC
@@ -29,6 +29,18 @@
"ndt.iupui.mlab1.nuq0t.measurement-lab.org";
// For localization.
public static const BUNDLE_NAME:String = "DisplayMessages";
+ public static const NDT_DESCRIPTION:String =
+ "Network Diagnostic Tool (NDT) provides a "
+ + "sophisticated speed and diagnostic test. An NDT "
+ + "test reports more than just the upload and "
+ + "download speeds -- it also attempts to determine "
+ + "what, if any, problems limited these speeds, "
+ + "differentiating between computer configuration "
+ + "and network infrastructure problems. While the "
+ + "diagnostic messages are most useful for expert "
+ + "users, they can also help novice users by "
+ + "allowing them to provide detailed trouble "
+ + "reports to their network administrator.";
public static const PROTOCOL_MSG_READ_SUCCESS:int = 0;
public static const PROTOCOL_MSG_READ_ERROR:int = 1;
=======================================
--- /trunk/flash-client/src/NDTUtils.as Thu Feb 20 20:24:05 2014 UTC
+++ /trunk/flash-client/src/NDTUtils.as Fri Feb 21 08:01:33 2014 UTC
@@ -95,6 +95,7 @@
TestResults.appendDebugMsg("Bad Flash permissions: No "
+ "access to javascript.");
}
+
try {
var js_client_application:String =
ExternalInterface.call("getClientApplication");
@@ -109,6 +110,15 @@
TestResults.appendDebugMsg("Bad Flash permissions: No "
+ "access to javascript.");
}
+
+ try {
+ Main.ndt_description = ExternalInterface.call("getNDTDescription");
+ TestResults.appendDebugMsg(
+ "Initialized NDT description from JavaScript:"
+ + Main.ndt_description);
+ } catch(e:Error) {
+ Main.ndt_description = NDTConstants.NDT_DESCRIPTION;
+ }
}
/**
- [ndt-dev] [ndt] r953 committed - Merge FlashIssue112 branch into trunk, ndt, 02/21/2014
Archive powered by MHonArc 2.6.16.