Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5757c9d3
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,发现更多精彩内容 >>
未验证
提交
5757c9d3
编写于
3月 19, 2019
作者:
R
Rafael França
提交者:
GitHub
3月 19, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #35670 from jhawthorn/re_add_template_updated_at
Re-add Template#updated_at as deprecated
上级
f88ea5fd
a4bb6fd0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
6 deletion
+13
-6
actionview/lib/action_view/file_template.rb
actionview/lib/action_view/file_template.rb
+2
-2
actionview/lib/action_view/template.rb
actionview/lib/action_view/template.rb
+11
-4
未找到文件。
actionview/lib/action_view/file_template.rb
浏览文件 @
5757c9d3
...
...
@@ -22,11 +22,11 @@ def refresh(_)
# to ensure that references to the template object can be marshalled as well. This means forgoing
# the marshalling of the compiler mutex and instantiating that again on unmarshalling.
def
marshal_dump
# :nodoc:
[
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@format
,
@variant
]
[
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@
updated_at
,
@
format
,
@variant
]
end
def
marshal_load
(
array
)
# :nodoc:
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@format
,
@variant
=
*
array
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@
updated_at
,
@
format
,
@variant
=
*
array
@compile_mutex
=
Mutex
.
new
end
end
...
...
actionview/lib/action_view/template.rb
浏览文件 @
5757c9d3
...
...
@@ -122,10 +122,10 @@ def self.finalize_compiled_template_methods=(_)
extend
Template
::
Handlers
attr_reader
:source
,
:identifier
,
:handler
,
:original_encoding
attr_reader
:source
,
:identifier
,
:handler
,
:original_encoding
,
:updated_at
attr_reader
:variable
,
:format
,
:variant
,
:locals
,
:virtual_path
def
initialize
(
source
,
identifier
,
handler
,
format:
nil
,
variant:
nil
,
locals:
nil
,
virtual_path:
nil
)
def
initialize
(
source
,
identifier
,
handler
,
format:
nil
,
variant:
nil
,
locals:
nil
,
virtual_path:
nil
,
updated_at:
nil
)
unless
locals
ActiveSupport
::
Deprecation
.
warn
"ActionView::Template#initialize requires a locals parameter"
locals
=
[]
...
...
@@ -144,12 +144,19 @@ def initialize(source, identifier, handler, format: nil, variant: nil, locals: n
$1
.
to_sym
end
if
updated_at
ActiveSupport
::
Deprecation
.
warn
"ActionView::Template#updated_at is deprecated"
@updated_at
=
updated_at
else
@updated_at
=
Time
.
now
end
@format
=
format
@variant
=
variant
@compile_mutex
=
Mutex
.
new
end
deprecate
:original_encoding
deprecate
:updated_at
deprecate
def
virtual_path
=
(
_
);
end
deprecate
def
locals
=
(
_
);
end
deprecate
def
formats
=
(
_
);
end
...
...
@@ -260,11 +267,11 @@ def encode!
# to ensure that references to the template object can be marshalled as well. This means forgoing
# the marshalling of the compiler mutex and instantiating that again on unmarshalling.
def
marshal_dump
# :nodoc:
[
@source
,
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@format
,
@variant
]
[
@source
,
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@
updated_at
,
@
format
,
@variant
]
end
def
marshal_load
(
array
)
# :nodoc:
@source
,
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@format
,
@variant
=
*
array
@source
,
@identifier
,
@handler
,
@compiled
,
@locals
,
@virtual_path
,
@
updated_at
,
@
format
,
@variant
=
*
array
@compile_mutex
=
Mutex
.
new
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录