From 0d9f73fa1e3d9f0c97b20b4bc85cd71b3df95df7 Mon Sep 17 00:00:00 2001 From: AlexDenisov <1101.debian@gmail.com> Date: Wed, 9 Jan 2013 05:58:27 +0000 Subject: [PATCH] JavaScript removed from dashboard#index template. --- app/assets/javascripts/dashboard.js | 6 ++++++ app/views/dashboard/index.html.haml | 3 --- features/dashboard/event_filters.feature | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index 0261926a..11eead97 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -2,6 +2,12 @@ * Init dashboard page * */ + +$(function(){ + Pager.init(20, true); + dashboardPage(); +}); + function dashboardPage(){ $(".event_filter_link").bind('click',(function(){ enableFilter(this.id); diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index 266d66aa..abbe3101 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -1,4 +1,3 @@ -= javascript_include_tag 'dashboard' - if @has_authorized_projects .projects .activities.span8 @@ -8,5 +7,3 @@ - else = render "zero_authorized_projects" -:javascript - $(function(){ Pager.init(20, true); }); diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature index 635bf405..e0c6b84b 100644 --- a/features/dashboard/event_filters.feature +++ b/features/dashboard/event_filters.feature @@ -7,6 +7,7 @@ Feature: Event filters And this project has merge request event And I visit dashboard page + @javascript Scenario: I should see all events Then I should see push event And I should see new member event