Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5853583f
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,发现更多精彩内容 >>
提交
5853583f
编写于
12月 22, 2010
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow registering javascript/stylesheet_expansions to existing symbols
上级
0b5222fa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
4 deletion
+29
-4
actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
..._view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+5
-2
actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
..._view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+5
-2
actionpack/test/template/asset_tag_helper_test.rb
actionpack/test/template/asset_tag_helper_test.rb
+19
-0
未找到文件。
actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
浏览文件 @
5853583f
...
...
@@ -59,7 +59,10 @@ module ClassMethods
# <script type="text/javascript" src="/javascripts/body.js"></script>
# <script type="text/javascript" src="/javascripts/tail.js"></script>
def
register_javascript_expansion
(
expansions
)
JavascriptIncludeTag
.
expansions
.
merge!
(
expansions
)
js_expansions
=
JavascriptIncludeTag
.
expansions
expansions
.
each
do
|
key
,
values
|
js_expansions
[
key
]
=
(
js_expansions
[
key
]
||
[])
|
Array
(
values
)
if
values
end
end
end
...
...
@@ -170,4 +173,4 @@ def javascript_include_tag(*sources)
end
end
end
\ No newline at end of file
end
actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
浏览文件 @
5853583f
...
...
@@ -44,7 +44,10 @@ module ClassMethods
# <link href="/stylesheets/body.css" media="screen" rel="stylesheet" type="text/css" />
# <link href="/stylesheets/tail.css" media="screen" rel="stylesheet" type="text/css" />
def
register_stylesheet_expansion
(
expansions
)
StylesheetIncludeTag
.
expansions
.
merge!
(
expansions
)
style_expansions
=
StylesheetIncludeTag
.
expansions
expansions
.
each
do
|
key
,
values
|
style_expansions
[
key
]
=
(
style_expansions
[
key
]
||
[])
|
Array
(
values
)
if
values
end
end
end
...
...
@@ -141,4 +144,4 @@ def stylesheet_link_tag(*sources)
end
end
end
\ No newline at end of file
end
actionpack/test/template/asset_tag_helper_test.rb
浏览文件 @
5853583f
...
...
@@ -54,6 +54,9 @@ def url_for(*args)
def
teardown
config
.
perform_caching
=
false
ENV
.
delete
(
'RAILS_ASSET_ID'
)
JavascriptIncludeTag
.
expansions
.
clear
StylesheetIncludeTag
.
expansions
.
clear
end
AutoDiscoveryToTag
=
{
...
...
@@ -268,6 +271,14 @@ def test_custom_javascript_expansions_and_defaults_puts_application_js_at_the_en
assert_dom_equal
%(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>)
,
javascript_include_tag
(
'controls'
,
:defaults
,
:robbery
,
'effects'
)
end
def
test_registering_javascript_expansions_merges_with_existing_expansions
ENV
[
"RAILS_ASSET_ID"
]
=
""
ActionView
::
Helpers
::
AssetTagHelper
::
register_javascript_expansion
:can_merge
=>
[
'bank'
]
ActionView
::
Helpers
::
AssetTagHelper
::
register_javascript_expansion
:can_merge
=>
[
'robber'
]
ActionView
::
Helpers
::
AssetTagHelper
::
register_javascript_expansion
:can_merge
=>
[
'bank'
]
assert_dom_equal
%(<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>)
,
javascript_include_tag
(
:can_merge
)
end
def
test_custom_javascript_expansions_with_undefined_symbol
ActionView
::
Helpers
::
AssetTagHelper
::
register_javascript_expansion
:monkey
=>
nil
assert_raise
(
ArgumentError
)
{
javascript_include_tag
(
'first'
,
:monkey
,
'last'
)
}
...
...
@@ -327,6 +338,14 @@ def test_custom_stylesheet_expansions_with_undefined_symbol
assert_raise
(
ArgumentError
)
{
stylesheet_link_tag
(
'first'
,
:monkey
,
'last'
)
}
end
def
test_registering_stylesheet_expansions_merges_with_existing_expansions
ENV
[
"RAILS_ASSET_ID"
]
=
""
ActionView
::
Helpers
::
AssetTagHelper
::
register_stylesheet_expansion
:can_merge
=>
[
'bank'
]
ActionView
::
Helpers
::
AssetTagHelper
::
register_stylesheet_expansion
:can_merge
=>
[
'robber'
]
ActionView
::
Helpers
::
AssetTagHelper
::
register_stylesheet_expansion
:can_merge
=>
[
'bank'
]
assert_dom_equal
%(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />)
,
stylesheet_link_tag
(
:can_merge
)
end
def
test_image_path
ImagePathToTag
.
each
{
|
method
,
tag
|
assert_dom_equal
(
tag
,
eval
(
method
))
}
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录