aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/text_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' into docrailswycats2010-03-261-2/+2
|\
| * Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵wycats2010-03-171-1/+1
| | | | | | | | warnings are in dependencies.
| * Some more tweaks on <% %>.Carlhuda2010-03-161-1/+1
| | | | | | | | * The cache helper is now semantically "mark this region for caching" * As a result, <% x = cache do %> no longer works
* | Nitpick: the first value should be odd, second is even.Ryan Bigg2010-02-271-1/+1
| |
* | Merge remote branch 'mainstream/master'Pratik Naik2010-02-141-3/+3
|\| | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README
| * simple_format returns a safe buffer escaping unsafe input [Santiago Pastorino]David Heinemeier Hansson2010-02-121-1/+1
| |
| * Safely concat the ending tag to simple_format or it will be escapedDavid Heinemeier Hansson2010-02-121-1/+1
| |
| * Fix pluralization for numbers formatted like '1.00'Gabriel Mansour2010-02-071-1/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | revises an example in the rdoc of TextHelper#concatXavier Noria2010-02-061-1/+1
|/
* For performance reasons, you can no longer call html_safe! on Strings. ↵Yehuda Katz2010-01-311-5/+5
| | | | | | | | | | | | 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.
* Merge docrailsPratik Naik2010-01-171-4/+2
|
* adding fix for auto linking to master tooZach Brock2010-01-051-1/+1
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Support passing Redcloth options via textilize helper [#2973 state:resolved]rizwanreza2009-08-091-3/+11
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Update truncate documentation / examples to more clearly demonstrate its ↵Steve St. Martin2009-08-081-8/+10
| | | | | | | | actual behavior [#3016 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge docrailsPratik Naik2009-07-251-2/+2
|
* Truncate helper accepts a :separator for a more legible result [#1807 ↵Andy Stewart2009-05-181-1/+6
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵Lance Ivy2009-05-171-6/+7
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Merge docrailsPratik Naik2009-03-241-3/+3
|
* Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 ↵Eugene Pimenov2009-03-101-2/+3
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ruby 1.9 compat: removed redundant nested repeat operatorJoshua Peek2009-02-071-1/+1
|
* Using the highlight helper on text with html shouldn't highlight text inside ↵Dan Weinand2009-01-281-1/+1
| | | | | | html attributes. [#1302 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* allow options to be passed to email address auto generationAndrew Kaspick2008-12-011-4/+4
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1418 state:committed]
* Autoload HTML::Document and sanitizersJeremy Kemper2008-11-231-10/+0
|
* Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that ↵David Heinemeier Hansson2008-11-171-81/+69
| | | | they're available if you want to use textilize and markdown and let autoload require them [DHH]
* auto_link helper: add intelligent ending closing bracket handling. add new ↵Mislav Marohnić2008-11-151-9/+13
| | | | | | | tests and reorder new ones for readability Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1353 state:committed]
* refactor autolink helper. change tests to expect HTML-escaped URLsMislav Marohnić2008-11-151-26/+20
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* auto_link view helper was failing on URLs with colons after a query paramRich Manalang2008-11-071-2/+2
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed]
* Merge with docrailsPratik Naik2008-11-021-5/+5
|
* Remove special 1.9 version of excerpt helper.Manfred Stienstra2008-09-211-45/+45
|
* Change all calls to String#chars to String#mb_chars. Remove a exception for ↵Manfred Stienstra2008-09-211-87/+41
| | | | Ruby <= 1.9.
* Merge docrailsPratik Naik2008-09-031-1/+1
|
* More symbols for send and respond_to?.Clemens Kofler2008-09-031-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Added TextHelper#current_cycle to return the current cycle for better design ↵Ken Collins2008-08-271-3/+40
| | | | | | | | options. [#417 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Require missing libraries and check for defined ActionController constant so ↵Joshua Peek2008-08-261-1/+10
| | | | ActionView can be used standalone
* Fixed autolink regexp compatibility for ruby 1.9 [#783 state:resolved]Stefan Kaes2008-08-091-1/+1
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Reapply 'cab168ac' because it was accidentally patched over in '10d9fe4b'Joshua Peek2008-07-291-1/+1
|
* Refactored TextHelper#truncate, highlight, excerpt, word_wrap and auto_link ↵Clemens Kofler2008-07-271-58/+148
| | | | | | to accept options hash [#705 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Ruby 1.9: Fixed regexp warning by replacing nested repeat operator + and ? ↵Joshua Peek2008-07-191-1/+1
| | | | with '*'
* Pass caller to concat deprecation warningJeremy Kemper2008-07-091-1/+1
|
* Allow single quote (the ' character) in the middle of URL when ↵Cheah Chu Yeow2008-06-271-1/+1
| | | | | | auto_link-ing. [#471 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Check whether blocks are called from erb using a special __in_erb_template ↵Jeremy Kemper2008-06-191-5/+1
| | | | variable visible in block binding.
* add deprecation for the #concat helper's 2nd argument, which is no longer neededrick2008-06-091-1/+5
|
* Use output_buffer reader and writer methods exclusively instead of hitting ↵Jeremy Kemper2008-06-081-2/+2
| | | | the instance variable so others can override the methods.
* concat should ignore nilJeremy Kemper2008-06-061-1/+1
|
* Don't pass block binding to concatJeremy Kemper2008-06-021-4/+4
|
* Try replacing _erbout with @output_bufferJeremy Kemper2008-06-021-2/+6
|
* Fix auto_link helper for already linked urls. [#72 state:resolved]Kevin Glowacz2008-05-221-2/+2
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Parentheses should be acceptable characters for auto_link_urls. [#234 ↵Adam2008-05-221-1/+1
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* auto_link helper fails to recognize links separated by space. [#72 ↵Eugene Pimenov2008-05-161-1/+1
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Don't fallback to just adding "'s" in TextHelper#pluralize, because the ↵Joshua Peek2008-05-141-68/+59
| | | | Inflector is always loaded.