Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ed5c096d
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ed5c096d
编写于
6月 23, 2010
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tidy up asset tag a bit and make railties tests green again.
上级
97b77330
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
29 deletion
+24
-29
actionpack/lib/action_view/helpers/asset_tag_helper.rb
actionpack/lib/action_view/helpers/asset_tag_helper.rb
+14
-24
actionpack/lib/action_view/railtie.rb
actionpack/lib/action_view/railtie.rb
+8
-3
actionpack/test/template/asset_tag_helper_test.rb
actionpack/test/template/asset_tag_helper_test.rb
+2
-2
未找到文件。
actionpack/lib/action_view/helpers/asset_tag_helper.rb
浏览文件 @
ed5c096d
...
...
@@ -194,6 +194,19 @@ module Helpers #:nodoc:
# RewriteEngine On
# RewriteRule ^/release-\d+/(images|javascripts|stylesheets)/(.*)$ /$1/$2 [L]
module
AssetTagHelper
mattr_reader
:javascript_expansions
@@javascript_expansions
=
{
}
mattr_reader
:stylesheet_expansions
@@stylesheet_expansions
=
{}
# You can enable or disable the asset tag timestamps cache.
# With the cache enabled, the asset tag helper methods will make fewer
# expensive file system calls. However this prevents you from modifying
# any asset files while the server is running.
#
# ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
mattr_accessor
:cache_asset_timestamps
# Returns a link tag that browsers and news readers can use to auto-detect
# an RSS or ATOM feed. The +type+ can either be <tt>:rss</tt> (default) or
...
...
@@ -350,8 +363,6 @@ def javascript_include_tag(*sources)
end
end
@@javascript_expansions
=
{
}
# Register one or more javascript files to be included when <tt>symbol</tt>
# is passed to <tt>javascript_include_tag</tt>. This method is typically intended
# to be called from plugin initialization to register javascript files
...
...
@@ -367,12 +378,6 @@ def self.register_javascript_expansion(expansions)
@@javascript_expansions
.
merge!
(
expansions
)
end
def
self
.
reset_javascript_expansions
#:nodoc:
@@javascript_expansions
=
{}
end
@@stylesheet_expansions
=
{}
# Register one or more stylesheet files to be included when <tt>symbol</tt>
# is passed to <tt>stylesheet_link_tag</tt>. This method is typically intended
# to be called from plugin initialization to register stylesheet files
...
...
@@ -698,23 +703,8 @@ def audio_tag(source, options = {})
tag
(
"audio"
,
options
)
end
def
self
.
cache_asset_timestamps
@@cache_asset_timestamps
end
# You can enable or disable the asset tag timestamps cache.
# With the cache enabled, the asset tag helper methods will make fewer
# expensive file system calls. However this prevents you from modifying
# any asset files while the server is running.
#
# ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
def
self
.
cache_asset_timestamps
=
(
value
)
@@cache_asset_timestamps
=
value
end
@@cache_asset_timestamps
=
true
private
def
rewrite_extension?
(
source
,
dir
,
ext
)
source_ext
=
File
.
extname
(
source
)[
1
..-
1
]
ext
&&
(
source_ext
.
blank?
||
(
ext
!=
source_ext
&&
File
.
exist?
(
File
.
join
(
config
.
assets_dir
,
dir
,
"
#{
source
}
.
#{
ext
}
"
))))
...
...
actionpack/lib/action_view/railtie.rb
浏览文件 @
ed5c096d
...
...
@@ -5,8 +5,7 @@ module ActionView
# = Action View Railtie
class
Railtie
<
Rails
::
Railtie
config
.
action_view
=
ActiveSupport
::
OrderedOptions
.
new
# setup default js includes
config
.
action_view
.
stylesheet_expansions
=
{}
config
.
action_view
.
javascript_expansions
=
{
:defaults
=>
[
'prototype'
,
'effects'
,
'dragdrop'
,
'controls'
,
'rails'
]
}
require
"action_view/railties/log_subscriber"
...
...
@@ -22,7 +21,13 @@ class Railtie < Rails::Railtie
initializer
"action_view.javascript_expansions"
do
|
app
|
ActiveSupport
.
on_load
(
:action_view
)
do
ActionView
::
Helpers
::
AssetTagHelper
.
register_javascript_expansion
(
app
.
config
.
action_view
.
javascript_expansions
)
ActionView
::
Helpers
::
AssetTagHelper
.
register_javascript_expansion
(
app
.
config
.
action_view
.
delete
(
:javascript_expansions
)
)
ActionView
::
Helpers
::
AssetTagHelper
.
register_stylesheet_expansion
(
app
.
config
.
action_view
.
delete
(
:stylesheet_expansions
)
)
end
end
...
...
actionpack/test/template/asset_tag_helper_test.rb
浏览文件 @
ed5c096d
...
...
@@ -274,7 +274,7 @@ def test_custom_javascript_expansions_with_undefined_symbol
end
def
test_reset_javascript_expansions
ActionView
::
Helpers
::
AssetTagHelper
::
reset_javascript_expansions
ActionView
::
Helpers
::
AssetTagHelper
.
javascript_expansions
.
clear
assert_raise
(
ArgumentError
)
{
javascript_include_tag
(
:defaults
)
}
end
...
...
@@ -915,7 +915,7 @@ def setup
@request
=
Struct
.
new
(
:protocol
).
new
(
"gopher://"
)
@controller
.
request
=
@request
ActionView
::
Helpers
::
AssetTagHelper
::
reset_javascript_expansions
ActionView
::
Helpers
::
AssetTagHelper
.
javascript_expansions
.
clear
end
def
url_for
(
options
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录