github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,316 Commits 34 Branches 105 Tags
b4ef958de6b16294094de28d00ba25fe2f48accc
Commit Graph

47 Commits

Author SHA1 Message Date
Yehuda Katz + Carl Lerche
6923b392b7 Added the :rjs render option 2009-05-21 16:35:40 -07:00
Carl Lerche & Yehuda Katz
906aebceed Bring abstract_controller up to date with rails/master 
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb995
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46
      3942cb406e
      f8ea9f85d4
      e3b166aab3
      ae9f258e03
      44423126c6

0cb020b4d6
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a83
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b16246
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.
 2009-04-13 15:18:45 -07:00
Yehuda Katz and Carl Lerche
6c05b5e938 Temporarily modifies setup to call super directly. This can support more T::U runners. 2009-04-08 17:33:41 -07:00
Yury Kotlyarov
9b8cde41bc Remove duplicate test [#2136 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-08 15:50:38 +00:00
Yehuda Katz
eb9af20b7c Begin unifying the interface between ActionController and ActionView 2009-01-22 16:18:10 -06:00
Joshua Peek
229eedfda8 Cache JavaScriptGenerator's helper module set on the template 2008-08-26 12:17:55 -05:00
Joshua Peek
f2d8d13c64 Performance: Cache modules that extend the view context for JavaScriptGenerator 2008-08-25 21:50:26 -05:00
Jeremy Kemper
ecc0543525 JavaScriptGenerator should only sets output_buffer for the duration of the update block 2008-07-15 18:42:22 -07:00
Joshua Peek
aca246ab25 Get buffer for fragment cache from template's @output_buffer 2008-07-15 14:43:52 -05:00
Michael Koziarski
e358b1fce8 Remove old method of including javascripts define_javascript_functions. 
javascript_include_tag and friends do a much better job.
 2008-07-03 19:21:04 +03:00
Jeremy Kemper
72f93b581f Check whether blocks are called from erb using a special __in_erb_template variable visible in block binding. 2008-06-19 22:21:56 -07:00
Jeremy Kemper
ff5f155f8d Use output_buffer reader and writer methods exclusively instead of hitting the instance variable so others can override the methods. 2008-06-08 20:05:39 -07:00
Jeremy Kemper
e732a405ab javascript_tag should only concat when block_given? 2008-06-06 17:59:41 -07:00
Jeremy Kemper
0bdb7d353b Work with @output_buffer instead of _erbout 2008-06-02 21:32:50 -07:00
Joshua Peek
17d4164a16 Introduce ActionView::TestCase for testing view helpers. 2008-04-19 13:08:24 -05:00
Jeremy Kemper
9d755f1983 require abstract_unit directly since test is in load path 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8564 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-05 13:32:06 +00:00
Michael Koziarski
92f02adf40 Don't escape forward slashes with String#to_json, our unicode encoding of < and > prevent the XSS problems. [tpope] Closes #10273 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8255 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-02 08:45:35 +00:00
Rick Olson
c708346688 Change JSON to encode %w(< > &) as 4 digit hex codes to be in compliance with the JSON spec. Closes #9975 [josh, chuyeow, tpope] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8050 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-10-29 00:18:43 +00:00
Rick Olson
d7aa32d5d0 Update tests for ActiveSupport's JSON escaping change. [rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8034 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-10-26 05:32:30 +00:00
David Heinemeier Hansson
f0dc2774e8 Improve tests (closes #7240) [josh] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7581 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 23:11:45 +00:00
David Heinemeier Hansson
da5d8fa6ad Fixed JavaScriptHelper#escape_javascript to also escape closing tags (closes #8023) [rubyruy] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7567 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 18:31:44 +00:00
David Heinemeier Hansson
0b0931e150 Added block-acceptance to JavaScriptHelper#javascript_tag (closes #7527) [BobSilva/tarmo/rmm5t] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7485 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-15 21:34:25 +00:00
Jeremy Kemper
71b77a3d6a Improve helper test coverage. Closes #7215, #7233, #7234, #7235, #7236, #7237, #7238. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7011 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-13 01:20:55 +00:00
Jeremy Kemper
a308ff0cdd Test javascript_tag. Closes #7239. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6977 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-08 22:20:18 +00:00
Jeremy Kemper
34b94de8b8 Improve Action View test coverage. Closes #7241, #7243, #7244. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6967 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-08 04:00:15 +00:00
Rick Olson
32b307bc32 fix test cases to match new json output. Closes #8371 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6894 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-29 09:42:13 +00:00
Jeremy Kemper
0eacdcf9a3 Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-01-28 07:16:55 +00:00
David Heinemeier Hansson
4b3e964a1a Fixed escaping of backslashes in JavaScriptHelper#escape_javascript (closes #6302) [sven@c3d2.de] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-10-09 00:34:43 +00:00
David Heinemeier Hansson
8c9ce617c9 Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5039 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-06 01:31:04 +00:00
Sam Stephenson
9d8e34808f Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4235 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-19 18:08:15 +00:00
David Heinemeier Hansson
987d9dbf31 Added JavaScriptHelper#button_to_function that works just like JavaScriptHelper#link_to_function but uses a button instead of a href [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3367 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-31 04:31:10 +00:00
David Heinemeier Hansson
89d8afa2c4 Added that JavaScriptHelper#link_to_function will honor existing :onclick definitions when adding the function call [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3365 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-31 03:51:43 +00:00
David Heinemeier Hansson
341d34cd50 Added that JavaScriptHelper#link_to_function will honor existing :onclick definitions when adding the function call [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3364 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-31 03:50:08 +00:00
Sam Stephenson
d99ed9bd6a Refactored JavaScriptHelper into PrototypeHelper and ScriptaculousHelper. Added PrototypeHelper::JavaScriptGenerator and PrototypeHelper#update_page for easily modifying multiple elements in an Ajax response. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3036 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-14 22:28:47 +00:00
Thomas Fuchs
56ae4ab547 Added support for the queue option on visual_effect 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-10-29 15:01:39 +00:00
Tobias Lütke
f60f76eab0 modified javascript_helper testcase to back up #2097 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-10-13 17:39:14 +00:00
Sam Stephenson
f49dc37e71 Wrap javascript_tag contents in a CDATA section and add a cdata_section method to TagHelper. Closes #1691. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2543 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-10-12 22:47:39 +00:00
Thomas Fuchs
516dc2c0f1 Update script.aculo.us to 1.5_rc2, and Prototype to 1.4.0_pre7 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2386 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-28 08:20:47 +00:00
David Heinemeier Hansson
7f26415d3c Optimized tag_options to not sort keys, which is no longer necessary when assert_dom_equal and friend is available #1995 [skae]. Added assert_dom_equal and assert_dom_not_equal to compare tags generated by the helpers in an order-indifferent manner #1995 [skae] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2271 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-20 07:54:55 +00:00
David Heinemeier Hansson
53ee2c9633 Added ActionController::Base.session_store=, session_store, and session_options to make it easier to tweak the session options (instead of going straight to ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2228 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-13 07:46:57 +00:00
David Heinemeier Hansson
2be3c00863 Split macros test into their own suite 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-11 08:40:46 +00:00
David Heinemeier Hansson
46110aa689 Fixed JavascriptHelper#auto_complete_for to only include unique items #2153 [Thomas Fuchs] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-09 07:25:58 +00:00
David Heinemeier Hansson
7073abe159 Fixed bug with :success/:failure callbacks for the JavaScriptHelper methods #1730 [court3nay/Thomas Fuchs] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1835 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-14 11:38:55 +00:00
David Heinemeier Hansson
1666977490 Script.aculo.us: latest rev, new autocompleter features, memory leaks fixed #1695 [Thomas Fuchs] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1810 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-11 05:17:22 +00:00
David Heinemeier Hansson
383b6afd1c Made JavaScriptHelper tests pass regardless of hash order #1656 [Sam Stephenson] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1794 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-10 05:11:23 +00:00
David Heinemeier Hansson
2abe3d2cd9 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] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1789 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-09 17:28:35 +00:00
David Heinemeier Hansson
05230c13f6 Include Javascript tests in rake #1655 [courtney] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1767 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-08 05:34:13 +00:00