Merge pull request #1244 from juhasch/feature/runtools

Fix clicking on gutter handling

Author: juhasch

src/jupyter_contrib_nbextensions/nbextensions/runtools/main.css

@@ -15,12 +15,13 @@
 
 #runtools-wrapper {
   position: absolute;
-  width:430px;
+  width:340px;
   top: 100px;
   right: 0px;
   float: right;
   opacity: 1;
   z-index: 100;
   font-size: 12px;
   font-weight: bold;
+  background-color: lightgrey;
 }

src/jupyter_contrib_nbextensions/nbextensions/runtools/main.js

@@ -365,11 +365,13 @@ define([
      * @param gutter not used
      */
     function changeEvent(cm, line, gutter) {
+        if (gutter === "CodeMirror-foldgutter") return; /* Don't collide with codefolding extension */
+
         var cmline = cm.doc.children[0].lines[line];
         if (cmline === undefined) {
             return;
         }
-        var cell = $(cm.element).closest('.cell').data('cell');
+        var cell = $(cm.display.gutters).closest('.cell').data('cell');
         if (cell.metadata.run_control === undefined)
             cell.metadata.run_control = {};
         setCell(cell, !cell.metadata.run_control.marked);
@@ -435,32 +437,32 @@ define([
     var create_runtools_div = function() {
         var btn = '<div class="btn-toolbar">\
             <div class="btn-group">\
-                <button type="button" id="run_c" class="btn btn-primary fa fa-step-forward" title="Run current cell"></button>\
-                <button type="button" id="run_ca" class="btn btn-primary fa icon-run-to" title="' +
+                <button type="button" id="run_c" class="btn-primary fa fa-step-forward" title="Run current cell"></button>\
+                <button type="button" id="run_ca" class="btn-primary fa icon-run-to" title="' +
             'Run cells above (' + params["run_cells_above"] + ')"</button>\
-                <button type="button" id="run_cb" class="btn btn-primary fa icon-run-from" title="' +
+                <button type="button" id="run_cb" class="btn-primary fa icon-run-from" title="' +
             'Run cells below (' + params["run_cells_below"] + ')"</button>\
-                <button type="button" id="run_a" class="btn btn-primary fa icon-run-all" title="' +
+                <button type="button" id="run_a" class="btn-primary fa icon-run-all" title="' +
             'Run all cells (' + params["run_all_cells"] + ')"</button>\
-                <button type="button" id="run_af" class="btn btn-primary fa icon-run-all-forced" title="' +
+                <button type="button" id="run_af" class="btn-primary fa icon-run-all-forced" title="' +
             'Run all - ignore errors (' + params["run_all_cells_ignore_errors"] + ')"</button>\
-                <button type="button" id="run_m" class="btn btn-primary fa icon-run-marked" title="' +
+                <button type="button" id="run_m" class="btn-primary fa icon-run-marked" title="' +
             'Run marked codecells (' + params["run_marked_cells"] + ')"</button>\
-                <button type="button" id="interrupt_b" class="btn btn-primary fa fa-stop" title="' +
+                <button type="button" id="interrupt_b" class="btn-primary fa fa-stop" title="' +
             'Stop execution (' + params["stop_execution"] + ')"</button>\
             </div>\
             <div class="btn-group">\
-                <button type="button" id="mark_toggle" class="btn btn-primary fa icon-mark-toggle" title="Mark single code cell"></button>\
-                <button type="button" id="mark_all" class="btn btn-primary fa icon-mark-all" title="Mark all code cells"></button>\
-                <button type="button" id="mark_none" class="btn btn-primary fa icon-mark-none" title="Unmark all code cells"></button>\
+                <button type="button" id="mark_toggle" class="btn-primary fa icon-mark-toggle" title="Mark single code cell"></button>\
+                <button type="button" id="mark_all" class="btn-primary fa icon-mark-all" title="Mark all code cells"></button>\
+                <button type="button" id="mark_none" class="btn-primary fa icon-mark-none" title="Unmark all code cells"></button>\
             </div>\
             <div class="btn-group">\
-                <button type="button" id="show_input" class="btn btn-primary fa icon-show-input" title="Show input of code cell"></button>\
-                <button type="button" id="hide_input" class="btn btn-primary fa icon-hide-input" title="Hide input of code cell"></button>\
-                <button type="button" id="show_output" class="btn btn-primary fa icon-show-output" title="Show output of code cell"></button>\
-                <button type="button" id="hide_output" class="btn btn-primary fa icon-hide-output" title="Hide output of code cell"></button>\
-                <button type="button" id="lock_marked" class="btn btn-primary fa fa-lock" title="Lock marked cells"></button>\
-                <button type="button" id="unlock_marked" class="btn btn-primary fa fa-unlock" title="Unlock marked cells"></button>\
+                <button type="button" id="show_input" class="btn-primary fa icon-show-input" title="Show input of code cell"></button>\
+                <button type="button" id="hide_input" class="btn-primary fa icon-hide-input" title="Hide input of code cell"></button>\
+                <button type="button" id="show_output" class="btn-primary fa icon-show-output" title="Show output of code cell"></button>\
+                <button type="button" id="hide_output" class="btn-primary fa icon-hide-output" title="Hide output of code cell"></button>\
+                <button type="button" id="lock_marked" class="btn-primary fa fa-lock" title="Lock marked cells"></button>\
+                <button type="button" id="unlock_marked" class="btn-primary fa fa-unlock" title="Unlock marked cells"></button>\
             </div>\
             </div>';