Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
59c83af1
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,发现更多精彩内容 >>
提交
59c83af1
编写于
6月 04, 2009
作者:
A
Andrew Kaspick
提交者:
Michael Koziarski
6月 11, 2009
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
allow absolute paths for the asset caches
Signed-off-by:
N
Michael Koziarski
<
michael@koziarski.com
>
上级
47ff57f6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
3 deletion
+19
-3
actionpack/lib/action_view/helpers/asset_tag_helper.rb
actionpack/lib/action_view/helpers/asset_tag_helper.rb
+3
-3
actionpack/test/template/asset_tag_helper_test.rb
actionpack/test/template/asset_tag_helper_test.rb
+16
-0
未找到文件。
actionpack/lib/action_view/helpers/asset_tag_helper.rb
浏览文件 @
59c83af1
...
...
@@ -277,7 +277,7 @@ def javascript_include_tag(*sources)
if
ActionController
::
Base
.
perform_caching
&&
cache
joined_javascript_name
=
(
cache
==
true
?
"all"
:
cache
)
+
".js"
joined_javascript_path
=
File
.
join
(
JAVASCRIPTS_DIR
,
joined_javascript_name
)
joined_javascript_path
=
File
.
join
(
joined_javascript_name
[
/^
#{
File
::
SEPARATOR
}
/
]
?
ASSETS_DIR
:
JAVASCRIPTS_DIR
,
joined_javascript_name
)
write_asset_file_contents
(
joined_javascript_path
,
compute_javascript_paths
(
sources
,
recursive
))
unless
File
.
exists?
(
joined_javascript_path
)
javascript_src_tag
(
joined_javascript_name
,
options
)
...
...
@@ -417,7 +417,7 @@ def stylesheet_link_tag(*sources)
if
ActionController
::
Base
.
perform_caching
&&
cache
joined_stylesheet_name
=
(
cache
==
true
?
"all"
:
cache
)
+
".css"
joined_stylesheet_path
=
File
.
join
(
STYLESHEETS_DIR
,
joined_stylesheet_name
)
joined_stylesheet_path
=
File
.
join
(
joined_stylesheet_name
[
/^
#{
File
::
SEPARATOR
}
/
]
?
ASSETS_DIR
:
STYLESHEETS_DIR
,
joined_stylesheet_name
)
write_asset_file_contents
(
joined_stylesheet_path
,
compute_stylesheet_paths
(
sources
,
recursive
))
unless
File
.
exists?
(
joined_stylesheet_path
)
stylesheet_tag
(
joined_stylesheet_name
,
options
)
...
...
@@ -679,4 +679,4 @@ def collect_asset_files(*path)
end
end
end
end
\ No newline at end of file
end
actionpack/test/template/asset_tag_helper_test.rb
浏览文件 @
59c83af1
...
...
@@ -317,9 +317,17 @@ def test_caching_javascript_include_tag_when_caching_on
assert
File
.
exist?
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
JAVASCRIPTS_DIR
,
'money.js'
))
assert_dom_equal
(
%(<script src="http://a0.example.com/absolute/test.js" type="text/javascript"></script>)
,
javascript_include_tag
(
:all
,
:cache
=>
"/absolute/test"
)
)
assert
File
.
exist?
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
ASSETS_DIR
,
'absolute'
,
'test.js'
))
ensure
FileUtils
.
rm_f
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
JAVASCRIPTS_DIR
,
'all.js'
))
FileUtils
.
rm_f
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
JAVASCRIPTS_DIR
,
'money.js'
))
FileUtils
.
rm_f
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
ASSETS_DIR
,
'absolute'
))
end
def
test_caching_javascript_include_tag_when_caching_on_with_proc_asset_host
...
...
@@ -547,9 +555,17 @@ def test_caching_stylesheet_link_tag_when_caching_on
)
assert
File
.
exist?
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
STYLESHEETS_DIR
,
'money.css'
))
assert_dom_equal
(
%(<link href="http://a0.example.com/absolute/test.css" media="screen" rel="stylesheet" type="text/css" />)
,
stylesheet_link_tag
(
:all
,
:cache
=>
"/absolute/test"
)
)
assert
File
.
exist?
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
ASSETS_DIR
,
'absolute'
,
'test.css'
))
ensure
FileUtils
.
rm_f
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
STYLESHEETS_DIR
,
'all.css'
))
FileUtils
.
rm_f
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
STYLESHEETS_DIR
,
'money.css'
))
FileUtils
.
rm_f
(
File
.
join
(
ActionView
::
Helpers
::
AssetTagHelper
::
ASSETS_DIR
,
'absolute'
))
end
def
test_caching_stylesheet_link_tag_when_caching_on_with_proc_asset_host
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录