Download as
Browse Code »

Commit b63031a6846684f809654c5bdca1a802272dc9a6

Authored by Daniela Feitosa
1 parent 6aaf4739
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Bugfix: tinymce popup was not working

Showing 1 changed file with 5 additions and 21 deletions   Show diff stats
public/javascripts/catalog.js
  Diff comments   View file @b63031a
1 1 (function($) {
2 2  
3   -$('#product-list .product .expand-box').hover(hover, hover).live('click', function () {
  3 +$('#product-list .product .expand-box').live('click', function () {
4 4 this.clicked = !this.clicked;
5   - click(this);
6   - $.each($(this).siblings('.expand-box'), function(index, value) { value.clicked = false; click(value); });
  5 + toggle_expandbox(this);
  6 + $.each($(this).siblings('.expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
7 7  
8 8 return false;
9 9 });
10 10  
11 11 $(document).live('click', function() {
12   - $.each($('#product-list .product .expand-box'), function(index, value) { value.clicked = false; click(value); });
  12 + $.each($('#product-list .product .expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
13 13 });
14 14  
15 15 $(document).click(function (event) {
... ... @@ -40,23 +40,7 @@ $.each(rows, function(top, obj) {
40 40  
41 41 })(jQuery);
42 42  
43   -function open() {
44   - if (this.clicked) return;
45   - jQuery(this).addClass('open');
46   -}
47   -
48   -function close() {
49   - if (this.clicked) return;
50   - jQuery(this).removeClass('open');
51   -}
52   -
53   -function click(e) {
  43 +function toggle_expandbox(e) {
54 44 jQuery(e).toggleClass('open', e.clicked);
55 45 jQuery(e).children('div').toggle(e.clicked).css({left: jQuery(e).position().left-180, top: jQuery(e).position().top-10});
56 46 }
57   -
58   -function hover() {
59   - jQuery(this).toggleClass('hover');
60   -}
61   -
62   -
... ...