Author: Christian Lopes
Date: 2010-01-19 14:07:45 -0800 (Tue, 19 Jan 2010)
New Revision: 18965

Modified:
   cytoscapeweb/trunk/website/src/js/content/demo.js
   cytoscapeweb/trunk/website/src/js/jquery/plugins/jquery.menu.js
Log:
Added "show edge labels" menu option to the demo app.

Modified: cytoscapeweb/trunk/website/src/js/content/demo.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/content/demo.js   2010-01-19 21:55:18 UTC 
(rev 18964)
+++ cytoscapeweb/trunk/website/src/js/content/demo.js   2010-01-19 22:07:45 UTC 
(rev 18965)
@@ -328,7 +328,7 @@
         panZoomControlVisible: true,
                edgesMerged: false,
                nodeLabelsVisible: true,
-               edgeLabelsVisible: true,
+               edgeLabelsVisible: false,
                nodeTooltipsEnabled: true,
                edgeTooltipsEnabled: true,
                swfPath: path("swf/CytoscapeWeb"),
@@ -465,7 +465,8 @@
                                     <li><label>Style</label>\
                                         <ul>\
                                             <li id="merge_edges" 
class="ui-menu-checkable"><label>Merge edges</label></li>\
-                                            <li id="show_labels" 
class="ui-menu-checkable"><label>Show labels</label></li>\
+                                            <li id="show_node_labels" 
class="ui-menu-checkable"><label>Show node labels</label></li>\
+                                            <li id="show_edge_labels" 
class="ui-menu-checkable"><label>Show edge labels</label></li>\
                                             <li>\
                                                 <label>Visualisation</label>\
                                                 <ul id="visual_style" 
class="ui-menu-one-checkable">\
@@ -523,6 +524,7 @@
              
         // create the menu and add handlers for when items are selected
         $("#menu").menu({
+               menuItemMaxWidth: 180,
             onMenuItemClick: function(li){
                 switch( li.attr("id") || li.parent().attr("id") ) {
                 case "layout_style":
@@ -565,9 +567,12 @@
                        
             onMenuItemCheck: function(li){
                 switch( li.attr("id") ) {
-                case "show_labels":
+                case "show_node_labels":
                     $("#cytoweb_container").cw().nodeLabelsVisible(true);
                     break;
+                case "show_edge_labels":
+                       $("#cytoweb_container").cw().edgeLabelsVisible(true);
+                       break;
                 case "merge_edges":
                     $("#cytoweb_container").cw().edgesMerged(true);
                     break;
@@ -576,9 +581,12 @@
             
             onMenuItemUncheck: function(li){
                 switch( li.attr("id") ) {
-                case "show_labels":
+                case "show_node_labels":
                     $("#cytoweb_container").cw().nodeLabelsVisible(false);
                     break;
+                case "show_edge_labels":
+                       $("#cytoweb_container").cw().edgeLabelsVisible(false);
+                       break;
                 case "merge_edges":
                     $("#cytoweb_container").cw().edgesMerged(false);
                     break;
@@ -755,7 +763,8 @@
         // add initial state of check marks
         var check = {};
         check["merge_edges"] = $("#cytoweb_container").cw().edgesMerged();
-        check["show_labels"] = 
$("#cytoweb_container").cw().nodeLabelsVisible();
+        check["show_node_labels"] = 
$("#cytoweb_container").cw().nodeLabelsVisible();
+        check["show_edge_labels"] = 
$("#cytoweb_container").cw().edgeLabelsVisible();
         
         for( var i in check ){
             var id = i;

Modified: cytoscapeweb/trunk/website/src/js/jquery/plugins/jquery.menu.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/jquery/plugins/jquery.menu.js     
2010-01-19 21:55:18 UTC (rev 18964)
+++ cytoscapeweb/trunk/website/src/js/jquery/plugins/jquery.menu.js     
2010-01-19 22:07:45 UTC (rev 18965)
@@ -124,10 +124,10 @@
                 show(  li.children("ul") );
                 li.children("ul").each(function(){
                     
-                    var maxWidth = 0;
+                    var maxWidth = options.menuItemMaxWidth;
                     var height = 0;
                     
-                    $(this).css("width", options.menuItemMaxWidth);
+                    $(this).css("width", maxWidth);
                     
                     $(this).children("li").each(function(){
                         $(this).css("display", "block").css("width", "auto");

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.


Reply via email to