Changes in / [3:1]

Files:

• pom.xml (modified) (1 diff)
• src/main/webapp/newsession.xhtml (modified) (6 diffs)
• src/main/webapp/newtournament.xhtml (modified) (3 diffs)

/pom.xml

@@ -182 +182 @@
                                                         </resources>
                                                 </configuration>
-                                        </execution>
-                                </executions>
-                        </plugin>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-source-plugin</artifactId>
-                                <executions>
-                                        <execution>
-                                                <id>attach-sources</id>
-                                                <goals>
-                                                        <goal>jar</goal>
-                                                </goals>
                                         </execution>
                                 </executions>

/src/main/webapp/newsession.xhtml

@@ -31 +31 @@
                 onchange="connectDomain()"> </input>
         <br /> Domain:
-        <select id="domainselection" onchange="selectDomain()">
+        <select id="domainselection" onclick="selectDomain()">
                 <!-- <option>Waiting for profiles server</option> -->
         </select>
@@ -80 +80 @@
         
         
-        
         // FIXME quick and dirty code. No clean MVC
         
         
         <![CDATA[
-        //"use strict"; 
+        "use strict";   
         
         var domainwebsocket = null;
@@ -103 +102 @@
         var partyprofiles=[];
 
-        /** from http://fitzgeraldnick.com/2010/08/10/settimeout-patterns.html */
-    
-    function async (fn) {
-        setTimeout(fn, 1000);
-    }
-
-    function sometimeWhen (test, then) {
-        async(function () {
-            if ( test() ) {
-                then();
-            } else {
-                async(arguments.callee);
-            }
-        });
-    }
-
-        
-        
+        
         /**
         Refresh known domains using given profilesserver URL. 
@@ -285 +267 @@
         }
 
-        var x=1;
         /**
         start the session as currently set on this page.
@@ -311 +292 @@
                         if (this.status == 200) {
                                 document.getElementById("startbutton").disabled=true;
+                                document.getElementById("started").setAttribute("style","");
                                 document.getElementById("logref").href="log/"+this.responseText+".json";
                                 document.getElementById("plotref").href="plotlog.xhtml?id="+this.responseText;
                                 
-                                sometimeWhen(function() { x=x+1; return x==3 },
-                                                function() { document.getElementById("started").setAttribute("style",""); });
-
                         }
                         else 
@@ -352 +331 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.0.0"
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.0.0"
                 connectDomain();
                 connectParties();

/src/main/webapp/newtournament.xhtml

@@ -51 +51 @@
                         onchange="connectDomain()"> </input>
                 <br />
-                Domain: <select id="domainselection" onchange="selectDomain()">
+                Domain: <select id="domainselection" onclick="selectDomain()">
                         <!-- <option>Waiting for profiles server</option> -->
                 </select>
@@ -374 +374 @@
                 }
                 
-                var reuseParties  = document.getElementById("reuseparties").checked;
+                var reuseParties  = "on"== document.getElementById("reuseparties").value;
                 var sessionSettings = {"SAOPSettings":{"participants":[],"deadline":deadline}};
                 return JSON.stringify({"AllPermutationsSettings":{"parties":parties,"profiles":profiles,"reuseParties":reuseParties,"partiesPerSession":2,"sessionsettings":sessionSettings}});
@@ -383 +383 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.0.0"
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.0.0"
-
-
                 connectDomain();
                 connectParties();