From 8b642e6b91b1d8d9c4d8230a6253dbba4760fca0 Mon Sep 17 00:00:00 2001 From: Eric Allen Date: Sun, 14 Mar 2010 16:48:28 -0400 Subject: [PATCH] Get rid of auto_complete plugin Using jQuery autocompletion now --- app/controllers/todos_controller.rb | 12 +- app/views/todos/_edit_form.rhtml | 12 -- vendor/plugins/auto_complete/README | 23 --- vendor/plugins/auto_complete/Rakefile | 22 --- vendor/plugins/auto_complete/init.rb | 2 - .../auto_complete/lib/auto_complete.rb | 47 ------ .../lib/auto_complete_macros_helper.rb | 143 ------------------ .../auto_complete/test/auto_complete_test.rb | 67 -------- 8 files changed, 2 insertions(+), 326 deletions(-) delete mode 100644 vendor/plugins/auto_complete/README delete mode 100644 vendor/plugins/auto_complete/Rakefile delete mode 100644 vendor/plugins/auto_complete/init.rb delete mode 100644 vendor/plugins/auto_complete/lib/auto_complete.rb delete mode 100644 vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb delete mode 100644 vendor/plugins/auto_complete/test/auto_complete_test.rb diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index bc20c851..67b983f2 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -6,9 +6,9 @@ class TodosController < ApplicationController prepend_before_filter :login_or_feed_token_required, :only => [:index, :calendar] append_before_filter :init, :except => [ :destroy, :completed, :completed_archive, :check_deferred, :toggle_check, :toggle_star, - :edit, :update, :create, :calendar, :auto_complete_for_tag, :auto_complete_for_predecessor, :remove_predecessor, :add_predecessor] + :edit, :update, :create, :calendar, :auto_complete_for_predecessor, :remove_predecessor, :add_predecessor] append_before_filter :get_todo_from_params, :only => [ :edit, :toggle_check, :toggle_star, :show, :update, :destroy, :remove_predecessor] - protect_from_forgery :except => [:auto_complete_for_tag, :auto_complete_for_predecessor] + protect_from_forgery :except => [:auto_complete_for_predecessor] def index current_user.deferred_todos.find_and_activate_ready @@ -590,14 +590,6 @@ class TodosController < ApplicationController } end end - - def auto_complete_for_tag - @items = Tag.find(:all, - :conditions => [ "name LIKE ?", '%' + params['tag_list'] + '%' ], - :order => "name ASC", - :limit => 10) - render :inline => "<%= auto_complete_result(@items, :name) %>" - end def auto_complete_for_predecessor unless params['id'].nil? diff --git a/app/views/todos/_edit_form.rhtml b/app/views/todos/_edit_form.rhtml index 2f8e4bc5..36624487 100644 --- a/app/views/todos/_edit_form.rhtml +++ b/app/views/todos/_edit_form.rhtml @@ -13,22 +13,15 @@
" /> -
-
<%= text_field_tag 'tag_list', tag_list_text, :id => dom_id(@todo, 'tag_list'), :size => 30, :tabindex => 12 %> -<%= content_tag("div", "", :id => dom_id(@todo, 'tag_list')+"_auto_complete", :class => "auto_complete") %> -<%= auto_complete_field dom_id(@todo, 'tag_list'), { - :url => {:controller => 'todos', :action => 'auto_complete_for_tag'}, - :tokens => [','] -} %>
@@ -48,11 +41,6 @@ <%= text_field_tag 'predecessor_list', predecessor_list_text, :id => dom_id(@todo, 'predecessor_list'), :size => 30, :tabindex => 15 %> -<%= content_tag("div", "", :id => dom_id(@todo, 'predecessor_list')+"_auto_complete", :class => "auto_complete") %> -<%= auto_complete_field dom_id(@todo, 'predecessor_list'), { - :url => {:controller => 'todos', :action => 'auto_complete_for_predecessor', :id => @todo.id}, - :tokens => [','] -} %> <% if controller.controller_name == "project" || @todo.deferred? -%> diff --git a/vendor/plugins/auto_complete/README b/vendor/plugins/auto_complete/README deleted file mode 100644 index e08a8151..00000000 --- a/vendor/plugins/auto_complete/README +++ /dev/null @@ -1,23 +0,0 @@ -Example: - - # Controller - class BlogController < ApplicationController - auto_complete_for :post, :title - end - - # View - <%= text_field_with_auto_complete :post, title %> - -By default, auto_complete_for limits the results to 10 entries, -and sorts by the given field. - -auto_complete_for takes a third parameter, an options hash to -the find method used to search for the records: - - auto_complete_for :post, :title, :limit => 15, :order => 'created_at DESC' - -For more examples, see script.aculo.us: -* http://script.aculo.us/demos/ajax/autocompleter -* http://script.aculo.us/demos/ajax/autocompleter_customized - -Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license diff --git a/vendor/plugins/auto_complete/Rakefile b/vendor/plugins/auto_complete/Rakefile deleted file mode 100644 index 5af4e826..00000000 --- a/vendor/plugins/auto_complete/Rakefile +++ /dev/null @@ -1,22 +0,0 @@ -require 'rake' -require 'rake/testtask' -require 'rake/rdoctask' - -desc 'Default: run unit tests.' -task :default => :test - -desc 'Test auto_complete plugin.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' - t.verbose = true -end - -desc 'Generate documentation for auto_complete plugin.' -Rake::RDocTask.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'Auto Complete' - rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include('README') - rdoc.rdoc_files.include('lib/**/*.rb') -end diff --git a/vendor/plugins/auto_complete/init.rb b/vendor/plugins/auto_complete/init.rb deleted file mode 100644 index 87bf027d..00000000 --- a/vendor/plugins/auto_complete/init.rb +++ /dev/null @@ -1,2 +0,0 @@ -ActionController::Base.send :include, AutoComplete -ActionController::Base.helper AutoCompleteMacrosHelper \ No newline at end of file diff --git a/vendor/plugins/auto_complete/lib/auto_complete.rb b/vendor/plugins/auto_complete/lib/auto_complete.rb deleted file mode 100644 index 4afc7c2e..00000000 --- a/vendor/plugins/auto_complete/lib/auto_complete.rb +++ /dev/null @@ -1,47 +0,0 @@ -module AutoComplete - - def self.included(base) - base.extend(ClassMethods) - end - - # - # Example: - # - # # Controller - # class BlogController < ApplicationController - # auto_complete_for :post, :title - # end - # - # # View - # <%= text_field_with_auto_complete :post, title %> - # - # By default, auto_complete_for limits the results to 10 entries, - # and sorts by the given field. - # - # auto_complete_for takes a third parameter, an options hash to - # the find method used to search for the records: - # - # auto_complete_for :post, :title, :limit => 15, :order => 'created_at DESC' - # - # For help on defining text input fields with autocompletion, - # see ActionView::Helpers::JavaScriptHelper. - # - # For more examples, see script.aculo.us: - # * http://script.aculo.us/demos/ajax/autocompleter - # * http://script.aculo.us/demos/ajax/autocompleter_customized - module ClassMethods - def auto_complete_for(object, method, options = {}) - define_method("auto_complete_for_#{object}_#{method}") do - find_options = { - :conditions => [ "LOWER(#{method}) LIKE ?", '%' + params[object][method].downcase + '%' ], - :order => "#{method} ASC", - :limit => 10 }.merge!(options) - - @items = object.to_s.camelize.constantize.find(:all, find_options) - - render :inline => "<%= auto_complete_result @items, '#{method}' %>" - end - end - end - -end \ No newline at end of file diff --git a/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb b/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb deleted file mode 100644 index 1d25ee47..00000000 --- a/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb +++ /dev/null @@ -1,143 +0,0 @@ -module AutoCompleteMacrosHelper - # Adds AJAX autocomplete functionality to the text input field with the - # DOM ID specified by +field_id+. - # - # This function expects that the called action returns an HTML