Merge branch 'websocket'

# Conflicts:
#	build.sh

1 files changed, 5 insertions, 1 deletions

diff --git a/www/js/router.js b/www/js/router.js
index cfeaf23..6dd6744 100644
--- a/www/js/router.js
+++ b/www/js/router.js
@@ -28,6 +28,8 @@ var router = null;
 var importer = null;
 var rdxport = null;
 
+jQuery.event.props.push('dataTransfer');
+
 $(document).ready(function() {
   clock = new Clock();
   clock.start();
@@ -39,6 +41,7 @@ $(document).ready(function() {
 Rdxport.Router = function(auth) {
   this.auth = auth;
   this.authView = new Rdxport.AuthView(this.auth);
+  this.activeRoute = null;
 };
 
 Rdxport.Router.prototype.route = function(page, subpage) {
@@ -52,7 +55,7 @@ Rdxport.Router.prototype.route = function(page, subpage) {
   }
 
   if (!importer) {
-    importer = new Rdxport.Importer(this.auth.username, this.auth.token);
+    importer = new Rdxport.Importer(this.auth.username, this.auth.token, 'wss://import.helsinki.at/rhimportd');
     window.onbeforeunload = function(event) {
       if (importer.isUploading()) {
         return 'Achtung: Es laufen noch imports.';
@@ -117,6 +120,7 @@ Rdxport.Router.prototype.route = function(page, subpage) {
       this.logout();
       break;
   }
+  this.activeRoute = page;
 
   href = locationHrefValue();
   if (href[1] !== page && page !== 'logout' && (!href[2] || href[2] !== subpage)) {