aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-222-0/+178
|\ | | | | Add HTML5 color and date/time inputs
| * Add several HTML5 input helpersCarlos Galdino2012-05-212-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | The input types added are: - input[type="month"] - input[type="week"] - input[type="datetime"] - input[type="datetime-local"]
| * Add HTML5 input[type="color"] helperCarlos Galdino2012-05-212-0/+18
| |
* | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-231-3/+13
| | | | | | | | | | * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.
* | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-211-4/+4
| | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.
* | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-211-4/+4
|\ \ | |/ |/| Resolver concurrency fix
| * Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-211-4/+4
| | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access.
* | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition.
* | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-181-0/+42
|\ \ | | | | | | Tidied and standardised text_helper implementations.
| * | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-191-0/+42
| | |
* | | Fix build: can't convert Regexp to Stringkennyj2012-05-191-1/+1
| | |
* | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-181-0/+2
|/ / | | | | | | escaping of delimiters and separators
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-171-0/+1
|\ \ | | | | | | Render img tag with empty src if empty string is passed to image_tag.
| * | Render img tag with empty src if empty string is passed to image_tag.Kirill Lashuk2012-05-181-0/+1
| |/
* / Add HTML5 input[type="time"] helperAlex Soulim2012-05-182-0/+31
|/
* Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-171-34/+22
|
* Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-171-2/+2
|\ | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-171-2/+2
| |
* | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-174-5/+18
|\ \ | |/ |/| Created a Raw handler for templates.
| * Created a Raw handler for templates.Steve Klabnik2012-05-174-5/+18
| | | | | | | | Fixes #2394
* | Make :prompt work as documentedRafael Mendonça França2012-05-161-0/+7
| |
* | Test deprecation and fix the documentation of grouped_options_for_selectRafael Mendonça França2012-05-161-2/+2
| |
* | Merge pull request #5369 from ↵Aaron Patterson2012-05-161-2/+27
|\ \ | | | | | | | | | | | | Greenie0506/add_separator_to_grouped_options_for_select Add separator option to grouped_options_for_select
| * | Add separator argument to grouped_options_for_selectGreenie05062012-05-151-2/+27
| | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select
* | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-151-0/+8
|\ \ \ | |/ / |/| | Feature/simple format refactoring
| * | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-141-0/+8
| |/
* | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵José Valim2012-05-152-30/+2
| | | | | | | | | | | | | | | | | | option from `submit_tag`, `button_tag` and `button_to` helpers."" Finally remove `:disable_with` but use `:data => { :disable_with => ... }` in examples to show off a better API (which looks nicer in Ruby 1.9) This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0.
* | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ↵José Valim2012-05-152-2/+30
| | | | | | | | | | | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers." `disable_with:` is much easier to type than `"data-disable-with" =>`, and the fact it uses "data-disable-with" => is an implementation concern, it should not affect the public API. This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48.
* | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵Carlos Galdino + Rafael Mendonça França2012-05-142-30/+2
|/ | | | `submit_tag`, `button_tag` and `button_to` helpers.
* Remove `:mouseover` option from `image_tag` helper.Rafael Mendonça França2012-05-131-8/+0
|
* Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-131-1/+2
| | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb
* Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-131-0/+7
|
* Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-131-0/+6
|
* `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-131-14/+22
|
* Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-131-0/+21
| | | | and display size 1 and not multiple attribute, Fixes #5908
* check checkboxes with array of strings as :checked optionVasiliy Ermolovich2012-05-051-0/+9
|
* update invalid partial error message as per ↵Vijay Dev2012-05-041-4/+4
| | | | 04202a3f8d66c0675eac41fbf63309f4be356e81
* distance_of_time_in_words: Add/tweak comments to understand time intervals ↵Elliot Winkler2012-04-301-11/+20
| | | | better
* distance_of_time_in_words: 45-60 days is about 2 months, not about 1 monthElliot Winkler2012-04-301-1/+3
|
* split CDATA end token in cdata_section helperSergey Nartimov2012-04-301-0/+5
|
* Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-301-0/+32
|\ | | | | fix Helpers::DateHelper with :use_hidden - hide separators
| * fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-221-0/+32
| |
* | Merge pull request #6077 from ↵José Valim2012-04-302-37/+61
|\ \ | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash.
| * | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-302-37/+61
| | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`.
* | | wrap translate defaults to use translate helper features, closes #1102Sergey Nartimov2012-04-301-1/+24
|/ /
* | Remove `button_to_function` and `link_to_function` helpersRafael Mendonça França2012-04-301-30/+0
| |
* | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+1
|\ \ | | | | | | Remove some unused variable assignments
| * | Remove unused assignment in actionpack date helper testMark Rushakoff2012-04-291-1/+1
| | |
* | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-291-2/+98
|\ \ \ | | | | | | | | Change check_box to work inverting the checked and unchecked value
| * | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-291-2/+98
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995