Commit c6d359e0d93c019dc8a6c40499d2a570ef951858

Anon Ray
Sat Mar 30 09:12:53 IST 2013

Tree SHA1: 1764dd9
Parent SHA1: 4cca5ef (Fix wrong data structure in JS for publishing sweets)
raw diff | raw patch

Intermediate commit

.gitignore 0
README.md 0
fetch.py 50 -------------+++++++++++++++++++++++++++++++++++++
static/bootstrap.css 0
static/bootstrap.js 0
static/graphs/Hampi_GirijaKalyana.json 0
static/jit.js 0
static/myVector.js 0
static/old.json 0
static/test.json 0
static/tree.css 0
static/tree.js 59 ---------++++++++++++++++++++++++++++++++++++++++++++++++++
submit.wsgi 0
templates/index.html 1 +
tileStache.cfg 0

Diff rendering mode:
inline
side by side

fetch.py

 import lxml.html
 import urllib2
 import StringIO
+import json
 app = Flask(__name__)
-…
     c = pymongo.Connection()
     db = c['mural']
     coll = db['data']
     try:
         for i in d:
             coll.insert(request.args['data'])
             response = make_response()
             response.status = '200 OK'
             response.status_code = 200
             return response
     except:
         response = make_response()
         response.status = "500"
         response.data = "Your post could not be saved. Try posting again."
         return response
+    for i in request.form['data']:
+        coll.insert(i)
+    response = make_response()
+    response.status = "200 OK"
+    return response
+@app.route('/web', methods=['GET'])
+def web():
+  return render_template('web.html')
 @app.route('/SWeeText', methods=['GET'])
 def SWeeText():
-…
         # inject the JS toolbar to annotate text
         script = root.makeelement('script')
         script.set('src', 'static/text-annotation.js')
+        tree = root.makeelement('script')
+        tree.set('src', 'static/tree.js')
+        bs_js = root.makeelement('script')
+        bs_js.set('src', 'static/bootstrap.js')
+        jq = root.makeelement('script')
+        jq.set('src', 'static/jquery-1.9.1.min.js')
+        jit = root.makeelement('script')
+        jit.set('src', 'static/jit.js')
+        us = root.makeelement('script')
+        us.set('src', 'static/underscore-min-1.4.4.js')
         link = root.makeelement('link')
         link.set('href', 'static/text-annotation.css')
         link.set('type', 'text/css')
         link.set('rel', 'stylesheet')
+        bs = root.makeelement('link')
+        bs.set('href', 'static/bootstrap.css')
+        bs.set('type', 'text/css')
+        bs.set('rel', 'stylesheet')
+        tree_css = root.makeelement('link')
+        tree_css.set('href', 'static/tree.css')
+        tree_css.set('type', 'text/css')
+        tree_css.set('rel', 'stylesheet')
+        root.body.append(jq)
+        root.body.append(bs_js)
+        root.body.append(jit)
+        root.body.append(us)
+        root.body.append(tree)
         root.body.append(script)
+        root.head.append(bs)
         root.head.append(link)
+        root.head.append(tree_css)
         return lxml.html.tostring(root)

static/tree.js

     event.stopPropagation();
   }
   //Log.write('centering node ', node.name);
+  console.log('centering node', node.name);
   RGraph.onClick(node.id, {
     hideLabels: false,
     onComplete: function() {
-…
       user: user,
       type: this.type,
       uri: resource,
       top: attribs.top,
       bottom: attribs.bottom,
       left: attribs.left,
       right: attribs.right,
       nodes: this.nodes,
     };
+    if(attribs.hasOwnProperty('top') &&
+        attribs.hasOwnProperty('bottom') &&
+        attribs.hasOwnProperty('right') &&
+        attribs.hasOwnProperty('left')) {
+      data.top = attribs.top;
+      data.bottom = attribs.bottom;
+      data.left = attribs.left;
+      data.right = attribs.right;
+    }
+    if(attribs.hasOwnProperty('xpath')) {
+      data.xpath = attribs.xpath;
+    }
     this.swts.push(data);
     this.nodes = [];
   },
-…
       return;
     }
     $('#publish').attr('disabled', 'disabled');
+    //$('#posted').show();
+    var swts = '';
+    for(var i in this.swts) {
+      var data = this.swts[i];
+      var swt = '@'+data.user+' '+data.type+' '+data.uri;
+      if(data.hasOwnProperty('xpath')) {
+        swt += ' xpath: '+data.xpath;
+      }
+      if(data.hasOwnProperty('top')) {
+        swt += ' #['+data.top+','+data.right+','+data.bottom+','+data.left+']';
+      }
+      swt += ' ' + data.nodes;
+      swts += swt + '\n';
+    }
+    $('#sweet').html(swts);
+    $('#sweeted').show();
     $.ajax({
       type: 'POST',
       url: config.indexer + '/submit',
       data: {'data': JSON.stringify(this.swts)},
+      data: {'data': this.swts},
       success: function() {
         $.ajax({
+        /*$.ajax({
           type: 'POST',
           url: config.postTweetUrl,
           data: {'data': JSON.stringify(this.swts)},
-…
           error: function() {
             $('#fail-posting').show();
           }
         });
+        });*/
+        $('#posted').show();
+        var swts = '';
+        for(var i in this.swts) {
+          var data = this.swts[i];
+          var swt = '@'+data.user+' '+data.type+' '+data.uri;
+          if(data.hasOwnProperty('xpath')) {
+            swt += ' xpath: '+data.xpath;
+          }
+          if(data.hasOwnProperty('top')) {
+            swt += ' #['+data.top+','+data.right+','+data.bottom+','+data.left+']';
+          }
+          swt += ' ' + data.nodes;
+          swts += swt + '\n';
+        }
+        $('#sweet').html(swts);
+        this.swts = [];
       },
       error: function() {
         $('#fail-posting').show();
+        //$('#fail-posting').show();
       }
     });
   }
-…
       size: 14
     },
     interpolation: 'polar',
     transition: $jit.Trans.Sine.easeInOut,
+    transition: $jit.Trans.Sine.easeIn,
     levelDistance: 150,
     onCreateLabel: function(domElement, node) {
       console.log('oncreatelabel');

templates/index.html

       <!-- PLEASE, LET THIS NOTE ABOUT AUTHOR AND PROJECT SOMEWHERE ON YOUR WEBSITE, OR AT LEAST IN THE COMMENT IN HTML. THANK YOU -->
     </div>
+    </div>
   </div>
   <script type="text/javascript" >resize();</script>

Commit c6d359e0d93c019dc8a6c40499d2a570ef951858

fetch.py

static/tree.js

templates/index.html

Gitorious