diff options
| -rw-r--r-- | actionpack/CHANGELOG | 20 | ||||
| -rw-r--r-- | actionpack/lib/action_view.rb | 10 |
2 files changed, 14 insertions, 16 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 8b418ac92b..90ac2053e1 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,23 +1,27 @@ *SVN* +* Fixed that Action View should always use the included Builder, never attempt to require the gem, to ensure compatibility + * Added that nil options are not included in tags, so tag("p", :ignore => nil) now returns <p /> not <p ignore="" /> but that tag("p", :ignore => "") still includes it #1465 [michael@schuerig.de] * Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on the name if no link was to be applied. This is unnecessary and breaks its use with images #1649 [joergd@pobox.com] -* Added even more goodies to script.aculo.us #1677 [Thomas Fuchs] - * Added capability to remove draggables/droppables and redeclare sortables in dragdrop.js (this makes it possible to call sortable_element on the same element more than once, e.g. in AJAX returns that modify the sortable element. all current sortable 'stuff' on the element will be discarded and the sortable will be rebuilt) - * Always reset background color on Effect.Highlight; this make change backwards-compatibility, to be sure include style="background-color:(target-color)" on your elements or else elements will fall back to their CSS rules (which is a good thing in most circumstances) - * Removed circular references from element to prevent memory leaks (still not completely gone in IE) - * Changes to class extension in effects.js - * Make Effect.Highlight restore any previously set background color when finishing (makes effect work with CSS classes that set a background color) - * Improved error message for DoubleRenderError * Fixed routing to allow for testing of *path components #1650 [Nicholas Seckar] * Added :handle as an option to sortable_element to restrict the drag handle to a given class #1642 [thejohnny] -* Added a bunch of script.aculo.us features: Effect.ScrollTo, to smoothly scroll the page to an element, better Firefox flickering handling on SlideUp/SlideDown, Removed a possible memory leak in IE with draggables, Added support for cancelling dragging my hitting ESC #1644 [Thomas Fuchs] +* Added a bunch of script.aculo.us features #1644, #1677 [Thomas Fuchs] + * Effect.ScrollTo, to smoothly scroll the page to an element + * Better Firefox flickering handling on SlideUp/SlideDown + * Removed a possible memory leak in IE with draggables + * Added support for cancelling dragging my hitting ESC + * Added capability to remove draggables/droppables and redeclare sortables in dragdrop.js (this makes it possible to call sortable_element on the same element more than once, e.g. in AJAX returns that modify the sortable element. all current sortable 'stuff' on the element will be discarded and the sortable will be rebuilt) + * Always reset background color on Effect.Highlight; this make change backwards-compatibility, to be sure include style="background-color:(target-color)" on your elements or else elements will fall back to their CSS rules (which is a good thing in most circumstances) + * Removed circular references from element to prevent memory leaks (still not completely gone in IE) + * Changes to class extension in effects.js + * Make Effect.Highlight restore any previously set background color when finishing (makes effect work with CSS classes that set a background color) * Fixed that named routes didn't use the default values for action and possible other parameters #1534 [Nicholas Seckar] diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index d2a54da15e..3c6e109caf 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -21,14 +21,8 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -begin - require 'rubygems' - require 'builder' -rescue LoadError - # RubyGems is not available, use included Builder - $:.unshift(File.dirname(__FILE__) + "/action_view/vendor") - require 'action_view/vendor/builder' -end +$:.unshift(File.dirname(__FILE__) + "/action_view/vendor") +require 'action_view/vendor/builder' require 'action_view/base' require 'action_view/partials' |