@@ -1,2 +1,4 @@ -= javascript_include_tag "jquery-1.3.2", "application", :cache => true += javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" += javascript_include_tag "application" + = yield :javascript assets/app/views/layouts/_javascript.html.haml @@ -1,73 +0,0 @@ -function toggle_contents(node, content_class) { - var contents = node.find(content_class); - if (contents.is(":visible")) { - node.addClass("closed"); - node.removeClass("opened"); - contents.slideUp(); - } else { - node.removeClass("closed"); - node.addClass("opened"); - contents.slideDown(); - } -}; - -function hide_or_show_notes_by_company(checkbox_node) { - var checkbox = $(checkbox_node); - var company_name = $.trim(checkbox.val()); - $(".note").each(function() { - if ($.trim($(this).children(".company_name").text()) == company_name) { - if (checkbox.is(":checked")) { - $(this).fadeIn("normal", function() {$(this).show()}); - } else { - $(this).fadeOut("normal", function() {$(this).hide()}); - }; - }; - }); -}; - -function open_external_links_in_new_window() { - $(".external").attr("target", "_blank"); -} - -$(document).ready(function() { - $('#participating_company_filters input').change(function() { - hide_or_show_notes_by_company(this); - }); - - $('.pages-show .notes .note').each(function() { - var note = $(this); - $(note).find('.contents').hide(); - $(note).find('.note_type').hide(); - note.find('.title').click(function(event) { - toggle_contents(note, ".contents"); - toggle_contents(note, ".note_type") - event.preventDefault(); - }); - note.find('.note_type').click(function(event) { - toggle_contents(note, ".contents"); - toggle_contents(note, ".note_type") - event.preventDefault(); - }); - }); - - $('.pages-show #filter_notes').each(function() { - var filter = $(this); - $(filter).find('.companies').hide(); - filter.find('.title').click(function(event) { - toggle_contents(filter, ".companies"); - event.preventDefault(); - }); - }); - - $('.user').each(function() { - var owner = $(this); - owner.find('.name').click(function(event) { - toggle_contents(owner, ".owner_contents"); - event.preventDefault(); - }); - $(owner).find('.owner_contents').hide(); - }); - - open_external_links_in_new_window(); -}); - assets/public/javascripts/application.js @@ -1,2 +1,4 @@ -= javascript_include_tag "jquery-1.3.2", "application", :cache => true += javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" += javascript_include_tag "application" + = yield :javascript gold/app/views/layouts/_javascript.html.haml @@ -1,73 +0,0 @@ -function toggle_contents(node, content_class) { - var contents = node.find(content_class); - if (contents.is(":visible")) { - node.addClass("closed"); - node.removeClass("opened"); - contents.slideUp(); - } else { - node.removeClass("closed"); - node.addClass("opened"); - contents.slideDown(); - } -}; - -function hide_or_show_notes_by_company(checkbox_node) { - var checkbox = $(checkbox_node); - var company_name = $.trim(checkbox.val()); - $(".note").each(function() { - if ($.trim($(this).children(".company_name").text()) == company_name) { - if (checkbox.is(":checked")) { - $(this).fadeIn("normal", function() {$(this).show()}); - } else { - $(this).fadeOut("normal", function() {$(this).hide()}); - }; - }; - }); -}; - -function open_external_links_in_new_window() { - $(".external").attr("target", "_blank"); -} - -$(document).ready(function() { - $('#participating_company_filters input').change(function() { - hide_or_show_notes_by_company(this); - }); - - $('.pages-show .notes .note').each(function() { - var note = $(this); - $(note).find('.contents').hide(); - $(note).find('.note_type').hide(); - note.find('.title').click(function(event) { - toggle_contents(note, ".contents"); - toggle_contents(note, ".note_type") - event.preventDefault(); - }); - note.find('.note_type').click(function(event) { - toggle_contents(note, ".contents"); - toggle_contents(note, ".note_type") - event.preventDefault(); - }); - }); - - $('.pages-show #filter_notes').each(function() { - var filter = $(this); - $(filter).find('.companies').hide(); - filter.find('.title').click(function(event) { - toggle_contents(filter, ".companies"); - event.preventDefault(); - }); - }); - - $('.user').each(function() { - var owner = $(this); - owner.find('.name').click(function(event) { - toggle_contents(owner, ".owner_contents"); - event.preventDefault(); - }); - $(owner).find('.owner_contents').hide(); - }); - - open_external_links_in_new_window(); -}); - gold/public/javascripts/application.js @@ -3,7 +3,6 @@ require 'open-uri' @app_name = File.basename(@root) @heroku_app_name = File.basename(@root).gsub('_', '-') @template_root = File.dirname(template) -@jquery_version = "1.3.2" @human_app_name = @app_name.gsub(/[-_]/, ' ').humanize @title_app_name = @app_name.gsub(/[-_]/, ' ').titlecase @@ -46,10 +45,6 @@ inside "public/stylesheets" do run "rm -rf joshuaclayton-blueprint*" end -inside "public/javascripts" do - run "curl -L http://jqueryjs.googlecode.com/files/jquery-#{@jquery_version}.js -o jquery-#{@jquery_version}.js" -end - plugin 'trusted-params', :git => "git://github.com/ryanb/trusted-params.git" plugin 'hoptoad_notifier', :git => "git://github.com/thoughtbot/hoptoad_notifier.git" plugin 'high_voltage', :git => "git://github.com/thoughtbot/high_voltage.git" @@ -91,6 +86,7 @@ copy_asset_file 'app/models/mailer.rb' copy_asset_file 'app/models/user.rb' copy_asset_file 'app/models/user_activation.rb' copy_asset_file 'app/models/user_session.rb' +copy_asset_file 'app/views/layouts/_javascript.html.haml' copy_asset_file 'app/views/layouts/_flashes.html.haml' copy_asset_file 'app/views/mailer/reset_password_request.erb' copy_asset_file 'app/views/mailer/user_activation.erb' @@ -223,10 +219,6 @@ test: encoding: utf8 } -file 'app/views/layouts/_javascript.html.haml', -"= javascript_include_tag \"jquery-#{@jquery_version}\", \"application\", :cache => true -= yield :javascript" - rake 'gems:heroku_spec' run 'find . -type d -empty -exec touch {}/.keep \;' template.rb gold/public/javascripts/jquery-1.3.2.js 5e137744ba18bba2b0a8cadaf6a54480305b336a Tammer Saleh tsaleh@gmail.com http://github.com/tsaleh/bushido/commit/2345d849ee061ec8e1852149420453429df03dcc 2345d849ee061ec8e1852149420453429df03dcc 2009-10-29T10:27:44-07:00 2009-10-29T10:27:44-07:00 JS cleanups * using google's cached js file * removed app-specific js in application.js aac9ef2c1ebb38d12636250d8b81fd74b974e471 Tammer Saleh tsaleh@gmail.com