From 235c0482f92feb5e2dfa322093d2808a19800487 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 18 Aug 2016 13:25:21 +0200
Subject: [PATCH] increase clickable area around editable columns' checkboxes

---
 customize.dist/main.css          | 10 ++++++++++
 customize.dist/src/cryptpad.less | 11 +++++++++++
 www/poll/main.js                 | 18 ++++++++++++------
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/customize.dist/main.css b/customize.dist/main.css
index 82af9c214..31b223ec7 100644
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@@ -301,6 +301,16 @@ form.realtime table tr td.checkbox-cell div.checkbox-contain {
   display: block;
   height: 100%;
   width: 100%;
+  position: relative;
+}
+form.realtime table tr td.checkbox-cell div.checkbox-contain label {
+  background-color: transparent;
+  display: block;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  height: 100%;
+  width: 100%;
 }
 form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) {
   display: none;
diff --git a/customize.dist/src/cryptpad.less b/customize.dist/src/cryptpad.less
index 65f14e53b..10d7bb771 100644
--- a/customize.dist/src/cryptpad.less
+++ b/customize.dist/src/cryptpad.less
@@ -370,6 +370,17 @@ form.realtime {
                         display: block;
                         height: 100%;
                         width: 100%;
+                        position: relative;
+
+                        label {
+                            background-color: transparent;
+                            display: block;
+                            position: absolute;
+                            top: 0px;
+                            left: 0px;
+                            height: 100%;
+                            width: 100%;
+                        }
 
                         input {
                             &[type="checkbox"] {
diff --git a/www/poll/main.js b/www/poll/main.js
index 1db27f16d..5e04975fb 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -81,10 +81,13 @@ define([
         });
 
         var $cover = $('<span>', {
-            'for': id,
             'class': 'cover'
         });
 
+        var $label = $('<label>', {
+            'for': id,
+        }); //.text("WAT");
+
         var $check = Input({
             id: id,
             name: id,
@@ -104,7 +107,10 @@ define([
             $check.addClass('editable');
         }
 
-        $div.append($check);
+        $div
+            //.append($label)
+            .append($check)
+            .append($label);
         $check.after($cover);
 
         return $div; //$check;
@@ -189,7 +195,8 @@ define([
         $edit[bool?'addClass':'removeClass']('editable');
 
         var $sel = $('input[id^="' + id + '"]')
-            [bool?'addClass':'removeClass']('editable');
+            [bool?'addClass':'removeClass']('editable')
+            .attr('disabled', !bool);
 
         if (bool) {
             module.rt.proxy.table.colsOrder.forEach(function (coluid) {
@@ -408,7 +415,7 @@ define([
             }
             var checked = box.checked = proxy.table.cells[uid] ? true : false;
             if (checked) {
-                $(box).parent().find('.cover').addClass('yes');
+                $(box).closest('.checkbox-contain').find('.cover').addClass('yes');
             }
         });
 
@@ -500,13 +507,12 @@ define([
                     console.log("[Table.cell change] %s (%s => %s)@[%s]", id, o, n, p.slice(0, -1).join(', '));
                     var checked = el.checked = proxy.table.cells[id] ? true: false;
 
-                    var $parent = $(el).parent();
+                    var $parent = $(el).closest('.checkbox-contain');
 
                     if (!$parent.length) { console.log("couldn't find parent element of checkbox"); return; }
 
                     if (checked) {
                         $parent.find('.cover').addClass('yes');
-                        //$(el).parent().
                     } else {
                         $parent.find('.cover').removeClass('yes');
                     }