# HG changeset patch
# User jbe
# Date 1352377057 -3600
# Node ID b865f87ea8105c0577267fbd0bdd3b53b87b271d
# Parent  9d82c11a93b11284f42858de143dc33ee0509cc4
Work on robustification of JavaScript voting

diff -r 9d82c11a93b1 -r b865f87ea810 app/main/_layout/default.html
--- a/app/main/_layout/default.html	Tue Nov 06 21:28:25 2012 +0100
+++ b/app/main/_layout/default.html	Thu Nov 08 13:17:37 2012 +0100
@@ -11,6 +11,7 @@
     <![if !IE]>
       <script type="text/javascript">jsFail = false;</script>
     <![endif]>
+    <script type="text/javascript" src="__BASEURL__/static/js/jsprotect.js"></script>
     <script type="text/javascript" src="__BASEURL__/static/js/partialload.js"></script>
     <script type="text/javascript">var ui_tabs_active = {};</script>
   </head>
diff -r 9d82c11a93b1 -r b865f87ea810 app/main/vote/list.lua
--- a/app/main/vote/list.lua	Tue Nov 06 21:28:25 2012 +0100
+++ b/app/main/vote/list.lua	Thu Nov 08 13:17:37 2012 +0100
@@ -2,6 +2,7 @@
 
 local member_id = param.get("member_id", atom.integer)
 local member
+local readonly = false
 
 local preview = param.get("preview") or param.get("preview2") == "1" and true or false
 
diff -r 9d82c11a93b1 -r b865f87ea810 static/js/dragdrop.js
--- a/static/js/dragdrop.js	Tue Nov 06 21:28:25 2012 +0100
+++ b/static/js/dragdrop.js	Thu Nov 08 13:17:37 2012 +0100
@@ -1,76 +1,85 @@
-if (!jsFail) {
+jsProtect(function() {
   window.addEventListener("load", function(event) {
-    var originalElement;
-    var draggedElement;
-    var mouseX;
-    var mouseY;
-    var mouseOffsetX;
-    var mouseOffsetY;
-    var elementOffsetX;
-    var elementOffsetY;
-    var dropFunc;
-    var dragElement = function(element, func) {
-      //if (typeof(element) == "string") element = document.getElementById(element);
-      originalElement = element;
-      draggedElement = originalElement.cloneNode(true);
-      originalElement.style.visibility = "hidden";
-      draggedElement.style.margin = 0;
-      draggedElement.style.position = "absolute";
-      draggedElement.style.left = elementOffsetX = originalElement.offsetLeft;
-      draggedElement.style.top  = elementOffsetY = originalElement.offsetTop;
-      draggedElement.style.width  = originalElement.clientWidth;
-      draggedElement.style.height = originalElement.clientHeight;
-      draggedElement.style.backgroundColor = "#eee";
-      draggedElement.style.opacity = 0.8;
-      originalElement.offsetParent.appendChild(draggedElement);
-      // workaround for wrong clientWidth and clientHeight information:
-      draggedElement.style.width = 2*originalElement.clientWidth - draggedElement.clientWidth;
-      draggedElement.style.height = 2*originalElement.clientHeight - draggedElement.clientHeight;
-      mouseOffsetX = mouseX;
-      mouseOffsetY = mouseY;
-      dropFunc = func;
-    };
-    window.addEventListener("mousemove", function(event) {
-      mouseX = event.pageX;
-      mouseY = event.pageY;
-      if (draggedElement) {
-        draggedElement.style.left = elementOffsetX + mouseX - mouseOffsetX;
-        draggedElement.style.top  = elementOffsetY + mouseY - mouseOffsetY;
+    jsProtect(function() {
+      var originalElement;
+      var draggedElement;
+      var mouseX;
+      var mouseY;
+      var mouseOffsetX;
+      var mouseOffsetY;
+      var elementOffsetX;
+      var elementOffsetY;
+      var dropFunc;
+      var dragElement = function(element, func) {
+        //if (typeof(element) == "string") element = document.getElementById(element);
+        originalElement = element;
+        draggedElement = originalElement.cloneNode(true);
+        originalElement.style.visibility = "hidden";
+        draggedElement.style.margin = 0;
+        draggedElement.style.position = "absolute";
+        draggedElement.style.left = elementOffsetX = originalElement.offsetLeft;
+        draggedElement.style.top  = elementOffsetY = originalElement.offsetTop;
+        draggedElement.style.width  = originalElement.clientWidth;
+        draggedElement.style.height = originalElement.clientHeight;
+        draggedElement.style.backgroundColor = "#eee";
+        draggedElement.style.opacity = 0.8;
+        originalElement.offsetParent.appendChild(draggedElement);
+        // workaround for wrong clientWidth and clientHeight information:
+        draggedElement.style.width = 2*originalElement.clientWidth - draggedElement.clientWidth;
+        draggedElement.style.height = 2*originalElement.clientHeight - draggedElement.clientHeight;
+        mouseOffsetX = mouseX;
+        mouseOffsetY = mouseY;
+        dropFunc = func;
+      };
+      window.addEventListener("mousemove", function(event) {
+        jsProtect(function() {
+          mouseX = event.pageX;
+          mouseY = event.pageY;
+          if (draggedElement) {
+            draggedElement.style.left = elementOffsetX + mouseX - mouseOffsetX;
+            draggedElement.style.top  = elementOffsetY + mouseY - mouseOffsetY;
+          }
+        });
+      }, true);
+      var mouseDrop = function(event) {
+        jsProtect(function() {
+          if (draggedElement) {
+            dropFunc(
+              originalElement,
+              elementOffsetX + mouseX - mouseOffsetX,
+              elementOffsetY + mouseY - mouseOffsetY
+            );
+            originalElement.style.visibility = '';
+            draggedElement.parentNode.removeChild(draggedElement);
+            originalElement = null;
+            draggedElement = null;
+          }
+        });
+      };
+      window.addEventListener("mouseup",   mouseDrop, true);
+      window.addEventListener("mousedown", mouseDrop, true);
+      var elements = document.getElementsByTagName("*");
+      for (var i=0; i<elements.length; i++) {
+        var element = elements[i];
+        if (element.className == "movable") {
+          element.addEventListener("mousedown", function(event) {
+            jsProtect(function() {
+              event.target.style.cursor = "move";
+              dragElement(event.currentTarget, function(element, dropX, dropY) {
+                event.target.style.cursor = '';
+                elementDropped(element, dropX, dropY);
+              });
+              event.preventDefault();
+            });
+          }, false);
+        } else if (element.className == "clickable") {
+          element.addEventListener("mousedown", function(event) {
+            jsProtect(function() {
+              event.stopPropagation();
+            });
+          }, false);
+        }
       }
-    }, true);
-    var mouseDrop = function(event) {
-      if (draggedElement) {
-        dropFunc(
-          originalElement,
-          elementOffsetX + mouseX - mouseOffsetX,
-          elementOffsetY + mouseY - mouseOffsetY
-        );
-        originalElement.style.visibility = '';
-        draggedElement.parentNode.removeChild(draggedElement);
-        originalElement = null;
-        draggedElement = null;
-      }
-    };
-    window.addEventListener("mouseup",   mouseDrop, true);
-    window.addEventListener("mousedown", mouseDrop, true);
-    var elements = document.getElementsByTagName("*");
-    for (var i=0; i<elements.length; i++) {
-      var element = elements[i];
-      if (element.className == "movable") {
-        element.addEventListener("mousedown", function(event) {
-          event.target.style.cursor = "move";
-          dragElement(event.currentTarget, function(element, dropX, dropY) {
-            event.target.style.cursor = '';
-            elementDropped(element, dropX, dropY);
-          });
-          event.preventDefault();
-        }, false);
-      } else if (element.className == "clickable") {
-        element.addEventListener("mousedown", function(event) {
-          event.stopPropagation();
-        }, false);
-      }
-    }
+    });
   }, false);
-
-}
\ No newline at end of file
+});
diff -r 9d82c11a93b1 -r b865f87ea810 static/js/jsprotect.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/js/jsprotect.js	Thu Nov 08 13:17:37 2012 +0100
@@ -0,0 +1,7 @@
+function jsProtect(f) {
+  if (!jsFail) try {
+    return f();
+  } catch (e) {
+    jsFail = true;
+  }
+}
diff -r 9d82c11a93b1 -r b865f87ea810 static/js/voting.js
--- a/static/js/voting.js	Tue Nov 06 21:28:25 2012 +0100
+++ b/static/js/voting.js	Thu Nov 08 13:17:37 2012 +0100
@@ -1,4 +1,4 @@
-if (!jsFail) {
+jsProtect(function() {
   voting_text_approval_single               = "Approval"
   voting_text_approval_multi                = "Approval"
   voting_text_first_preference_single       = "Approval (first preference)"
@@ -99,57 +99,90 @@
     }
   }
   function voting_move(element, up, dropX, dropY) {
-    if (typeof(element) == "string") element = document.getElementById(element);
-    var mouse = (up == null);
-    var oldParent = element.parentNode;
-    if (mouse) var centerY = dropY + element.clientHeight / 2;
-    var approvalCount = 0;
-    var disapprovalCount = 0;
-    var mainDiv = document.getElementById("voting");
-    var sections = mainDiv.childNodes;
-    for (var i=0; i<sections.length; i++) {
-      var section = sections[i];
-      if (section.className == "approval")       approvalCount++;
-      if (section.className == "disapproval") disapprovalCount++;
-    }
-    if (mouse) {
+    jsProtect(function() {
+      if (typeof(element) == "string") element = document.getElementById(element);
+      var mouse = (up == null);
+      var oldParent = element.parentNode;
+      if (mouse) var centerY = dropY + element.clientHeight / 2;
+      var approvalCount = 0;
+      var disapprovalCount = 0;
+      var mainDiv = document.getElementById("voting");
+      var sections = mainDiv.childNodes;
       for (var i=0; i<sections.length; i++) {
         var section = sections[i];
-        if (
-          section.className == "approval" ||
-          section.className == "abstention" ||
-          section.className == "disapproval"
-        ) {
+        if (section.className == "approval")       approvalCount++;
+        if (section.className == "disapproval") disapprovalCount++;
+      }
+      if (mouse) {
+        for (var i=0; i<sections.length; i++) {
+          var section = sections[i];
           if (
-            centerY >= section.offsetTop &&
-            centerY <  section.offsetTop + section.clientHeight
+            section.className == "approval" ||
+            section.className == "abstention" ||
+            section.className == "disapproval"
           ) {
-            var entries = section.childNodes;
-            for (var j=0; j<entries.length; j++) {
-              var entry = entries[j];
-              if (entry.className == "movable") {
-                if (centerY < entry.offsetTop + entry.clientHeight / 2) {
-                  if (element != entry) {
-                    oldParent.removeChild(element);
-                    section.insertBefore(element, entry);
+            if (
+              centerY >= section.offsetTop &&
+              centerY <  section.offsetTop + section.clientHeight
+            ) {
+              var entries = section.childNodes;
+              for (var j=0; j<entries.length; j++) {
+                var entry = entries[j];
+                if (entry.className == "movable") {
+                  if (centerY < entry.offsetTop + entry.clientHeight / 2) {
+                    if (element != entry) {
+                      oldParent.removeChild(element);
+                      section.insertBefore(element, entry);
+                    }
+                    break;
                   }
-                  break;
                 }
               }
+              if (j == entries.length) {
+                oldParent.removeChild(element);
+                section.appendChild(element);
+              }
+              break;
             }
-            if (j == entries.length) {
-              oldParent.removeChild(element);
-              section.appendChild(element);
-            }
-            break;
           }
         }
-      }
-      if (i == sections.length) {
-        var newSection = document.createElement("div");
-        var cathead = document.createElement("div");
-        cathead.setAttribute("class", "cathead");
-        newSection.appendChild(cathead);
+        if (i == sections.length) {
+          var newSection = document.createElement("div");
+          var cathead = document.createElement("div");
+          cathead.setAttribute("class", "cathead");
+          newSection.appendChild(cathead);
+          for (var i=0; i<sections.length; i++) {
+            var section = sections[i];
+            if (
+              section.className == "approval" ||
+              section.className == "abstention" ||
+              section.className == "disapproval"
+            ) {
+              if (centerY < section.offsetTop + section.clientHeight / 2) {
+                if (section.className == "disapproval") {
+                  newSection.setAttribute("class", "disapproval");
+                  disapprovalCount++;
+                } else {
+                  newSection.setAttribute("class", "approval");
+                  approvalCount++;
+                }
+                mainDiv.insertBefore(newSection, section);
+                break;
+              }
+            }
+          }
+          if (i == sections.length) {
+            newSection.setAttribute("class", "disapproval");
+            disapprovalCount++;
+            mainDiv.appendChild(newSection);
+          }
+          oldParent.removeChild(element);
+          newSection.appendChild(element);
+        }
+      } else {
+        var oldFound = false;
+        var prevSection = null;
+        var nextSection = null;
         for (var i=0; i<sections.length; i++) {
           var section = sections[i];
           if (
@@ -157,195 +190,184 @@
             section.className == "abstention" ||
             section.className == "disapproval"
           ) {
-            if (centerY < section.offsetTop + section.clientHeight / 2) {
-              if (section.className == "disapproval") {
-                newSection.setAttribute("class", "disapproval");
-                disapprovalCount++;
-              } else {
-                newSection.setAttribute("class", "approval");
-                approvalCount++;
+            if (oldFound) {
+              nextSection = section;
+              break;
+            } else if (section == oldParent) {
+              oldFound = true;
+            } else {
+              prevSection = section;
+            }
+          }
+        }
+        var create;
+        if (oldParent.className == "abstention") {
+          create = true;
+        } else {
+          create = false;
+          for (var i=0; i<oldParent.childNodes.length; i++) {
+            var entry = oldParent.childNodes[i];
+            if (entry.className == "movable") {
+              if (entry != element) {
+                create = true;
+                break;
               }
-              mainDiv.insertBefore(newSection, section);
-              break;
             }
           }
         }
-        if (i == sections.length) {
-          newSection.setAttribute("class", "disapproval");
-          disapprovalCount++;
-          mainDiv.appendChild(newSection);
+        var newSection;
+        if (create) {
+          newSection = document.createElement("div");
+          var cathead = document.createElement("div");
+          cathead.setAttribute("class", "cathead");
+          newSection.appendChild(cathead);
+          if (
+            oldParent.className == "approval" ||
+            (oldParent.className == "abstention" && up)
+          ) {
+            newSection.setAttribute("class", "approval");
+            approvalCount++;
+          } else {
+            newSection.setAttribute("class", "disapproval");
+            disapprovalCount++;
+          }
+          if (up) {
+            mainDiv.insertBefore(newSection, oldParent);
+          } else {
+            if (nextSection) mainDiv.insertBefore(newSection, nextSection);
+            else mainDiv.appendChild(newSection);
+          }
+        } else {
+          if (up) newSection = prevSection;
+          else newSection = nextSection;
         }
-        oldParent.removeChild(element);
-        newSection.appendChild(element);
-      }
-    } else {
-      var oldFound = false;
-      var prevSection = null;
-      var nextSection = null;
-      for (var i=0; i<sections.length; i++) {
-        var section = sections[i];
-        if (
-          section.className == "approval" ||
-          section.className == "abstention" ||
-          section.className == "disapproval"
-        ) {
-          if (oldFound) {
-            nextSection = section;
-            break;
-          } else if (section == oldParent) {
-            oldFound = true;
+        if (newSection) {
+          oldParent.removeChild(element);
+          if (create || up) {
+            newSection.appendChild(element);
           } else {
-            prevSection = section;
-          }
-        }
-      }
-      var create;
-      if (oldParent.className == "abstention") {
-        create = true;
-      } else {
-        create = false;
-        for (var i=0; i<oldParent.childNodes.length; i++) {
-          var entry = oldParent.childNodes[i];
-          if (entry.className == "movable") {
-            if (entry != element) {
-              create = true;
-              break;
+            var inserted = false;
+            for (var i=0; i<newSection.childNodes.length; i++) {
+              var entry = newSection.childNodes[i];
+              if (entry.className == "movable") {
+                newSection.insertBefore(element, entry);
+                inserted = true;
+                break;
+              }
             }
+            if (!inserted) newSection.appendChild(element);
           }
         }
       }
-      var newSection;
-      if (create) {
-        newSection = document.createElement("div");
-        var cathead = document.createElement("div");
-        cathead.setAttribute("class", "cathead");
-        newSection.appendChild(cathead);
+      // sections = mainDiv.childNodes;
+      for (i=0; i<sections.length; i++) {
+        var section = sections[i];
         if (
-          oldParent.className == "approval" ||
-          (oldParent.className == "abstention" && up)
+          (section.className == "approval"    &&    approvalCount > 1) ||
+          (section.className == "disapproval" && disapprovalCount > 1)
         ) {
-          newSection.setAttribute("class", "approval");
-          approvalCount++;
-        } else {
-          newSection.setAttribute("class", "disapproval");
-          disapprovalCount++;
-        }
-        if (up) {
-          mainDiv.insertBefore(newSection, oldParent);
-        } else {
-          if (nextSection) mainDiv.insertBefore(newSection, nextSection);
-          else mainDiv.appendChild(newSection);
-        }
-      } else {
-        if (up) newSection = prevSection;
-        else newSection = nextSection;
-      }
-      if (newSection) {
-        oldParent.removeChild(element);
-        if (create || up) {
-          newSection.appendChild(element);
-        } else {
-          var inserted = false;
-          for (var i=0; i<newSection.childNodes.length; i++) {
-            var entry = newSection.childNodes[i];
-            if (entry.className == "movable") {
-              newSection.insertBefore(element, entry);
-              inserted = true;
-              break;
-            }
+          var entries = section.childNodes;
+          for (var j=0; j<entries.length; j++) {
+            var entry = entries[j];
+            if (entry.className == "movable") break;
           }
-          if (!inserted) newSection.appendChild(element);
+          if (j == entries.length) {
+            section.parentNode.removeChild(section);
+          }
         }
       }
-    }
-    // sections = mainDiv.childNodes;
-    for (i=0; i<sections.length; i++) {
-      var section = sections[i];
-      if (
-        (section.className == "approval"    &&    approvalCount > 1) ||
-        (section.className == "disapproval" && disapprovalCount > 1)
-      ) {
-        var entries = section.childNodes;
-        for (var j=0; j<entries.length; j++) {
-          var entry = entries[j];
-          if (entry.className == "movable") break;
-        }
-        if (j == entries.length) {
-          section.parentNode.removeChild(section);
-        }
-      }
-    }
-    voting_setCategoryHeadings();
+      voting_setCategoryHeadings();
+    });
   }
   function elementDropped(element, dropX, dropY) {
     voting_move(element, null, dropX, dropY);
   }
   window.addEventListener("load", function(event) {
-    voting_setCategoryHeadings();
-    var mainDiv = document.getElementById("voting");
-    var form = document.getElementById("voting_form");
-    var elements = document.getElementsByTagName("input");
-    for (var i=0; i<elements.length; i++) {
-      var element = elements[i];
-      if (element.className == "voting_done1" ||
-          element.className == "voting_done2" ||
-          element.name == "preview") {
-        element.addEventListener("click", function(event) {
-          if (event.target.name == "preview") {
-            document.getElementById("preview2").value = "1";
-          }
-          var scoringString = "";
-          var approvalCount = 0;
-          var disapprovalCount = 0;
-          var sections = mainDiv.childNodes;
-          for (var j=0; j<sections.length; j++) {
-            var section = sections[j];
-            if (section.className == "approval")       approvalCount++;
-            if (section.className == "disapproval") disapprovalCount++;
-          }
-          var approvalIndex = 0;
-          var disapprovalIndex = 0;
-          for (var j=0; j<sections.length; j++) {
-            var section = sections[j];
-            if (
-              section.className == "approval"    ||
-              section.className == "abstention"  ||
-              section.className == "disapproval"
-            ) {
-              var score;
-              if (section.className == "approval") {
-                score = approvalCount - approvalIndex;
-                approvalIndex++;
-              } else if (section.className == "abstention") {
-                score = 0;
-              } else if (section.className == "disapproval") {
-                score = -1 - disapprovalIndex;
-                disapprovalIndex++;
+    jsProtect(function() {
+      var jsTest = true;
+      var jsTestSuccess = false;
+      voting_setCategoryHeadings();
+      var mainDiv = document.getElementById("voting");
+      var form = document.getElementById("voting_form");
+      var elements = document.getElementsByTagName("input");
+      for (var i=0; i<elements.length; i++) {
+        var element = elements[i];
+        if (element.className == "voting_done1" ||
+            element.className == "voting_done2" ||
+            element.name == "preview") {
+          element.addEventListener("click", function(event) {
+            jsProtect(function() {
+              event.preventDefault();
+              if (event.target.name == "preview") {
+                document.getElementById("preview2").value = "1";
+              }
+              var scoringString = "";
+              var approvalCount = 0;
+              var disapprovalCount = 0;
+              var sections = mainDiv.childNodes;
+              for (var j=0; j<sections.length; j++) {
+                var section = sections[j];
+                if (section.className == "approval")       approvalCount++;
+                if (section.className == "disapproval") disapprovalCount++;
               }
-              var entries = section.childNodes;
-              for (var k=0; k<entries.length; k++) {
-                var entry = entries[k];
-                if (entry.className == "movable") {
-                  var id = entry.id.match(/[0-9]+/);
-                  var field = document.createElement("input");
-                  scoringString += id + ":" + score + ";";
+              var approvalIndex = 0;
+              var disapprovalIndex = 0;
+              for (var j=0; j<sections.length; j++) {
+                var section = sections[j];
+                if (
+                  section.className == "approval"    ||
+                  section.className == "abstention"  ||
+                  section.className == "disapproval"
+                ) {
+                  var score;
+                  if (section.className == "approval") {
+                    score = approvalCount - approvalIndex;
+                    approvalIndex++;
+                  } else if (section.className == "abstention") {
+                    score = 0;
+                  } else if (section.className == "disapproval") {
+                    score = -1 - disapprovalIndex;
+                    disapprovalIndex++;
+                  }
+                  var entries = section.childNodes;
+                  for (var k=0; k<entries.length; k++) {
+                    var entry = entries[k];
+                    if (entry.className == "movable") {
+                      var id = entry.id.match(/[0-9]+/);
+                      var field = document.createElement("input");
+                      scoringString += id + ":" + score + ";";
+                    }
+                  }
                 }
               }
-            }
-          }
-          var fields = form.childNodes;
-          for (var j=0; j<fields.length; j++) {
-            var field = fields[j];
-            if (field.name == "scoring") {
-              field.setAttribute("value", scoringString);
-              form.submit();
-              return;
-            }
-          }
-          alert('Hidden input field named "scoring" not found.');
-        }, false);
+              var fields = form.childNodes;
+              for (var j=0; j<fields.length; j++) {
+                var field = fields[j];
+                if (field.name == "scoring") {
+                  field.setAttribute("value", scoringString);
+                  if (jsTest) {
+                    jsTestSuccess = success;
+                    return;
+                  } else {
+                    form.submit();
+                    return;
+                  }
+                }
+              }
+              alert('Hidden input field named "scoring" not found.');
+            });
+          }, false);
+        }
       }
-    }
+      for (var i=0; i<elements.length; i++) {
+        var element = elements[i];
+        if (element.className == "voting_done1") {
+          element.click();
+        }
+      }
+      jsTest = false;
+      if (!jsTestSuccess) jsFail = true;
+    });
   }, false);
   function voting_moveUp(element) {
     return voting_move(element, true);
@@ -353,6 +375,4 @@
   function voting_moveDown(element) {
     return voting_move(element, false);
   }
-
-  
-}
+});