fixed datagrid preselect with radio-buttons (#762)

massiveart · Feb 10, 2017 · 93c71a9 · 93c71a9
1 parent 4e340a1
commit 93c71a9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/dist/husky.css b/dist/husky.css
@@ -7285,7 +7285,7 @@ textarea.ckeditor-preview {
   height: 15px;
   padding: 2px;
   border-radius: 15px;
-  border: 1px solid #ddd;
+  border: 1px solid #000;
   background-color: #fff;
   text-align: center;
   margin: 0;

diff --git a/dist/husky.js b/dist/husky.js
@@ -32302,7 +32302,12 @@ define('husky_components/datagrid/decorators/table-view',[],function() {
                 if (this.table.rows[id]) {
                     // ensure that checkboxes are checked
                     this.sandbox.dom.prop(
-                        this.sandbox.dom.find('.' + constants.checkboxClass, this.table.rows[id].$el), 'checked', true
+                        this.sandbox.dom.find(
+                            '.' + constants.checkboxClass + ', .' + constants.radioClass,
+                            this.table.rows[id].$el
+                        ),
+                        'checked',
+                        true
                     );
                     this.sandbox.dom.addClass(this.table.rows[id].$el, constants.selectedRowClass);
                     this.indeterminateSelectParents(id);

diff --git a/dist/husky.min.css b/dist/husky.min.css
diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/husky_components/datagrid/decorators/table-view.js b/husky_components/datagrid/decorators/table-view.js
@@ -1499,7 +1499,12 @@ define(function() {
                 if (this.table.rows[id]) {
                     // ensure that checkboxes are checked
                     this.sandbox.dom.prop(
-                        this.sandbox.dom.find('.' + constants.checkboxClass, this.table.rows[id].$el), 'checked', true
+                        this.sandbox.dom.find(
+                            '.' + constants.checkboxClass + ', .' + constants.radioClass,
+                            this.table.rows[id].$el
+                        ),
+                        'checked',
+                        true
                     );
                     this.sandbox.dom.addClass(this.table.rows[id].$el, constants.selectedRowClass);
                     this.indeterminateSelectParents(id);

diff --git a/scss/modules/form.scss b/scss/modules/form.scss
@@ -360,7 +360,7 @@ textarea.ckeditor-preview {
             height: $radioSize;
             padding: 2px;
             border-radius: $radioSize;
-            border: 1px solid $borderColor;
+            border: 1px solid $black;
             background-color: $white;
             text-align: center;
             margin: 0;