Download as
Browse Code »

Commit 8b4fddc462b33515a3339ebbc848c2ca681f0082

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent df03fb0f
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

ActionItem1222: fixing javascript error 

* the method addBehavior, that is defined on lowpro.js, was being called
  when lowpro was not loaded
Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
app/views/cms/media_listing.rhtml
  Diff comments   View file @8b4fddc
@@ -46,6 +46,17 @@ @@ -46,6 +46,17 @@
46 <% end %> 46 <% end %>
47 </div><!-- id='media-listing-upload' --> 47 </div><!-- id='media-listing-upload' -->
48 <hr/> 48 <hr/>
  49 +
  50 + <script type='text/javascript'>
  51 + document.observe("dom:loaded", function() {
  52 + Event.addBehavior.reassignAfterAjax = true;
  53 + Event.addBehavior({
  54 + 'div#pagination-images .pagination a' : Remote.Link,
  55 + 'div#pagination-documents .pagination a' : Remote.Link
  56 + })
  57 + });
  58 + </script>
  59 +
49 <div id='media-listing'> 60 <div id='media-listing'>
50 <h3><%= _('Folders') %></h3> 61 <h3><%= _('Folders') %></h3>
51 <p><%= _('Drag images and documents to add them to the text. If needed, resize images by clicking the tree icon on editor.') %></p> 62 <p><%= _('Drag images and documents to add them to the text. If needed, resize images by clicking the tree icon on editor.') %></p>
public/javascripts/application.js
  Diff comments   View file @8b4fddc
@@ -45,12 +45,3 @@ function convToValidIdentifier( str, sep ) { @@ -45,12 +45,3 @@ function convToValidIdentifier( str, sep ) {
45 .replace( /ç/g, "c" ) 45 .replace( /ç/g, "c" )
46 .replace( /[^-_a-z0-9]+/g, sep ) 46 .replace( /[^-_a-z0-9]+/g, sep )
47 } 47 }
48 -  
49 -document.observe("dom:loaded", function() {  
50 - Event.addBehavior.reassignAfterAjax = true;  
51 - Event.addBehavior({  
52 - 'div#pagination-images .pagination a' : Remote.Link,  
53 - 'div#pagination-documents .pagination a' : Remote.Link  
54 - })  
55 -});  
56 -