JavaScript removed from dashboard#index template.

AlexDenisov · Alex Denisov
1 parent f038057b
Showing 3 changed files with 7 additions and 3 deletions Show diff stats
app/assets/javascripts/dashboard.js
app/views/dashboard/index.html.haml
features/dashboard/event_filters.feature
@@ -2,6 +2,12 @@
  * Init dashboard page
  *
  */
+
+$(function(){
+  Pager.init(20, true);
+  dashboardPage();
+});
+
 function dashboardPage(){ 
   $(".event_filter_link").bind('click',(function(){
     enableFilter(this.id);
-= 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); });
@@ -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
...	...	@@ -2,6 +2,12 @@
2	2	* Init dashboard page
3	3	*
4	4	*/
	5	+
	6	+$(function(){
	7	+ Pager.init(20, true);
	8	+ dashboardPage();
	9	+});
	10	+
5	11	function dashboardPage(){
6	12	$(".event_filter_link").bind('click',(function(){
7	13	enableFilter(this.id);
...	...
1		-= javascript_include_tag 'dashboard'
2	1	- if @has_authorized_projects
3	2	.projects
4	3	.activities.span8
...	...	@@ -8,5 +7,3 @@
8	7
9	8	- else
10	9	= render "zero_authorized_projects"
11		-:javascript
12		- $(function(){ Pager.init(20, true); });
...	...
...	...	@@ -7,6 +7,7 @@ Feature: Event filters
7	7	And this project has merge request event
8	8	And I visit dashboard page
9	9
	10	+ @javascript
10	11	Scenario: I should see all events
11	12	Then I should see push event
12	13	And I should see new member event
...	...