Permalink
Browse files

Prototype and Scriptaculous are no longer vendored, but provided by p…

…rototype-rails from now on, also the -j option of the application generator is removed
  • Loading branch information...
1 parent 7ee5f2e commit b2aacc346c8e975cd9ab8c1b0a6b90adbb98debc @fxn fxn committed Apr 30, 2011
@@ -99,10 +99,9 @@ def javascript_path(source)
#
# When passing paths, the ".js" extension is optional.
#
- # To include the default JavaScript expansion pass <tt>:defaults</tt> as source.
- # By default, <tt>:defaults</tt> loads jQuery. If the application was generated
- # with "-j prototype" the libraries Prototype and Scriptaculous are loaded instead.
- # In any case, the defaults can be overridden in <tt>config/application.rb</tt>:
+ # If the application is not using the asset pipeline, to include the default JavaScript
+ # expansion pass <tt>:defaults</tt> as source. By default, <tt>:defaults</tt> loads jQuery,
+ # and that can be overridden in <tt>config/application.rb</tt>:
#
# config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
#
View
@@ -1,5 +1,10 @@
*Rails 3.1.0 (unreleased)*
+* Application generation no longer supports the -j option. [fxn]
+
+* Prototype and Scriptaculous are no longer vendored, they are provided from now on
+by the prototype-rails gem. [fxn]
+
* The scaffold controller will now produce SCSS file if Sass is available [Prem Sichanugrist]
* The controller and resource generators will now automatically produce asset stubs (this can be turned off with --skip-assets). These stubs will use Coffee and Sass, if those libraries are available. [DHH]
View
@@ -46,7 +46,6 @@ task :generate_guides do
end
task :update_ujs do
- system "curl https://github.com/rails/prototype-ujs/raw/master/src/rails.js > lib/rails/generators/rails/app/templates/vendor/assets/javascripts/prototype_ujs.js"
system "curl https://github.com/rails/jquery-ujs/raw/master/src/rails.js > lib/rails/generators/rails/app/templates/vendor/assets/javascripts/jquery_ujs.js"
end
@@ -526,7 +526,7 @@ javascript_include_tag "common" # =>
<script type="text/javascript" src="/javascripts/common.js"></script>
</ruby>
-To include the Prototype and Scriptaculous JavaScript libraries in your application, pass +:defaults+ as the source. When using +:defaults+, if an +application.js+ file exists in your +public/javascripts+ directory, it will be included as well.
+If the application does not use the asset pipeline, to include the jQuery JavaScript library in your application, pass +:defaults+ as the source. When using +:defaults+, if an +application.js+ file exists in your +public/javascripts+ directory, it will be included as well.
<ruby>
javascript_include_tag :defaults
@@ -1301,7 +1301,7 @@ h4. JavaScriptHelper
Provides functionality for working with JavaScript in your views.
-Rails includes the Prototype JavaScript framework and the Scriptaculous JavaScript controls and visual effects library. If you wish to use these libraries and their helpers, make sure +&lt;%= javascript_include_tag :defaults, :cache => true %&gt;+ is in the HEAD section of your page. This function will include the necessary JavaScript files Rails generated in the +public/javascripts+ directory.
+Rails includes by default the jQuery JavaScript library. If you wish to use these libraries and they are in your asset pipeline, or otherwise make sure +&lt;%= javascript_include_tag :defaults, :cache => true %&gt;+ is in the HEAD section of your page. This function will include the necessary JavaScript files Rails generated in the +public/javascripts+ directory.
h5. button_to_function
@@ -1402,16 +1402,6 @@ number_with_precision(111.2345) # => 111.235
number_with_precision(111.2345, 2) # => 111.23
</ruby>
-h4. PrototypeHelper
-
-Prototype is a JavaScript library that provides DOM manipulation, Ajax functionality, and more traditional object-oriented facilities for JavaScript. This module provides a set of helpers to make it more convenient to call functions from Prototype using Rails, including functionality to call remote Rails methods (that is, making a background request to a Rails action) using Ajax.
-
-To be able to use these helpers, you must first include the Prototype JavaScript framework in the HEAD of the pages with Prototype functions.
-
-<ruby>
-javascript_include_tag 'prototype'
-</ruby>
-
h5. evaluate_remote_response
Returns +eval(request.responseText)+ which is the JavaScript function that form_remote_tag can call in +:complete+ to evaluate a multiple update return document using +update_element_function+ calls.
@@ -1508,171 +1498,6 @@ would generate:
return false;" type="button" value="Create" />
</html>
-h5. update_page
-
-Yields a JavaScriptGenerator and returns the generated JavaScript code. Use this to update multiple elements on a page in an Ajax response.
-
-<ruby>
-update_page do |page|
- page.hide 'spinner'
-end
-</ruby>
-
-h5. update_page_tag
-
-Works like update_page but wraps the generated JavaScript in a +script+ tag. Use this to include generated JavaScript in an ERB template.
-
-h4. PrototypeHelper::JavaScriptGenerator::GeneratorMethods
-
-JavaScriptGenerator generates blocks of JavaScript code that allow you to change the content and presentation of multiple DOM elements. Use this in your Ajax response bodies, either in a +script+ tag or as plain JavaScript sent with a Content-type of "text/javascript".
-
-h5(#push). <<
-
-Writes raw JavaScript to the page.
-
-<ruby>
-page << "alert('JavaScript with Prototype.');"
-</ruby>
-
-h5(#at). []
-
-Returns a element reference by finding it through it's id in the DOM.
-
-<ruby>
-page['blank_slate'].show # => $('blank_slate').show();
-</ruby>
-
-h5. alert
-
-Displays an alert dialog with the given message.
-
-<ruby>
-page.alert('This message is from Rails!')
-</ruby>
-
-h5. assign
-
-Assigns the JavaScript variable the given value.
-
-<ruby>
-page.assign 'tabulated_total', @total_from_cart
-</ruby>
-
-h5. call
-
-Calls the JavaScript function, optionally with the given arguments.
-
-<ruby>
-page.call 'Element.replace', 'my_element', "My content to replace with."
-</ruby>
-
-h5. delay
-
-Executes the content of the block after a delay of the number of seconds provided.
-
-<ruby>
-page.delay(20) do
- page.visual_effect :fade, 'notice'
-end
-</ruby>
-
-h5. draggable
-
-Creates a script.aculo.us draggable element. See ActionView::Helpers::ScriptaculousHelper for more information.
-
-h5. drop_receiving
-
-Creates a script.aculo.us drop receiving element. See ActionView::Helpers::ScriptaculousHelper for more information.
-
-h5. hide
-
-Hides the visible DOM elements with the given ids.
-
-<ruby>
-page.hide 'person_29', 'person_9', 'person_0'
-</ruby>
-
-h5. insert_html
-
-Inserts HTML at the specified position relative to the DOM element identified by the given id.
-
-<ruby>
-page.insert_html :bottom, 'my_list', '<li>Last item</li>'
-</ruby>
-
-h5. literal
-
-Returns an object whose to_json evaluates to the code provided. Use this to pass a literal JavaScript expression as an argument to another JavaScriptGenerator method.
-
-h5. redirect_to
-
-Redirects the browser to the given location using JavaScript, in the same form as +url_for+.
-
-<ruby>
-page.redirect_to(:controller => 'accounts', :action => 'new')
-</ruby>
-
-h5. remove
-
-Removes the DOM elements with the given ids from the page.
-
-<ruby>
-page.remove 'person_23', 'person_9', 'person_2'
-</ruby>
-
-h5. replace
-
-Replaces the "outer HTML" (i.e., the entire element, not just its contents) of the DOM element with the given id.
-
-<ruby>
-page.replace 'person-45', :partial => 'person', :object => @person
-</ruby>
-
-h5. replace_html
-
-Replaces the inner HTML of the DOM element with the given id.
-
-<ruby>
-page.replace_html 'person-45', :partial => 'person', :object => @person
-</ruby>
-
-h5(#prototype-select). select
-
-Returns a collection reference by finding it through a CSS pattern in the DOM.
-
-<ruby>
-page.select('p.welcome b').first.hide # => $$('p.welcome b').first().hide();
-</ruby>
-
-h5. show
-
-Shows hidden DOM elements with the given ids.
-
-<ruby>
-page.show 'person_6', 'person_13', 'person_223'
-</ruby>
-
-h5. sortable
-
-Creates a script.aculo.us sortable element. Useful to recreate sortable elements after items get added or deleted. See ActionView::Helpers::ScriptaculousHelper for more information.
-
-h5. toggle
-
-Toggles the visibility of the DOM elements with the given ids. Example:
-
-<ruby>
-page.toggle 'person_14', 'person_12', 'person_23' # Hides the elements
-page.toggle 'person_14', 'person_12', 'person_23' # Shows the previously hidden elements
-</ruby>
-
-h5. visual_effect
-
-Starts a script.aculo.us visual effect. See ActionView::Helpers::ScriptaculousHelper for more information.
-
-
-TODO start from RecordIdentificationHelper
-
-
h3. Localized Views
Action View has the ability render different templates depending on the current locale.
@@ -695,21 +695,21 @@ To include +http://example.com/main.js+:
<%= javascript_include_tag "http://example.com/main.js" %>
</erb>
-The +:defaults+ option loads jQuery by default:
+If the application does not use the asset pipeline, the +:defaults+ option loads jQuery by default:
<erb>
<%= javascript_include_tag :defaults %>
</erb>
-If the application was generated with "-j prototype" <tt>:defaults</tt> loads Prototype and Scriptaculous. And you can in any case override the expansion in <tt>config/application.rb</tt>:
+And you can in any case override the expansion in <tt>config/application.rb</tt>:
<ruby>
config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
</ruby>
When using <tt>:defaults</tt>, if an <tt>application.js</tt> file exists in <tt>public/javascripts</tt> it will be included as well at then end.
-The +:all+ option loads every JavaScript file in +public/javascripts+:
+Also, the +:all+ option loads every JavaScript file in +public/javascripts+:
<erb>
<%= javascript_include_tag :all %>
@@ -38,9 +38,6 @@ def self.add_shared_options_for(name)
class_option :database, :type => :string, :aliases => "-d", :default => "sqlite3",
:desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
- class_option :javascript, :type => :string, :aliases => "-j", :default => "jquery",
- :desc => "Preconfigure for selected JavaScript library (options: #{JAVASCRIPTS.join('/')})"
-
class_option :skip_javascript, :type => :boolean, :aliases => "-J", :default => false,
:desc => "Skip JavaScript files"
@@ -120,14 +120,8 @@ def vendor_javascripts
if options[:skip_javascript]
empty_directory_with_gitkeep "vendor/assets/javascripts"
else
- copy_file "vendor/assets/javascripts/#{options[:javascript]}.js"
- copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js"
-
- if options[:javascript] == "prototype"
- copy_file "vendor/assets/javascripts/controls.js"
- copy_file "vendor/assets/javascripts/dragdrop.js"
- copy_file "vendor/assets/javascripts/effects.js"
- end
+ copy_file "vendor/assets/javascripts/jquery.js"
+ copy_file "vendor/assets/javascripts/jquery_ujs.js"
end
end
@@ -162,10 +156,6 @@ def initialize(*args)
if !options[:skip_active_record] && !DATABASES.include?(options[:database])
raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
end
-
- if !options[:skip_javascript] && !JAVASCRIPTS.include?(options[:javascript])
- raise Error, "Invalid value for --javascript option. Supported for preconfiguration are: #{JAVASCRIPTS.join(", ")}."
- end
end
public_task :create_root
@@ -10,6 +10,9 @@ gem 'sass'
gem 'coffee-script'
gem 'uglifier'
+# Prototype, Scriptaculous, and RJS.
+# gem 'prototype-rails'
+
# Use unicorn as the web server
# gem 'unicorn'
@@ -1,11 +1,8 @@
// FIXME: Tell people that this is a manifest file, real code should go into discrete files
// FIXME: Tell people how Sprockets and CoffeeScript works
//
-//= require <%= options[:javascript] %>
-//= require <%= options[:javascript] %>_ujs
-<% if options[:javascript] == "prototype" %>
-//= require controls
-//= require dragdrop
-//= require effects
+<% unless options[:skip_javascript] -%>
+//= require jquery
+//= require jquery_ujs
<% end -%>
//= require_tree .
@@ -45,9 +45,7 @@ class Application < Rails::Application
#
# JavaScript files you want as :defaults (application.js is always included).
<% if options[:skip_javascript] -%>
- config.action_view.javascript_expansions[:defaults] = %w()
-<% elsif options[:javascript] == 'prototype' -%>
- config.action_view.javascript_expansions[:defaults] = %w(prototype effects dragdrop controls rails)
+ # config.action_view.javascript_expansions[:defaults] = %w()
<% else -%>
# config.action_view.javascript_expansions[:defaults] = %w(prototype effects dragdrop controls rails)
<% end -%>
Oops, something went wrong.

1 comment on commit b2aacc3

@fxn
Member
fxn commented on b2aacc3 Apr 30, 2011

We are going to put -j back, in a more generic way, and remove vendored jQuery as well. Expect that soon.

Please sign in to comment.