Download as
Browse Code »

Commit 4b06d2fb4105b8370a7bf5d3b50f0c49eb26a3e9

Authored by Victor Costa
1 parent c28342d6
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

rails3: load prototype first to avoid js conflicts

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/views/layouts/_javascript.html.erb
  Diff comments   View file @4b06d2f
1   -<%= javascript_include_tag 'jquery-2.1.1.min', 'jquery-migrate-1.2.1',
2   -'prototype.js', 'effects.js', 'dragdrop.js', 'controls.js',
  1 +<%= javascript_include_tag 'prototype.js', 'effects.js', 'dragdrop.js', 'controls.js',
  2 +'jquery-2.1.1.min', 'jquery-migrate-1.2.1',
3 3 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
4 4 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
5 5 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
... ...