Refactoring pageUrl implementation.

Author: flashphoner

client/client/src/js/Click2Call.js

@@ -86,14 +86,10 @@ $(document).ready(function () {
 
 
 function loginByToken(token) {
-    trace("loginByToken", window.location, token);
+    trace("loginByToken", document.URL, token);
     changeCallStateInfo("...Registering...");
 
-    if (navigator.userAgent.indexOf("Firefox") != -1) {
-        var pageUrl = window.location.toString();
-        trace("Client browser is Firefox");
-    }
-
+    var pageUrl = document.URL;
     var result = flashphoner.loginByToken(flashphonerLoader.urlServer, token, pageUrl);
 }
 

client/client/src/js/Phone.js

@@ -84,7 +84,7 @@ function login() {
 function loginByToken(token) {
     trace("loginByToken", token);
     connectingViewBeClosed = false;
-    var result = flashphoner.loginByToken(flashphonerLoader.urlServer, token, null);
+    var result = flashphoner.loginByToken(flashphonerLoader.urlServer, token, document.URL);
 
     closeLoginView();
     openConnectingView("Connecting...", 0);