From 1e7bdcc0f5e38a9361359e19efc48d7ea747b4ee Mon Sep 17 00:00:00 2001 From: Andreas Woerle Date: Fri, 3 Jun 2011 14:09:27 +0200 Subject: [PATCH 1/3] allowing generator to (optionally) accept versions for jquery, ui and ujs - but i didnt include any other versions yet --- lib/generators/jquery/install/install_generator.rb | 13 ++++++++----- .../javascripts/{ => jquery-ui/1.8.12}/jquery-ui.js | 0 .../{ => jquery-ui/1.8.12}/jquery-ui.min.js | 0 .../jquery_ujs.js | 0 .../assets/javascripts/{ => jquery/1.6.1}/jquery.js | 0 .../javascripts/{ => jquery/1.6.1}/jquery.min.js | 0 6 files changed, 8 insertions(+), 5 deletions(-) rename vendor/assets/javascripts/{ => jquery-ui/1.8.12}/jquery-ui.js (100%) rename vendor/assets/javascripts/{ => jquery-ui/1.8.12}/jquery-ui.min.js (100%) rename vendor/assets/javascripts/{ => jquery-ujs/dad6982dc592686677e6845e681233c40d2ead27}/jquery_ujs.js (100%) rename vendor/assets/javascripts/{ => jquery/1.6.1}/jquery.js (100%) rename vendor/assets/javascripts/{ => jquery/1.6.1}/jquery.min.js (100%) diff --git a/lib/generators/jquery/install/install_generator.rb b/lib/generators/jquery/install/install_generator.rb index 23f7dd86..10a1a66b 100644 --- a/lib/generators/jquery/install/install_generator.rb +++ b/lib/generators/jquery/install/install_generator.rb @@ -6,6 +6,9 @@ class InstallGenerator < ::Rails::Generators::Base desc "This generator installs jQuery #{Jquery::Rails::JQUERY_VERSION}, jQuery-ujs, and (optionally) jQuery UI #{Jquery::Rails::JQUERY_UI_VERSION}" class_option :ui, :type => :boolean, :default => false, :desc => "Include jQueryUI" + class_option :jquery_version, :type => :string, :default => false, :desc => "Version for Jquery" + class_option :jquery_ui_version, :type => :string, :default => false, :desc => "Version for Jquery-UI" + class_option :jquery_ujs_version, :type => :string, :default => false, :desc => "Version for Jquery-UJS Adapter" source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__) def remove_prototype @@ -16,22 +19,22 @@ def remove_prototype def copy_jquery say_status("copying", "jQuery (#{Jquery::Rails::JQUERY_VERSION})", :green) - copy_file "jquery.js", "public/javascripts/jquery.js" - copy_file "jquery.min.js", "public/javascripts/jquery.min.js" + copy_file File.join("jquery", options.jquery_version || Jquery::Rails::JQUERY_VERSION, "jquery.js"), "public/javascripts/jquery.js" + copy_file File.join("jquery", options.jquery_version || Jquery::Rails::JQUERY_VERSION, "jquery.min.js"), "public/javascripts/jquery.min.js" end def copy_jquery_ui if options.ui? say_status("copying", "jQuery UI (#{Jquery::Rails::JQUERY_UI_VERSION})", :green) - copy_file "jquery-ui.js", "public/javascripts/jquery-ui.js" - copy_file "jquery-ui.min.js", "public/javascripts/jquery-ui.min.js" + copy_file File.join("jquery-ui", options.jquery_ui_version || Jquery::Rails::JQUERY_UI_VERSION, "jquery-ui.js"), "public/javascripts/jquery-ui.js" + copy_file File.join("jquery-ui", options.jquery_ui_version || Jquery::Rails::JQUERY_UI_VERSION, "jquery-ui.min.js"), "public/javascripts/jquery-ui.min.js" end end def copy_ujs_driver say_status("copying", "jQuery UJS adapter (#{Jquery::Rails::JQUERY_UJS_VERSION[0..5]})", :green) remove_file "public/javascripts/rails.js" - copy_file "jquery_ujs.js", "public/javascripts/jquery_ujs.js" + copy_file File.join("jquery-ujs", options.jquery_ujs_version || Jquery::Rails::JQUERY_UJS_VERSION, "jquery_ujs.js"), "public/javascripts/jquery_ujs.js" end end diff --git a/vendor/assets/javascripts/jquery-ui.js b/vendor/assets/javascripts/jquery-ui/1.8.12/jquery-ui.js similarity index 100% rename from vendor/assets/javascripts/jquery-ui.js rename to vendor/assets/javascripts/jquery-ui/1.8.12/jquery-ui.js diff --git a/vendor/assets/javascripts/jquery-ui.min.js b/vendor/assets/javascripts/jquery-ui/1.8.12/jquery-ui.min.js similarity index 100% rename from vendor/assets/javascripts/jquery-ui.min.js rename to vendor/assets/javascripts/jquery-ui/1.8.12/jquery-ui.min.js diff --git a/vendor/assets/javascripts/jquery_ujs.js b/vendor/assets/javascripts/jquery-ujs/dad6982dc592686677e6845e681233c40d2ead27/jquery_ujs.js similarity index 100% rename from vendor/assets/javascripts/jquery_ujs.js rename to vendor/assets/javascripts/jquery-ujs/dad6982dc592686677e6845e681233c40d2ead27/jquery_ujs.js diff --git a/vendor/assets/javascripts/jquery.js b/vendor/assets/javascripts/jquery/1.6.1/jquery.js similarity index 100% rename from vendor/assets/javascripts/jquery.js rename to vendor/assets/javascripts/jquery/1.6.1/jquery.js diff --git a/vendor/assets/javascripts/jquery.min.js b/vendor/assets/javascripts/jquery/1.6.1/jquery.min.js similarity index 100% rename from vendor/assets/javascripts/jquery.min.js rename to vendor/assets/javascripts/jquery/1.6.1/jquery.min.js From 421f4558b3d1da54fa567391c11c0a281c338412 Mon Sep 17 00:00:00 2001 From: Andreas Woerle Date: Fri, 3 Jun 2011 14:12:39 +0200 Subject: [PATCH 2/3] updated readme, noting the ability to accept versions for jquery and jquery-ui --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f6992447..30cb4b78 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,10 @@ Then, run `bundle install`. To invoke the generator, run: rails generate jquery:install #--ui to enable jQuery UI -You're done! \ No newline at end of file +You're done! + +### Support for different Versions of Jquery / Jquery-UI + + rails generate jquery:install --jquery_version=1.6.1 --jquery_ui_version=1.8.12 + +Currently only Jquery 1.6.1 and Ui 1.8.12 are shipped with the gem. From 644af5483e93ef78e88bdc3a83dbf1b7d497f141 Mon Sep 17 00:00:00 2001 From: Andreas Woerle Date: Fri, 3 Jun 2011 14:13:34 +0200 Subject: [PATCH 3/3] fixed typo in readme from previous commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30cb4b78..66ee97b2 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,6 @@ You're done! ### Support for different Versions of Jquery / Jquery-UI - rails generate jquery:install --jquery_version=1.6.1 --jquery_ui_version=1.8.12 + rails generate jquery:install --jquery_version=1.6.1 --jquery_ui_version=1.8.12 Currently only Jquery 1.6.1 and Ui 1.8.12 are shipped with the gem.