Merge branch 'master' of github.com:daveagp/java_visualize

daveagp · daveagp · commit 49a2ffa43dd3 · 2015-02-14T21:11:51.000-05:00
diff --git a/index.html b/index.html
@@ -77,6 +77,10 @@
 <script type="text/javascript" src="./jv-frontend.js?7"></script> <!-- used to be opt-frontend.js -->
 <link rel="stylesheet" href="./OnlinePythonTutor/v3/css/opt-frontend.css"/>
 
+<script type="text/javascript">
+window.jv_cpp = false; // c++ fake visualizer extensions
+</script>
+
 </head>
 
 <body>
@@ -338,6 +342,8 @@
 
 <div id="footer">
 
+<div id="data-div" style="display: none;">Data for WordPress: <textarea id="data" style="word-wrap:break-word;"></textarea></div>
+
 <p>
   <button id="genUrlBtn" class="smallBtn" type="button">Generate URL</button> <input type="text" id="urlOutput" size="70"/>
 </p>
diff --git a/jv-frontend.js b/jv-frontend.js
@@ -184,6 +184,7 @@ $(document).ready(function() {
       // customize edit button click functionality AFTER rendering (NB: awkward!)
       $('#pyOutputPane #editCodeLinkDiv').show();
       $('#pyOutputPane #editBtn').click(function() {
+        $("#data-div").hide();
         enterEditMode();
       });
     }
@@ -223,12 +224,20 @@ $(document).ready(function() {
     java_backend_options.showStringsAsValues = !$('#showStringsAsObjects').is(':checked');
     java_backend_options.showAllFields = $('#showAllFields').is(':checked');
 
-    $.ajax({url: backend_script,
-            data: {data : JSON.stringify({
+    var package = {
               user_script : pyInputCodeMirror.getValue(),
               options: java_backend_options,
               args: getUserArgs(),
-              stdin: getUserStdin()})},
+              stdin: getUserStdin()
+    };
+
+    if (window.jv_cpp) {
+        $("#data-div").show();
+        $("#data").html('[visualize]'+encodeURIComponent(JSON.stringify(package))+'[/visualize]');
+    }
+
+    $.ajax({url: backend_script,
+            data: {data : JSON.stringify(package)},
            /*,
              raw_input_json: rawInputLst.length > 0 ? JSON.stringify(rawInputLst) : '',
              options_json: JSON.stringify(options)*/
@@ -306,11 +315,12 @@ $(document).ready(function() {
                 myVisualizer = new ExecutionVisualizer('pyOutputPane',
                                                        dataFromBackend,
                                                        frontend_options);
-
+                
                 // also scroll to top to make the UI more usable on smaller monitors
                 $(document).scrollTop(0);
 
                 $.bbq.pushState({ mode: 'display' }, 2 /* completely override other hash strings to keep URL clean */);
+
               }
             }});
   }
@@ -538,4 +548,4 @@ var setOptions = function(lookup_function) {
       $.bbq.removeState();
     }
   }
-};
+};
