Changeset 1606:6e2d8e9dd7d7

Timestamp:

08/27/13 21:38:26 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue #1513 : label can be clicked, like arrow
Update tests

Files:

• admin/js/_post.js (modified) (2 diffs)
• plugins/attachments/js/post.js (modified) (1 diff)
• plugins/pings/post.js (modified) (1 diff)
• plugins/tags/js/post.js (modified) (1 diff)
• tests/functional/spec/toggle_with_legend.js (modified) (1 diff)

admin/js/_post.js

@@ -115 +115 @@
           // Confirm post deletion
           $('input[name="delete"]').click(function() {
-                    return window.confirm(dotclear.msg.confirm_delete_post);
+               return window.confirm(dotclear.msg.confirm_delete_post);
           });
 
@@ -121 +121 @@
           $('#notes-area label').toggleWithLegend($('#notes-area').children().not('label'),{
                cookie: 'dcx_post_notes',
+               legend_click:true,
                hide: $('#post_notes').val() == ''
           });
-          $('#create_cat').toggleWithLegend(
-               $('#create_cat').parent().children().not('#create_cat'),
-               {} // no cookie on new category as we don't use this every day
-          );
-          $('#post_lang').parent().toggleWithLegend($('#post_lang'),{
-               cookie: 'dcx_post_lang'
-          });
-          $('#post_password').parent().toggleWithLegend($('#post_password'),{
+          $('#create_cat').toggleWithLegend($('#create_cat').parent().children().not('#create_cat'),{
+               // no cookie on new category as we don't use this every day
+               legend_click: true
+          });
+          $('#post_lang').parent().children('label').toggleWithLegend($('#post_lang'),{
+               cookie: 'dcx_post_lang',
+               legend_click: true
+          });
+          $('#post_password').parent().children('label').toggleWithLegend($('#post_password'),{
                cookie: 'dcx_post_password',
+               legend_click: true,
                hide: $('#post_password').val() == ''
           });
-          $('#post_status').parent().toggleWithLegend($('#post_status'),{
-               cookie: 'dcx_post_status'
-          });
-          $('#post_dt').parent().toggleWithLegend($('#post_dt').parent().children().not('label'),{
-               cookie: 'dcx_post_dt'
-          });
-          $('#post_format').parent().toggleWithLegend($('#post_format').parent().children().not('label').add($('#post_format').parents('p').next()),{
-               cookie: 'dcx_post_format'
-          });
-          $('#cat_id').parent().toggleWithLegend($('#cat_id'),{
-               cookie: 'cat_id'
-          });
-          $('#post_url').parent().toggleWithLegend($('#post_url').parent().children().not('label'),{
-               cookie: 'post_url'
+          $('#post_status').parent().children('label').toggleWithLegend($('#post_status'),{
+               cookie: 'dcx_post_status',
+               legend_click: true
+          });
+          $('#post_dt').parent().children('label').toggleWithLegend($('#post_dt').parent().children().not('label'),{
+               cookie: 'dcx_post_dt',
+               legend_click: true
+          });
+          $('#post_format').parent().children('label').toggleWithLegend($('#post_format'),{
+               cookie: 'dcx_post_format',
+               legend_click: true
+          });
+          $('#cat_id').parent().children('label').toggleWithLegend($('#cat_id'),{
+               cookie: 'cat_id',
+               legend_click: true
+          });
+          $('#post_url').parent().children('label').toggleWithLegend($('#post_url').parent().children().not('label'),{
+               cookie: 'post_url',
+               legend_click: true
           });
           // We load toolbar on excerpt only when it's ready

plugins/attachments/js/post.js

@@ -1 +1 @@
 $(function() {
      $('h5.s-attachments').toggleWithLegend($('.s-attachments').not('h5'),{
-          cookie: 'dcx_attachments'
+          cookie: 'dcx_attachments',
+          legend_click: true
      });
 });

plugins/pings/post.js

@@ -13 +13 @@
           }
           $('h5.ping-services').toggleWithLegend($('p.ping-services'),{
-               cookie: 'dcx_ping_services'
+               cookie: 'dcx_ping_services',
+               legend_click: true
           });
      });

plugins/tags/js/post.js

@@ -53 +53 @@
                     ')</em>';
                },
-               formatResult: function(tag) { 
-                    return tag.result; 
+               formatResult: function(tag) {
+                    return tag.result;
                }
           });
      });
-               
+
      $('h5 .s-tags').toggleWithLegend($('.s-tags').not('label'),{
-               cookie: 'post_tags'
+          cookie: 'post_tags',
+          legend_clik: true
      });
 

tests/functional/spec/toggle_with_legend.js

@@ -32 +32 @@
     it("Chick target must not hide target, when legend_click is true", function() {
      loadFixtures('menu.html');
-     $('#post_status').parent().toggleWithLegend($('#post_status'),{'legend_click':true});
+     var $label = $('#post_status').parent().children('label');
+     $label.toggleWithLegend($('#post_status'),{'legend_click':true, a_container:false});
 
-     $('#post_status').click();
+     $label.click();
+     expect($('#post_status')).toBeVisible();
+
+     var $arrow = $('#post_status').parent().find('img');
+     $arrow.click();
      expect($('#post_status')).toBeVisible();