more annotation bubbles fun

Philip Guo · Philip Guo · commit e3237646d760 · 2012-10-29T18:32:53.000-07:00
diff --git a/v3/css/pytutor.css b/v3/css/pytutor.css
@@ -145,11 +145,13 @@ div.ExecutionVisualizer div#editCodeLinkDiv {
 }
 
 div.ExecutionVisualizer div#annotateLinkDiv {
-  text-align: center;
+  /*text-align: left;*/
   margin-top: 0px;
   margin-bottom: 5px;
+  /*
   margin-left: auto;
   margin-right: auto;
+  */
 }
 
 div.ExecutionVisualizer div#stepAnnotationDiv {
diff --git a/v3/js/pytutor.js b/v3/js/pytutor.js
@@ -492,6 +492,8 @@ ExecutionVisualizer.prototype.initAllAnnotationBubbles = function() {
       }
     });
   });
+
+  //console.log('initAllAnnotationBubbles', myViz.allAnnotationBubbles.length);
 }
 
 
@@ -508,7 +510,12 @@ ExecutionVisualizer.prototype.enterViewAnnotationsMode = function() {
       // and display them in 'View' mode
       myViz.initAllAnnotationBubbles();
 
-      // TODO: set text of those bubbles from curEntry.annotations
+      $.each(myViz.allAnnotationBubbles, function(i, e) {
+        var txt = curEntry.annotations[e.domID];
+        if (txt) {
+          e.preseedText(txt);
+        }
+      });
     }
   }
 
@@ -611,6 +618,10 @@ ExecutionVisualizer.prototype.findNextBreakpoint = function() {
 ExecutionVisualizer.prototype.stepForward = function() {
   var myViz = this;
 
+  if (myViz.editAnnotationMode) {
+    return;
+  }
+
   if (myViz.curInstr < myViz.curTrace.length - 1) {
     // if there is a next breakpoint, then jump to it ...
     if (myViz.sortedBreakpointsList.length > 0) {
@@ -634,6 +645,10 @@ ExecutionVisualizer.prototype.stepForward = function() {
 ExecutionVisualizer.prototype.stepBack = function() {
   var myViz = this;
 
+  if (myViz.editAnnotationMode) {
+    return;
+  }
+
   if (myViz.curInstr > 0) {
     // if there is a prev breakpoint, then jump to it ...
     if (myViz.sortedBreakpointsList.length > 0) {
@@ -2619,7 +2634,7 @@ AnnotationBubble.prototype.bindViewerClickHandler = function() {
 }
 
 AnnotationBubble.prototype.showViewer = function() {
-  assert(this.state == 'edit');
+  assert(this.state == 'edit' || this.state == 'invisible');
   assert(this.text); // must be non-empty!
 
   // destroy then create a new tip:
@@ -2718,6 +2733,21 @@ AnnotationBubble.prototype.enterViewMode = function() {
       this.makeInvisible();
     }
   }
+  else if (this.state == 'invisible') {
+    // this happens when, say, you first enter View Mode
+    if (this.text) {
+      this.showViewer();
+
+      if (this.type == 'codeline') {
+        this.redrawCodelineBubble();
+      }
+    }
+  }
+}
+
+AnnotationBubble.prototype.preseedText = function(txt) {
+  assert(this.state == 'invisible');
+  this.text = txt;
 }
 
 AnnotationBubble.prototype.redrawCodelineBubble = function() {

Original file line number	Diff line number	Diff line change
`@@ -145,11 +145,13 @@ div.ExecutionVisualizer div#editCodeLinkDiv {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`div.ExecutionVisualizer div#annotateLinkDiv {`
`148`		`- text-align: center;`
	`148`	`+ /text-align: left;/`
`149`	`149`	`margin-top: 0px;`
`150`	`150`	`margin-bottom: 5px;`
	`151`	`+ /*`
`151`	`152`	`margin-left: auto;`
`152`	`153`	`margin-right: auto;`
	`154`	`+ */`
`153`	`155`	`}`
`154`	`156`
`155`	`157`	`div.ExecutionVisualizer div#stepAnnotationDiv {`