Author: maxfranz
Date: 2011-08-19 07:53:42 -0700 (Fri, 19 Aug 2011)
New Revision: 26609

Modified:
   cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/arbor.js
   cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/cytoscapeweb-svg.js
   cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/main.html
Log:
fix errors for demo

Modified: cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/arbor.js
===================================================================
--- cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/arbor.js    2011-08-19 
03:51:44 UTC (rev 26608)
+++ cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/arbor.js    2011-08-19 
14:53:42 UTC (rev 26609)
@@ -624,19 +624,19 @@
 
    // some magic attrs to make the Node objects phone-home their 
physics-relevant changes
 
-   var defineProperty = Object.defineProperty != null ? 
-        function (obj, name, desc){
-           if(!obj.hasOwnProperty(name)){
-               Object.defineProperty(obj, name, desc);
-           }
-     }
-                  :
-     function (obj, name, desc) {
-       if (desc.get)
-         obj.__defineGetter__(name, desc.get)
-       if (desc.set)
-         obj.__defineSetter__(name, desc.set)
-     };
+   var defineProperty = (window.__defineGetter__ == null || 
window.__defineSetter__ == null) ? 
+         function (obj, name, desc){
+        if(!obj.hasOwnProperty(name)){
+             Object.defineProperty(obj, name, desc);
+        }
+      }
+        :
+      function (obj, name, desc) {
+        if (desc.get)
+          obj.__defineGetter__(name, desc.get)
+        if (desc.set)
+          obj.__defineSetter__(name, desc.set)
+      };
 
    var RoboPoint = function (n) {
      this._n = n;

Modified: cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/cytoscapeweb-svg.js
===================================================================
--- cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/cytoscapeweb-svg.js 
2011-08-19 03:51:44 UTC (rev 26608)
+++ cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/cytoscapeweb-svg.js 
2011-08-19 14:53:42 UTC (rev 26609)
@@ -1366,8 +1366,6 @@
                };
        }
 
-       function message() {}
-
        window.Visualization = Visualization;
        window.ContinuousVisualMapper = ContinuousVisualMapper;
        

Modified: cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/main.html
===================================================================
--- cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/main.html   2011-08-19 
03:51:44 UTC (rev 26608)
+++ cytoscapeweb/branches/gsoc2011/cytoscapeweb-svg/main.html   2011-08-19 
14:53:42 UTC (rev 26609)
@@ -490,7 +490,9 @@
                        // Load a graph
                        function load(graph) {
                                vis._clearSimulation();
+                               setstyle("basicStyle");
                                vis.loadGraph(graphs[graph]);
+                               addRandomData();
                                vis._startSimulating();
 
                        }
@@ -498,6 +500,7 @@
                        function setstyle(style) {
                                vis.loadStyles(styles[style]);
                                vis.draw();
+                               document.getElementById("styleSelect").value = 
style;
                        }
                        
                        function message(s) {
@@ -560,7 +563,7 @@
                        </select>
                        
                        Load style:
-                       <select 
onchange="setstyle(this.options[selectedIndex].value)">
+                       <select id="styleSelect" 
onchange="setstyle(this.options[selectedIndex].value)">
                                <option selected value="basicStyle">Basic 
Style</option>
                                <option value="demoStyle">Style with node size 
mapper</option>
                                <option value="darkStyle">Style with edge width 
mapper</option>

-- 
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