Commits

Ralph Bean  committed 775681a Merge

Merge branch 'release/2.0.1'

  • Participants
  • Parent commits 021f36f, c5fb99b

Comments (0)

Files changed (3)

 
 setup(
     name='tw2.jit',
-    version='2.0.0',
+    version='2.0.1',
     description='toscawidgets2 wrapper for the javascript infovis toolkit(jit)',
     long_description=long_description,
     author='Ralph Bean',

File tw2/jit/widgets/ajax.py

         """ TODO """, attribute=True,
         default=JSSymbol(src="""
         (function(json) {
-            json.id = jitwidget.root;
+            json.id = $$jitwidget.root;
         })"""))
 
     requestGraph = twc.Param(
         """ TODO """, attribute=True,
         default=JSSymbol(src="""
         (function() {
-            var that = this, id = jitwidget.clickedNodeId;
+            var that = this, id = $$jitwidget.clickedNodeId;
             var jsonRequest = $.ajax({
                 url: '$$base_url?key=' + encodeURIComponent(id),
                 dataType: 'json',
                 success:  function (json) {
                     that.preprocessTree(json);
-                    jitwidget.op.morph(json, {
+                    $$jitwidget.op.morph(json, {
                         id: id,
                         type: 'fade',
                         duration: $$duration,
                          return false;
                     }
 
-                    var old = jitwidget.graph.getNode(jitwidget.root);
+                    var old = $$jitwidget.graph.getNode($$jitwidget.root);
                     if ( !old ) return;
                     var subnodes = old.getSubnodes(1);
                     var map = [];
                         }
                     }
 
-                    jitwidget.op.removeNode(map.reverse(), {
+                    $$jitwidget.op.removeNode(map.reverse(), {
                         type: 'fade:seq',
                         duration: $$duration,
                         onBeforeCompute: (function(){}),
 
     onBeforeCompute = JSSymbol(src="""
         (function (node) {
-            jitwidget.oldRootToRemove = node.getParents()[0].id;
-            jitwidget.clickedNodeId = node.id;
-            if ( jitwidget.deep_linking ) {
-                window.location.hash = jitwidget.clickedNodeId;
+            $$jitwidget.oldRootToRemove = node.getParents()[0].id;
+            $$jitwidget.clickedNodeId = node.id;
+            if ( $$jitwidget.deep_linking ) {
+                window.location.hash = $$jitwidget.clickedNodeId;
             }
          })""")
 
                 var that = this;
                 jQuery(domElement).html(node.name);
                 jQuery(domElement).click(function() {
-                    jitwidget.onClick(domElement.id, {
+                    $$jitwidget.onClick(domElement.id, {
                         onComplete: function() {
                              that.requestGraph();
                         }

File tw2/jit/widgets/sqla.py

                 }
                 return false;
             }
-            json.id = jitwidget.root;
-            var root = jitwidget.graph.getNode(jitwidget.root);
+            json.id = $$jitwidget.root;
+            var root = $$jitwidget.graph.getNode($$jitwidget.root);
             $jit.Graph.Util.eachAdjacency(root, function(elem) {
                 var nodeTo = elem.nodeTo, jsonNode = getNode(nodeTo.id);
                 if(jsonNode) jsonNode.id = nodeTo.id;