Changeset 169 for Dev/trunk

Timestamp:

11/30/11 16:34:11 (13 years ago)

Author:

fpvanagthoven

Message:

Enkele bugfixes in sequencerScripts.js

• updateSequencer werkt nu ook als er meer objecten in seqContent staan dan de bedoeling is (bijvoorbeeld na een deleteStep)
• updateSequencer "remove text node" operatie aangepast om alleen te triggeren als er een even aantal childNodes in seqContent zitten. Bij goede werking kan dit nooit. Voorheen verwijderde hij ook goeie div's als die toevallig de eerste childNode waren.

->>>>>Toekomstige aanpassing: checken of seqContent.childNodes[0] ook daadwerkelijk een text node is. Internet deed het niet toen ik deze code schreef, dus kon hier de syntax niet voor opzoeken.
deleteStep toegevoegd.

Met andere woorden: alle functies van de sequencer werken nu!

Location:

Dev/trunk

Files:

• classes/pipelineSequencer.php (modified) (1 diff)
• js/sequencerScripts.js (modified) (5 diffs)

Dev/trunk/classes/pipelineSequencer.php

@@ -52 +52 @@
                     <input type="button" id="moveSelectedR" value="Move >" class="surveyButton"  onClick="moveStep(1);" />
                     <input type="button" id="editSelected" value="Edit step" class="surveyButton" onClick="editStep();" />
-                    <input type="submit" id="deleteSelected" name="deleteSelected" value="Delete step" class="surveyButton" />
+                    <input type="button" id="deleteSelected" value="Delete step" class="surveyButton" onClick="deleteStep();" />
                     <input type="submit" id ="clearPipeline" name="clearPipeline" value="Clear pipeline" class="surveyButton dis" disabled="true"/>
                     <input type="checkbox" id="confirmClear" name="confirmClear" onChange="IsCheckEnabled(this, document.getElementById('clearPipeline'));" />Really clear?

Dev/trunk/js/sequencerScripts.js

@@ -138 +138 @@
 }
 
+function deleteStep() {
+    // delete an object from the session.
+    // note: does not actually remove the object from the database, only takes it out of the pipeline array.
+        
+    var pl = stringToArray(document.getElementById("pipelineStringField").value, ",");
+    var plType = stringToArray(document.getElementById("pipelineTypeField").value, ",");
+    var plUpdated = stringToArray(document.getElementById("pipelineUpdatedField").value, ",");
+    var selectedStep = document.getElementById("selectedStepField").value;
+    
+    // if no step has been selected, exit the function
+    if (selectedStep == undefined || selectedStep == "") {
+        return;
+    }
+    
+    // find the array index of the specified object uid, then remove it from all three arrays.
+    var index = pl.indexOf(selectedStep);
+    if (index >= 0 && index < pl.length) {
+        pl.splice(index, 1);
+        plType.splice(index, 1);
+        plUpdated.splice(index, 1);
+        // set the updated status of all objects from *index* and forward to "0" (out of date)
+        // this way they will be refreshed the next time updateSequencer(); is called, adn the visual display will match the new pipeline.
+        for (var i = index-1; i < plUpdated.length; i++) {
+            if (i >= 0 ) {
+                plUpdated[i] = "0";
+            }
+        }
+    }
+    
+    document.getElementById("pipelineStringField").value = arrayToString(pl, ",");
+    document.getElementById("pipelineTypeField").value = arrayToString(plType, ",");
+    document.getElementById("pipelineUpdatedField").value = arrayToString(plUpdated, ",");
+    deselectStep(selectedStep);     // Make sure the info panel is up to date as well. (Not showing anything, as it should be...)
+    document.getElementById("numSteps").value--;
+    
+    updateSequencer(false);
+    
+    
+    
+}
+
 function deselectStep(uid) {
     var field = document.getElementById("selectedStepField");
@@ -225 +266 @@
 function updateSequencer(firstLoad) {
     // Load hidden field values
+    
     var plString = document.getElementById("pipelineStringField").value;
     var plTypeString = document.getElementById("pipelineTypeField").value;
@@ -231 +273 @@
     
     if (count < 1) {
+        document.getElementById("seqContentWrapper").innerHTML = "";
         return;
     }
     // If this is on page-load time
     if (firstLoad == true) {
+        var seqContent = document.getElementById("seqContentWrapper");
+        seqContent.innerHTML = "";
         requestString = plString.slice(0, -1);
         requestString = requestString.replace(/,/g, ",divider,");
         newAjaxRequest("uids="+requestString, "returnStep.php", function(result) {
-            var seqContent = document.getElementById("seqContentWrapper");
             seqContent.innerHTML = result.responseText;
         }, true);
@@ -258 +302 @@
         document.getElementById("numSteps").value = count;
         var seqContent = document.getElementById("seqContentWrapper");
-        if (seqContent.childNodes.length > (2*count)-1) {
+        // hier zit een fout. Als er een deleted step nog in de pipeline staat haalt hij de eerste valid step weg ipv een text node.
+        // twee mogelijkheden: 
+        // 1: check of het text node is.
+        // 2: modulo check of het een even aantal steps is. Als alles klopt kan er onmogelijk een even aantal childNodes zijn.
+        if (seqContent.childNodes.length % 2 == 0 && seqContent.childNodes.length > 0) {
             seqContent.removeChild(seqContent.childNodes[0]);
             
@@ -320 +368 @@
                 //alert("INSERT CODE FOR UPDATEDIVIDERS HERE!");
                 //alert(timeDiff.getDiff());
+                
+                // If seqContent contains any further entries when the last pipeline uid has been drawn, these are to be removed.
+                // This happens after the user performs a "delete step" operation and there is now one fewer step in the array than in seqContent.
+                // All steps other than the first and the last are auto-adjusted due to "out of date" flag.
+                if (i >= pl.length - 1) {
+                    
+                    // This is a really complicated way of saying "Delete the next two elements if they exist"
+                    while ((nextElement = newDiv.nextSibling) != undefined) {
+                        seqContent.removeChild(nextElement);
+                    }
+                    
+                }
+                // Do the same check for the first step in the pipeline. 
+                // Is there no more elegant solution for this? For instance, check if a step should be in the pipeline in the first place, else delete it and it's following divider
+                
+                
                 updateDividers(newDiv);
             }