aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/render
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master'Xavier Noria2010-06-201-1/+1
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Make sure a namespaced <%= render form %> still renders the _form partial ↵Jan De Poorter2010-06-201-1/+1
| | | | | | | | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Final touches and fixes.Rizwan Reza2010-06-211-1/+1
| |
* | Added title to some other files in actionpack/lib/action_viewRizwan Reza2010-06-163-0/+4
| |
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-151-1/+1
|\ \ | |/ |/|
| * Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-111-1/+1
| |
* | render(:inline) in a layout before yield replaces original contentNeeraj Singh2010-06-131-1/+1
|/ | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Make AP test suite green once again and speed up performance in layouts ↵José Valim2010-06-071-12/+3
| | | | lookup for some cases.
* Formats should always be an array.Jeremy Kemper2010-06-061-1/+1
|
* Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
|
* make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵Jeff Kreeftmeijer2010-05-151-1/+1
| | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* partial counters with :as [#2804 state:resolved]Jeff Kreeftmeijer2010-05-151-0/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Change event namespace ordering to most-significant first [#4504 state:resolved]Justin George2010-05-022-3/+3
| | | | | | | | | More work still needs to be done on some of these names (render_template.action_view and render_template!.action_view particularly) but this allows (for example) /^sql/ to subscribe to all the various ORMs without further modification Signed-off-by: José Valim <jose.valim@gmail.com>
* Layout contents are html-safeJeremy Kemper2010-04-091-1/+1
|
* <% yield to <%= yield in rdoc of _layout_for, and copy-edits it now that we ↵Xavier Noria2010-04-051-17/+31
| | | | are on it
* Key partial name cache on controller and object class *names* to avoid ↵Jeremy Kemper2010-04-021-2/+2
| | | | memory leaks in dev mode
* adds missing requires for Object#blank? and Object#present?Xavier Noria2010-03-281-0/+2
|
* Ensure details are frozen after @details_keys lookup. The implementation ↵José Valim2010-03-271-10/+1
| | | | waits to freeze until the last required moment, to avoid duping hashes.
* Merge branch 'master' into docrailswycats2010-03-262-12/+27
|\
| * Improve performance of the rendering stack by freezing formats as a sign ↵José Valim2010-03-192-6/+12
| | | | | | | | that they shouldn't be further modified.
| * Modify assert_template to use notifications. Also, remove ↵Carlhuda2010-03-171-2/+1
| | | | | | | | ActionController::Base#template since it is no longer needed.
| * Fix rendering of HTML partials inside JS templates [#4197 status:resolved]José Valim2010-03-161-3/+14
| |
| * Add deprecation notices for <% %>.Carlhuda2010-03-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The approach is to compile <% %> into a method call that checks whether the value returned from a block is a String. If it is, it concats to the buffer and prints a deprecation warning. * <%= %> uses exactly the same logic to compile the template, which first checks to see whether it's compiling a block. * This should have no impact on other uses of block in templates. For instance, in <% [1,2,3].each do |i| %><%= i %><% end %>, the call to each returns an Array, not a String, so the result is not concatenated * In two cases (#capture and #cache), a String can be returned that should *never* be concatenated. We have temporarily created a String subclass called NonConcattingString which behaves (and is serialized) identically to String, but is not concatenated by the code that handles deprecated <% %> block helpers. Once we remove support for <% %> block helpers, we can remove NonConcattingString.
* | Merge remote branch 'mainstream/master'Pratik Naik2010-03-153-41/+15
|\|
| * Remove formats setters from render template, speeding up partial and ↵José Valim2010-03-131-2/+1
| | | | | | | | collection renderings.
| * Finish cleaning up rendering stack from views and move assigns evaluation to ↵José Valim2010-03-122-33/+9
| | | | | | | | controller (so plugins and/or controllers can overwrite just one method).
| * Allow anything that responds to render to be given as :template and use ↵José Valim2010-03-123-8/+7
| | | | | | | | find_template instead of find in views.
* | Updated documentation for block helpers in render/layouts.rbJeroen van Dijk2010-03-121-2/+2
| |
* | Merge remote branch 'mainstream/master'Pratik Naik2010-03-123-107/+121
|\| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb
| * Clean LookupContext API.José Valim2010-03-083-8/+6
| |
| * Bring AM up to date with new rendering stack.José Valim2010-03-081-0/+2
| |
| * Speed up performance in resolvers by adding fallbacks just when required.José Valim2010-03-082-2/+3
| |
| * Rename Template::Lookup to LookupContext.José Valim2010-03-083-5/+5
| |
| * More refactoring on the views side of rendering.José Valim2010-03-083-95/+97
| |
| * Finally moved the find template logic to the views.José Valim2010-03-081-16/+24
| |
| * More cleanup on the layouts side.José Valim2010-03-082-17/+6
| |
| * Move layout lookup to views.José Valim2010-03-082-2/+16
| |
| * Added template lookup responsible to hold all information used in template ↵José Valim2010-03-072-8/+4
| | | | | | | | lookup.
| * Solved a problem that prevented render :file => work in layoutsJose Fernandez2010-03-051-1/+1
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * Change AV formats so they can delegate to the controller. Now users (or ↵Carlhuda2010-03-011-2/+6
| | | | | | | | plugins) can override details_for_render in their controllers and add appropriate additional details. Now if only they could *do* something with those details...
* | Updated documentation for block helpers in render/partials.rbJeroen van Dijk2010-03-121-3/+3
|/
* More html_safe strings now use the safe_concat methodSantiago Pastorino and José Ignacio Costa2010-02-051-1/+1
| | | | | | [#3856 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* For performance reasons, you can no longer call html_safe! on Strings. ↵Yehuda Katz2010-01-311-1/+1
| | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe.
* Add missing require for Object#try [#3771 state:resolved]Xavier Noria2010-01-221-0/+2
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* In heterogeneous collections, neither the @path nor the @template are ↵José Valim2010-01-151-1/+1
| | | | available, so we need to tell that we are simply rendering a collection.
* Remove URI object from ActiveResource notification, send the :mailer class ↵José Valim2010-01-151-4/+1
| | | | in AM (like in AP#process_action) and remove locale instrumentation.
* Template rendering should include layout time.José Valim2010-01-151-10/+10
|
* Provide useful information when instrumenting partials.José Valim2010-01-111-8/+6
|
* Use underscore in notification namespaces.José Valim2010-01-042-4/+4
|
* Use namespaces in notifications.José Valim2010-01-032-5/+7
|