svn commit: r1371222 - /pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/javascript_console_test.bxml

[sm...@apache.org]

Author: smartini
Date: Thu Aug  9 14:16:38 2012
New Revision: 1371222

URL: http://svn.apache.org/viewvc?rev=1371222&view=rev
Log:
JavaScript Console Test: small updates

Modified:
    pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/javascript_console_test.bxml

Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/javascript_console_test.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/javascript_console_test.bxml?rev=1371222&r1=1371221&r2=1371222&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/javascript_console_test.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/javascript_console_test.bxml Thu Aug  9 14:16:38 2012
@@ -30,13 +30,13 @@ limitations under the License.
 
     // JS variables for (remote) resources
     // needed for test 2 and 4
-    var baseURL   =
+    var resourcesBaseURL   =
         // "";
         // "file:///D:/work/pivot/site/trunk/deploy/assets-for-tests" + "/";  // local test
         // "http://pivot.apache.org/assets-for-tests" + "/";  // production url
         "http://pivot.apache.org/assets-for-tests" + "/";
     var frameName = "frame.bxml";
-    var frameURL  = baseURL + frameName;
+    var frameURL  = resourcesBaseURL + frameName;
     // note that bxml files must have the MIME Type "application/bxml" (as requested by BXMLSerializer),
     // or (BXMLSerializer) will try to get it from its file extension ...
 
@@ -85,13 +85,13 @@ limitations under the License.
     log("bxmlSerializer is " + bxmlSerializer);
     bxmlSerializer.getNamespace().put("application", application);  // add a reference to application even in this instance of BXMLSerializer ...
     log("put a reference to application in serializer namespace");
-    bxmlSerializer.getNamespace().put("baseURL", baseURL);  // add a reference to baseURL, so included bxml files could use it ...
-    log("put a reference to baseURL in serializer namespace");
+    bxmlSerializer.getNamespace().put("resourcesBaseURL", resourcesBaseURL);  // add a reference to resourcesBaseURL, so included bxml files could use it ...
+    log("put a reference to resourcesBaseURL in serializer namespace");
 
     // load the window/frame, but using an utility method defined in the application ...
     log("load the window/frame now, by JS code (calling Java code from the application) ...");
     var loadedWindow = application.loadWindowFromURL(frameURL, bxmlSerializer);
-//    var loadedWindow = application.loadWindowFromBaseURLAndFilename(baseURL, frameName, bxmlSerializer);
+//    var loadedWindow = application.loadWindowFromBaseURLAndFilename(resourcesBaseURL, frameName, bxmlSerializer);
     log("loadedWindow is " + loadedWindow + ", and its JavaScript typeof here is " + typeof loadedWindow);  // note that typeof loadedWindow is object
 
     var testRemoteFrame = loadedWindow;