aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Accept :remote as symbol in link_to optionsRiley2012-10-061-1/+3
| | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to.
* Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-011-3/+3
| | | | | | | | | prefix TemplateAssertions ivars. Closes #7459 Conflicts: actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/test_case.rb
* correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-251-2/+5
| | | | | | | | | | | | we should take disabled option not only from `html_options` hash but from `options` hash too like `build_select` method does it. So datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true }) datetime_select("post", "updated_at", :discard_minute => true , :disabled => true) both these variants work now closes #7431
* Merge pull request #7410 from sandeepravi/default_options_helper_valueRafael Mendonça França2012-08-211-0/+1
| | | | | | option_tags coerced to "" instead of nil Closes #7404
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-092-3/+3
|\
| * Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-091-1/+1
| | | | | | | | | | | | Thanks to Marek Labos & Nethemba CVE-2012-3465
| * escape select_tag :prompt valuesSantiago Pastorino2012-08-091-2/+2
| | | | | | | | CVE-2012-3463
* | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| |
* | Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-061-5/+6
|/ | | | | | Rails were including 'application.js' to the pack when using `javascript_include_tag :all` even there's no application.js in the public directory.
* Revert "Deprecate link_to_function and button_to_function helpers"Rafael Mendonça França2012-08-011-4/+0
| | | | This reverts commit 9dc57fe9c4807fc0ad4b1590a931891d9faa3164.
* Revert "Deprecate `:mouseover` options for `image_tag` helper."Rafael Mendonça França2012-08-011-2/+0
| | | | | | | This reverts commit 1aff7725c7a04cde202cca906208560a55409e6a. Conflicts: actionpack/CHANGELOG.md
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` ↵Rafael Mendonça França2012-08-013-29/+9
| | | | | | | | | | | option" Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers." This reverts commit fc092a9cba5fceec38358072e50e09250cf58840. This reverts commit e9051e20aeb2c666db06b6217954737665878db7. This reverts commit d47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1. This reverts commit 21141e777bdce8534e3755c8de7268324b3d8714.
* Fixed bug creating invalid HTML in select optionsRusty Geldmacher2012-07-101-5/+5
| | | | | | | | | When a select tag is created for a field with errors, and that select tag has :prompt or :include_blank options, then the inserted first option will errantly have a <div class="field_with_errors"> wrapping it. See https://github.com/rails/rails/issues/7017
* Fix NumberHelper options wrapping to prevent verbatim blocks being rendered ↵Mark J. Titorenko2012-07-021-90/+159
| | | | | | | | | | instead of line continuations. While I'm at it, wrap long comment lines consistently. Conflicts: actionpack/lib/action_view/helpers/number_helper.rb There was just one conflict related to the addition of the :format option to number_to_percentage.
* Merge pull request #6649 from route/logger_in_metal_3_2Carlos Antonio da Silva2012-06-181-2/+4
|\ | | | | Logger in metal backport for 3.2
| * ActionController::Metal doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-161-2/+4
| |
* | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-161-1/+7
|/ | | | Respect absolute paths in compute_source_path.
* Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-06-052-2/+13
| | | | | | | | | | | | This deprecation applies to: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` As :confirm is an UI specific option is better to use the data attributes, teaching users about unobtrusive JavaScript and how Rails works with it.
* Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-011-1/+2
| | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
* Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stableRafael Mendonça França2012-05-201-1/+1
|\ | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-201-1/+1
| |
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
|\ \ | |/ |/| Template concurrency fixes
| * Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-201-10/+22
| |
| * Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-281-2/+2
| | | | | | | | Closes #5632
| * Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-281-1/+1
| | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
| * Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-282-8/+24
| | | | | | | | Embed auth token in remote forms
| * Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-272-2/+6
| | | | | | | | Textarea newline fix breaks haml (3-2-stable)
* | Use right option for excerpt text helper in tests, fix buildCarlos Antonio da Silva2012-05-191-2/+2
| | | | | | | | | | | | | | `excerpt` text helper uses `:radius`, not `line_width` (that is used by `word_wrap` helper). Also cleanup some whitespaces.
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-181-2/+2
| | | | | | | | Render img tag with empty src if empty string is passed to image_tag.
* | Deprecate old APIs for highlight, excerpt and word_wrapJeremy Walker2012-05-181-0/+9
| |
* | Deprecate `:disable_with` for `button_tag` tooCarlos Galdino + Rafael Mendonça França2012-05-142-2/+4
| |
* | Fix typoCarlos Galdino + Rafael Mendonça França2012-05-141-1/+1
| |
* | Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵Carlos Galdino + Rafael Mendonça França2012-05-142-6/+13
| | | | | | | | `button_to` and `submit_tag` helpers.
* | Deprecate `:mouseover` options for `image_tag` helper.Rafael Mendonça França2012-05-131-0/+2
| |
* | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-132-2/+2
| | | | | | | | Support data: url scheme
* | Deprecate link_to_function and button_to_function helpersRafael Mendonça França2012-04-301-0/+4
| |
* | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
| |
* | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-281-1/+7
| | | | | | | | closes #3341
* | Do not mutate options hashCarlos Antonio da Silva2012-04-271-2/+2
| |
* | fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
| |
* | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-161-1/+1
| | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb
* | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-161-1/+1
| |
* | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-281-2/+2
| | | | | | | | Closes #5632
* | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-281-1/+1
| | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
* | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-282-8/+24
| | | | | | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default)
* | Merge pull request #5622 from rafaelfranca/fix-2492-3-2Jeremy Kemper2012-03-271-2/+3
|\ \ | | | | | | [3-2-stable] Fix label_tag to merge the options hash with the object hash
| * | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-271-10/+5
| | | | | | | | | | | | | | | | | | hash. Closes #2492 and #5614
| * | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.Andrey Samsonov2012-03-271-2/+8
| |/ | | | | | | | | | | objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
* | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-272-2/+6
|\ \ | |/ |/| Textarea newline fix breaks haml (3-2-stable)
| * Don't break Haml with textarea newline fix.James Coleman2012-03-272-2/+6
| | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.