Clear dataset button; closes #79

scraperwiki · Aug 6, 2013 · f7b6820 · f7b6820
1 parent 8093be2
commit f7b6820
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/http/code.js b/http/code.js
@@ -46,6 +46,18 @@ var done_initial_load = function() {
   }, 1)
 }
 
+// Clear dataset
+var clear_dataset = function(warning) {
+  $("#clear .dropdown-toggle").addClass("loading")
+  scraperwiki.exec('rm -f scraperwiki.sqlite', function(data) {
+    $("#clear .dropdown-toggle").removeClass("loading")
+    if (data != '') {
+      scraperwiki.alert("Trouble clearing datastore!", data, true)
+      return
+    }
+  }, handle_exec_error)
+}
+
 // Show the language picker
 var show_language_picker = function(warning) {
   if (warning)
@@ -199,21 +211,15 @@ var set_editor_mode = function(code) {
 var update_display_from_status = function(use_status) {
   if (changing == "starting") {
     $("#run").attr("disabled", true)
-  } else if (changing == "stopping") {
-    $("#run").attr("disabled", true)
-  } else if (use_status == "running") {
-    $("#run").text("Stop!").removeClass("btn-primary").addClass("btn-danger").attr("disabled", false)
-  } else if (use_status == "nothing") {
-    $("#run").text("Run!").removeClass("btn-danger").addClass("btn-primary").attr("disabled", false)
-  }
-
-  if (changing == "starting") {
     $("#running-status").html("Starting&hellip;").show()
   } else if (changing == "stopping") {
+    $("#run").attr("disabled", true)
     $("#running-status").html("Stopping&hellip;").show()
   } else if (use_status == "running") {
+    $("#run").text("Stop!").removeClass("btn-primary").addClass("btn-danger").attr("disabled", false)
     $("#running-status").html("Running&hellip;").show()
   } else if (use_status == "nothing") {
+    $("#run").text("Run!").removeClass("btn-danger").addClass("btn-primary").attr("disabled", false)
     $("#running-status").hide()
   }
 }

diff --git a/http/index.html b/http/index.html
@@ -68,11 +68,19 @@
         <li class="divider"></li>
         <li><a href="https://github.com/scraperwiki/scraperwiki-python" target="_blank">Python package (scraperwiki)</a></li>
         <li><a href="https://github.com/scraperwiki/scraperwiki-ruby" target="_blank">Ruby gem (scraperwiki)</a></li>
-        <li><a onClick="show_language_picker(true);" class="pointer">Change language <span class="label label-warning">Warning!</span></a></li>
         <li class="divider"></li>
         <li><a href="https://github.com/ajaxorg/ace/wiki/Default-Keyboard-Shortcuts" target="_blank">Editor keyboard shortcuts</a></li>
       </ul>
     </div>
+
+    <div class="pull-right btn-group dropup" id="clear">
+      <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#">Clear <span class="caret"></span></a>
+      <ul class="dropdown-menu pull-right">
+        <li><a></a></li>
+        <li><a onClick="show_language_picker(true);" class="pointer">Change language</a></li>
+        <li><a onClick="clear_dataset(true);" class="pointer">Clear dataset</a></li>
+      </ul>
+    </div>
   </div>
   </div>