Update drawoptions.htm demo, fix 'toggle col' menu error

git-svn-id: https://subversion.gsi.de/dabc/trunk/plugins/root/js@2818 bcbf6573-9a26-0410-9ebc-ce4ab7aade96

Author: linev

demo/drawoptions.htm

@@ -32,19 +32,22 @@
       function draw_item_options(file, itemname, divid, options, factor) {
          var arr = options.split(";");
 
+         var fname = (file.fURL.indexOf("http://")==0) ? fname : "demo/"+ file.fURL;   
+
          var has_equal = false;
-         var html = "Supported options: ";
+         
+         var html = 'File: <a href="../index.htm?file=' + fname + '" target="_blank">' + fname.slice(fname.lastIndexOf('/')+1) + '</a>';
          for (var i in arr) {
-            if (i>0) html += ", ";
-            html += '<a href="../index.htm?nobrowser&file='; 
-            if (file.fURL.indexOf("http://")==0) html += file.fURL;
-                                            else html += "demo/"+ file.fURL;   
+            if (i==0) html += " Item: "; else
+            if (i==1) html += " Options: "; else html += ", ";
+            html += '<a href="../index.htm?nobrowser&file=' + fname; 
             html += '&item=' + itemname + '&';
 
             if (arr[i].indexOf("=")<0) html += 'opt=' + arr[i];
                                   else { html += arr[i]; has_equal = true; } 
 
             html += '" target="_blank">';
+            if (i==0) html += itemname; else
             if (arr[i] == "") html += '&lt;default&gt;'; else html += arr[i]; 
             html += '</a>'; 
          }
@@ -63,7 +66,7 @@
          if (factor!=null) h = w * factor;
 
          for (var i in arr) {
-            var subid = divid + "_" + arr[i];
+            var subid = divid + "_" + i;
 
             var html = '<div id="' + subid + '" style="width:'+w+'px; height:'+h+'px"></div>';
             $("#" + divid).append(html);
@@ -159,13 +162,11 @@
             LoadFile("can4.root", function(file) {
                draw_item_options(file, "c1;1", "can8_draw", "", 0.);
             });
+            LoadFile("higgs_c.root", function(file) {
+               draw_item_options(file, "c;1", "can9_draw", "col=1;col=2;col=3", 0.);
+            });
          }
 
-         LoadFile("higgs_c.root", function(file) {
-            draw_item_options(file, "c;1", "can9_draw", "col=1;col=2;col=3", 0.);
-         });
-
-
 
          // JSROOT.RegisterForResize(function() { if (objpainter) objpainter.CheckResize(); });
       }

scripts/JSRootPainter.js

@@ -5170,7 +5170,10 @@
       JSROOT.Painter.menuitem(menu, "Auto zoom-in", function() { menu['painter'].AutoZoom(); });
       JSROOT.Painter.menuitem(menu, "Draw in 3D", function() { menu['painter'].Draw3D(); });
       JSROOT.Painter.menuitem(menu, "Toggle col", function() {
-         menu['painter'].options.Color = -1 * menu['painter'].options.Color;
+         if (menu['painter'].options.Color == 0)
+            menu['painter'].options.Color = JSROOT.gStyle.DefaultCol;
+         else
+            menu['painter'].options.Color = -1 * menu['painter'].options.Color;
          menu['painter'].RedrawPad();
       });