Changeset 1108 for trunk

Timestamp:

03/15/10 01:12:37 (2 years ago)

Author:

bogdan2412

Message:

Fix "undefined" showing up as a round when submitting.

Ran JSLint on the submit.js script and fixed what was suggested there.
We should probably do this on all js files.

The problem was caused by the for (var key in rounds) loop which
iterated through properties from the "rounds" object's prototype.
Was fixed by adding a if (rounds.hasOwnProperty(key)).

File:

• trunk/www/static/js/submit.js (modified) (4 diffs)

trunk/www/static/js/submit.js

@@ -5 +5 @@
 
 var Submit_CompilerDisplay;
-
-function Submit_Init() {
-    if (!$('task_submit')) {
-        // no such form on this page
-        return;
-    }
-
-    var fSolution = $('form_solution');
-    var fTask = $('form_task');
-
-    Submit_CompilerDisplay = $('field_compiler').style.display;
-    Submit_RoundDisplay = $('field_round').style.display;
-
-    connect(fSolution, 'onchange', Submit_UpdateSolution);
-    if ('hidden' != fTask.type) {
-        connect(fTask, 'onchange', Submit_UpdateTask);
-    }
-
-    Submit_UpdateTask();
-}
 
 function Submit_HasCompiler(taskId) {
@@ -54 +34 @@
     }
     else {
-        alert('Atentie! Pentru fisierul selectat nu am putut alege automat ' 
-              + 'un compilator.');
+        alert('Atentie! Pentru fisierul selectat nu am putut alege automat ' +
+            'un compilator.');
         compiler.value = '-';
     }
@@ -97 +77 @@
                 }
             }
-            for (key in rounds) {
-                var option = document.createElement("option");
-                option.value = rounds[key]["id"];
-                if (rounds[key]["id"] == default_round) {
-                    option.selected = "selected";
+            for (var key in rounds) {
+                if (rounds.hasOwnProperty(key)) {
+                    var option = document.createElement('option');
+                    option.value = rounds[key]["id"];
+                    if (rounds[key]["id"] == default_round) {
+                        option.selected = 'selected';
+                    }
+                    var text = document.createTextNode(rounds[key]["title"]);
+                    option.appendChild(text);
+                    $('form_round').appendChild(option);
                 }
-                var text = document.createTextNode(rounds[key]["title"])
-                option.appendChild(text);
-                $('form_round').appendChild(option);
             }
-        }
+        };
 
         var error = function(error) {
             window.alert('Eroare! Nu pot determina rundele. Incercati din nou.');
-        }
+        };
 
         d.addCallbacks(ready, error);
@@ -124 +106 @@
 }
 
+function Submit_Init() {
+    if (!$('task_submit')) {
+        // no such form on this page
+        return;
+    }
+
+    var fSolution = $('form_solution');
+    var fTask = $('form_task');
+
+    Submit_CompilerDisplay = $('field_compiler').style.display;
+    Submit_RoundDisplay = $('field_round').style.display;
+
+    connect(fSolution, 'onchange', Submit_UpdateSolution);
+    if ('hidden' != fTask.type) {
+        connect(fTask, 'onchange', Submit_UpdateTask);
+    }
+
+    Submit_UpdateTask();
+}
+
 connect(window, 'onload', Submit_Init);