Changeset 17711

Timestamp:

04/28/14 12:17:05 (11 years ago)

Author:

tbretz

Message:

Do not process main when only the pixel has been changed; some imporvements to the main accordion; A slightly nicer test code.

Location:

trunk/FACT++/www/viewer

Files:

• index.html (modified) (1 diff)
• index.js (modified) (4 diffs)

trunk/FACT++/www/viewer/index.html

@@ -73 +73 @@
       <div id="textcontainer2"> 
          <textarea id="editor2" name="editor2" type="textarea">
-print("test\n2nd line\n");
+print("This output will go to the Console.\n");
 
 // The four first values of pixel 1
 var arr = [ $.data[1][0], $.data[1][1], $.data[1][2], $.data[1][3] ];
-print("return [ "+arr+" ]\n");
+print("Pixel 1: [ "+arr+" ]\n");
 
 // Get the maximum sample from each pixel

trunk/FACT++/www/viewer/index.js

@@ -321 +321 @@
 function onDataReceived(rc)
 {
+    var err = document.getElementById("error");
     var dbg = document.getElementById("debug");
+    var con = document.getElementById("console");
 
     var pre = document.createElement("pre");
@@ -343 +345 @@
     el.appendChild(document.createTextNode(rc.event.numEvents));
 
-    if (rc.timeJs)
-    {
-        var err = document.getElementById("error");
+    if (rc.ret)
+    {
+        while (con.lastChild)
+            con.removeChild(con.lastChild);
+    }
+
+    if (rc.err)
+    {
         while (err.lastChild)
             err.removeChild(err.lastChild);
 
-        $("#accordion").accordion("option", "active", false);
-        $("#accordion").find('h3').filter(':contains(Runtime)').hide();
-
-        var con = document.getElementById("console");
-        while (con.lastChild)
-            con.removeChild(con.lastChild);
-    }
-
-
-    if (rc.err)
-    {
         err.appendChild(document.createTextNode("Javascript runtime exception: "+rc.err.file+":"+rc.err.lineNumber));
         err.appendChild(document.createTextNode("\n"));
@@ -524 +520 @@
         dbg.removeChild(dbg.lastChild);
 
+    var active = $("#accordion").accordion("option", "active");
+    if (active==0)
+    {
+        $("#accordion").accordion("option", "active", false);
+        $("#accordion").find('h3').filter(':contains(Runtime)').hide();
+    }
+
     var event   = document.getElementById("event").value;
     var pixel   = document.getElementById("pixel").value;
@@ -531 +534 @@
     var uri = "file="+file+"&event="+event+"&pixel="+map[pixel];
     uri += "&source1="+encodeURIComponent(source1);
-    uri += "&source2="+encodeURIComponent(source2);
+    if (!pixelOnly)
+        uri += "&source2="+encodeURIComponent(source2);
 
     $.ajax({