Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
17b45189
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,发现更多精彩内容 >>
提交
17b45189
编写于
2月 08, 2010
作者:
M
Mikel Lindsaar
提交者:
José Valim
2月 08, 2010
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updating Prototype to 1.6.1 and script.aculo.us to 1.8.3
Signed-off-by:
N
José Valim
<
jose.valim@gmail.com
>
上级
5fe3dc4b
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
1593 addition
and
1041 deletion
+1593
-1041
railties/lib/generators/rails/app/templates/public/javascripts/controls.js
...rators/rails/app/templates/public/javascripts/controls.js
+5
-3
railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js
...rators/rails/app/templates/public/javascripts/dragdrop.js
+7
-6
railties/lib/generators/rails/app/templates/public/javascripts/effects.js
...erators/rails/app/templates/public/javascripts/effects.js
+8
-13
railties/lib/generators/rails/app/templates/public/javascripts/prototype.js
...ators/rails/app/templates/public/javascripts/prototype.js
+1573
-1019
未找到文件。
railties/lib/generators/rails/app/templates/public/javascripts/controls.js
浏览文件 @
17b45189
// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
// (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
// script.aculo.us controls.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com)
// Contributors:
// Richard Livsey
// Rahul Bhargava
...
...
railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js
浏览文件 @
17b45189
// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
// script.aculo.us dragdrop.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
//
// script.aculo.us is freely distributable under the terms of an MIT-style license.
// For details, see the script.aculo.us web site: http://script.aculo.us/
...
...
@@ -311,7 +312,7 @@ var Draggable = Class.create({
tag_name
==
'
TEXTAREA
'
))
return
;
var
pointer
=
[
Event
.
pointerX
(
event
),
Event
.
pointerY
(
event
)];
var
pos
=
Position
.
cumulativeOffset
(
this
.
element
);
var
pos
=
this
.
element
.
cumulativeOffset
(
);
this
.
offset
=
[
0
,
1
].
map
(
function
(
i
)
{
return
(
pointer
[
i
]
-
pos
[
i
])
});
Draggables
.
activate
(
this
);
...
...
@@ -454,7 +455,7 @@ var Draggable = Class.create({
},
draw
:
function
(
point
)
{
var
pos
=
Position
.
cumulativeOffset
(
this
.
element
);
var
pos
=
this
.
element
.
cumulativeOffset
(
);
if
(
this
.
options
.
ghosting
)
{
var
r
=
Position
.
realOffset
(
this
.
element
);
pos
[
0
]
+=
r
[
0
]
-
Position
.
deltaX
;
pos
[
1
]
+=
r
[
1
]
-
Position
.
deltaY
;
...
...
@@ -730,7 +731,7 @@ var Sortable = {
}
// keep reference
this
.
sortables
[
element
.
id
]
=
options
;
this
.
sortables
[
element
.
id
entify
()
]
=
options
;
// for onupdate
Draggables
.
addObserver
(
new
SortableObserver
(
element
,
options
.
onUpdate
));
...
...
@@ -825,7 +826,7 @@ var Sortable = {
hide
().
addClassName
(
'
dropmarker
'
).
setStyle
({
position
:
'
absolute
'
});
document
.
getElementsByTagName
(
"
body
"
).
item
(
0
).
appendChild
(
Sortable
.
_marker
);
}
var
offsets
=
Position
.
cumulativeOffset
(
dropon
);
var
offsets
=
dropon
.
cumulativeOffset
(
);
Sortable
.
_marker
.
setStyle
({
left
:
offsets
[
0
]
+
'
px
'
,
top
:
offsets
[
1
]
+
'
px
'
});
if
(
position
==
'
after
'
)
...
...
railties/lib/generators/rails/app/templates/public/javascripts/effects.js
浏览文件 @
17b45189
// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// Contributors:
// Justin Palmer (http://encytemedia.com/)
// Mark Pilgrim (http://diveintomark.org/)
...
...
@@ -145,14 +147,13 @@ var Effect = {
'
blind
'
:
[
'
BlindDown
'
,
'
BlindUp
'
],
'
appear
'
:
[
'
Appear
'
,
'
Fade
'
]
},
toggle
:
function
(
element
,
effect
)
{
toggle
:
function
(
element
,
effect
,
options
)
{
element
=
$
(
element
);
effect
=
(
effect
||
'
appear
'
).
toLowerCase
();
var
options
=
Object
.
extend
({
effect
=
(
effect
||
'
appear
'
).
toLowerCase
();
return
Effect
[
Effect
.
PAIRS
[
effect
][
element
.
visible
()
?
1
:
0
]
](
element
,
Object
.
extend
({
queue
:
{
position
:
'
end
'
,
scope
:(
element
.
id
||
'
global
'
),
limit
:
1
}
},
arguments
[
2
]
||
{
});
Effect
[
element
.
visible
()
?
Effect
.
PAIRS
[
effect
][
1
]
:
Effect
.
PAIRS
[
effect
][
0
]](
element
,
options
);
},
options
||
{}));
}
};
...
...
@@ -228,12 +229,6 @@ Effect.Queue = Effect.Queues.get('global');
Effect
.
Base
=
Class
.
create
({
position
:
null
,
start
:
function
(
options
)
{
function
codeForEvent
(
options
,
eventName
){
return
(
(
options
[
eventName
+
'
Internal
'
]
?
'
this.options.
'
+
eventName
+
'
Internal(this);
'
:
''
)
+
(
options
[
eventName
]
?
'
this.options.
'
+
eventName
+
'
(this);
'
:
''
)
);
}
if
(
options
&&
options
.
transition
===
false
)
options
.
transition
=
Effect
.
Transitions
.
linear
;
this
.
options
=
Object
.
extend
(
Object
.
extend
({
},
Effect
.
DefaultOptions
),
options
||
{
});
this
.
currentFrame
=
0
;
...
...
railties/lib/generators/rails/app/templates/public/javascripts/prototype.js
浏览文件 @
17b45189
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录