Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
038b3049
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
038b3049
编写于
11月 28, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'drop_rjs' of /home/git/repositories/gitlab/gitlabhq
上级
70c2e1d7
33aea417
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
30 addition
and
21 deletion
+30
-21
app/assets/javascripts/commits.js.coffee
app/assets/javascripts/commits.js.coffee
+8
-6
app/assets/javascripts/pager.js.coffee
app/assets/javascripts/pager.js.coffee
+3
-2
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+14
-0
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+1
-1
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
app/controllers/projects/commits_controller.rb
app/controllers/projects/commits_controller.rb
+1
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/views/dashboard/show.js.haml
app/views/dashboard/show.js.haml
+0
-2
app/views/events/_events.html.haml
app/views/events/_events.html.haml
+1
-0
app/views/groups/show.js.haml
app/views/groups/show.js.haml
+0
-2
app/views/projects/commits/show.js.haml
app/views/projects/commits/show.js.haml
+0
-3
app/views/projects/show.js.haml
app/views/projects/show.js.haml
+0
-2
未找到文件。
app/assets/javascripts/commits.js.coffee
浏览文件 @
038b3049
...
...
@@ -4,13 +4,13 @@ class CommitsList
limit
:
0
offset
:
0
@
disable
=
false
@
showProgress
:
->
$
(
'.loading'
).
show
()
@
hideProgress
:
->
$
(
'.loading'
).
hide
()
@
init
:
(
ref
,
limit
)
->
$
(
".day-commits-table li.commit"
).
live
'click'
,
(
event
)
->
if
event
.
target
.
nodeName
!=
"A"
...
...
@@ -21,7 +21,7 @@ class CommitsList
@
data
.
ref
=
ref
@
data
.
limit
=
limit
@
data
.
offset
=
limit
this
.
initLoadMore
()
this
.
showProgress
()
...
...
@@ -32,7 +32,9 @@ class CommitsList
url
:
location
.
href
data
:
@
data
complete
:
this
.
hideProgress
dataType
:
"script"
success
:
(
data
)
->
CommitsList
.
append
(
data
.
count
,
data
.
html
)
dataType
:
"json"
@
append
:
(
count
,
html
)
->
$
(
"#commits-list"
).
append
(
html
)
...
...
@@ -40,7 +42,7 @@ class CommitsList
@
data
.
offset
+=
count
else
@
disable
=
true
@
initLoadMore
:
->
$
(
document
).
unbind
(
'scroll'
)
$
(
document
).
endlessScroll
...
...
app/assets/javascripts/pager.js.coffee
浏览文件 @
038b3049
...
...
@@ -19,8 +19,9 @@
data
:
"limit="
+
@
limit
+
"&offset="
+
@
offset
complete
:
->
$
(
".loading"
).
hide
()
dataType
:
"script"
success
:
(
data
)
->
Pager
.
append
(
data
.
count
,
data
.
html
)
dataType
:
"json"
append
:
(
count
,
html
)
->
$
(
".content_list"
).
append
html
...
...
app/controllers/application_controller.rb
浏览文件 @
038b3049
...
...
@@ -174,4 +174,18 @@ class ApplicationController < ActionController::Base
filters
=
cookies
[
'event_filter'
].
split
(
','
)
if
cookies
[
'event_filter'
].
present?
@event_filter
||=
EventFilter
.
new
(
filters
)
end
# JSON for infinite scroll via Pager object
def
pager_json
(
partial
,
count
)
html
=
render_to_string
(
partial
,
layout:
false
,
formats:
[
:html
]
)
render
json:
{
html:
html
,
count:
count
}
end
end
app/controllers/dashboard_controller.rb
浏览文件 @
038b3049
...
...
@@ -22,7 +22,7 @@ class DashboardController < ApplicationController
respond_to
do
|
format
|
format
.
html
format
.
js
format
.
js
on
{
pager_json
(
"events/_events"
,
@events
.
count
)
}
format
.
atom
{
render
layout:
false
}
end
end
...
...
app/controllers/groups_controller.rb
浏览文件 @
038b3049
...
...
@@ -38,7 +38,7 @@ class GroupsController < ApplicationController
respond_to
do
|
format
|
format
.
html
format
.
js
format
.
js
on
{
pager_json
(
"events/_events"
,
@events
.
count
)
}
format
.
atom
{
render
layout:
false
}
end
end
...
...
app/controllers/projects/commits_controller.rb
浏览文件 @
038b3049
...
...
@@ -16,7 +16,7 @@ class Projects::CommitsController < Projects::ApplicationController
respond_to
do
|
format
|
format
.
html
# index.html.erb
format
.
js
format
.
js
on
{
pager_json
(
"projects/commits/_commits"
,
@commits
.
size
)
}
format
.
atom
{
render
layout:
false
}
end
end
...
...
app/controllers/projects_controller.rb
浏览文件 @
038b3049
...
...
@@ -73,7 +73,7 @@ class ProjectsController < ApplicationController
render
:show
,
layout:
user_layout
end
end
format
.
js
format
.
js
on
{
pager_json
(
"events/_events"
,
@events
.
count
)
}
end
end
...
...
app/views/dashboard/show.js.haml
已删除
100644 → 0
浏览文件 @
70c2e1d7
:plain
Pager.append(
#{
@events
.
count
}
, "
#{
escape_javascript
(
render
(
@events
))
}
");
app/views/events/_events.html.haml
0 → 100644
浏览文件 @
038b3049
=
render
@events
app/views/groups/show.js.haml
已删除
100644 → 0
浏览文件 @
70c2e1d7
:plain
Pager.append(
#{
@events
.
count
}
, "
#{
escape_javascript
(
render
(
@events
))
}
");
app/views/projects/commits/show.js.haml
已删除
100644 → 0
浏览文件 @
70c2e1d7
:plain
CommitsList.append(
#{
@commits
.
count
}
, "
#{
escape_javascript
(
render
(
'projects/commits/commits'
))
}
");
app/views/projects/show.js.haml
已删除
100644 → 0
浏览文件 @
70c2e1d7
:plain
Pager.append(
#{
@events
.
count
}
, "
#{
escape_javascript
(
render
(
@events
))
}
");
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录