Download as
Browse Code »

Commit b63031a6846684f809654c5bdca1a802272dc9a6

Authored by Daniela Feitosa
1 parent 6aaf4739
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 (function($) { 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 this.clicked = !this.clicked; 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 return false; 8 return false;
9 }); 9 });
10 10
11 $(document).live('click', function() { 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 $(document).click(function (event) { 15 $(document).click(function (event) {
@@ -40,23 +40,7 @@ $.each(rows, function(top, obj) { @@ -40,23 +40,7 @@ $.each(rows, function(top, obj) {
40 40
41 })(jQuery); 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 jQuery(e).toggleClass('open', e.clicked); 44 jQuery(e).toggleClass('open', e.clicked);
55 jQuery(e).children('div').toggle(e.clicked).css({left: jQuery(e).position().left-180, top: jQuery(e).position().top-10}); 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 -