X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fstatic%2Fjs%2Fhazelnut.js;h=af2dcfa0e65fd297a6b38e25fc11865b05c2d22b;hb=f1910e576b71036ea87679aea144aae8520c54d9;hp=91fe152e603bcb79ef1d0d78ec8f00ee0d12ff65;hpb=0f95c8fe41bff140a98c693cc1ec7be669820d94;p=myslice.git

diff --git a/plugins/hazelnut/static/js/hazelnut.js b/plugins/hazelnut/static/js/hazelnut.js
index 91fe152e..af2dcfa0 100644
--- a/plugins/hazelnut/static/js/hazelnut.js
+++ b/plugins/hazelnut/static/js/hazelnut.js
@@ -320,6 +320,10 @@
 
         set_checkbox: function(record, checked)
         {
+            /* Default: checked = true */
+            if (typeof checked === 'undefined')
+                checked = true;
+
             var key_value;
             /* The function accepts both records and their key */
             switch (manifold.get_type(record)) {
@@ -341,10 +345,6 @@
 
             var element = $(checkbox_id, this.table.fnGetNodes());
 
-            /* Default: swap check status */
-            if (typeof checked === 'undefined')
-                checked = !(element.is(':checked'));
-
             element.attr('checked', checked);
         },
 
@@ -417,14 +417,13 @@
         {
             switch(data.request) {
                 case FIELD_REQUEST_ADD:
+                case FIELD_REQUEST_ADD_RESET:
                     this.set_checkbox(data.value, true);
                     break;
                 case FIELD_REQUEST_REMOVE:
+                case FIELD_REQUEST_REMOVE_RESET:
                     this.set_checkbox(data.value, false);
                     break;
-                case FIELD_REQUEST_RESET:
-                    this.set_checkbox(data.value); // swap
-                    break;
                 default:
                     break;
             }
@@ -561,6 +560,7 @@
 
         _check_click: function(e) 
         {
+            e.stopPropagation();
 
             var self = e.data;