deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

JavaScript removed from dashboard#index template.

Browse source
This commit is contained in:
AlexDenisov 2013-01-09 05:58:27 +00:00 committed by Alex Denisov
parent f038057b9d
commit 0d9f73fa1e
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/dashboard.js
View file

@ -2,6 +2,12 @@
* Init dashboard page * Init dashboard page
* *
*/ */
$(function(){
Pager.init(20, true);
dashboardPage();
});
function dashboardPage(){ function dashboardPage(){
$(".event_filter_link").bind('click',(function(){ $(".event_filter_link").bind('click',(function(){
enableFilter(this.id); enableFilter(this.id);

3
app/views/dashboard/index.html.haml
View file

@ -1,4 +1,3 @@
= javascript_include_tag 'dashboard'
- if @has_authorized_projects - if @has_authorized_projects
.projects .projects
.activities.span8 .activities.span8
@ -8,5 +7,3 @@
- else - else
= render "zero_authorized_projects" = render "zero_authorized_projects"
:javascript
$(function(){ Pager.init(20, true); });

1
features/dashboard/event_filters.feature
View file

@ -7,6 +7,7 @@ Feature: Event filters
And this project has merge request event And this project has merge request event
And I visit dashboard page And I visit dashboard page
@javascript
Scenario: I should see all events Scenario: I should see all events
Then I should see push event Then I should see push event
And I should see new member event And I should see new member event