Move search autocomplete call to dispatcher

Dmitriy Zaporozhets
1 parent 0b981eb9
Showing 4 changed files with 21 additions and 11 deletions Show diff stats
app/assets/javascripts/admin.js.coffee
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/search_autocomplete.js.coffee
app/views/layouts/_search.html.haml
-@Admin =
-  init: ->
+class Admin
+  constructor: ->
     $('input#user_force_random_password').on 'change', (elem) ->
       elems = $('#user_password, #user_password_confirmation')
  
@@ -26,3 +26,5 @@
     $('.change-owner-cancel-link').bind "click",  ->
       modal.hide()
       $('.change-owner-link').show()
+
+@Admin = Admin
@@ -3,6 +3,10 @@ $ -&gt;
  
 class Dispatcher
   constructor: () ->
+    @initSearch()
+    @initPageScripts()
+
+  initPageScripts: ->
     page = $('body').attr('data-page')
     project_id = $('body').attr('data-project-id')
  
@@ -25,6 +29,9 @@ class Dispatcher
         new Wall(project_id)
  
     switch path.first()
-      when 'admin' then Admin.init()
+      when 'admin' then new Admin()
       when 'wikis' then new Wikis()
  
+  initSearch: ->
+    autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')
+    new SearchAutocomplete(autocomplete_json)
@@ -0,0 +1,8 @@
+class SearchAutocomplete
+  constructor: (json) ->
+    $("#search").autocomplete
+      source: json
+      select: (event, ui) ->
+        location.href = ui.item.url
+
+@SearchAutocomplete = SearchAutocomplete
@@ -3,11 +3,4 @@
     = text_field_tag "search", nil, placeholder: "Search", class: "search-input"
     = hidden_field_tag :group_id, @group.try(:id)
     = hidden_field_tag :project_id, @project.try(:id)
-
-:javascript
-  $(function(){
-    $("#search").autocomplete({
-      source: #{raw search_autocomplete_source},
-      select: function(event, ui) { location.href = ui.item.url }
-    });
-  });
+    .search-autocomplete-json.hide{:'data-autocomplete-opts' => search_autocomplete_source }
1		-@Admin =
2		- init: ->
	1	+class Admin
	2	+ constructor: ->
3	3	$('input#user_force_random_password').on 'change', (elem) ->
4	4	elems = $('#user_password, #user_password_confirmation')
5	5
...	...	@@ -26,3 +26,5 @@
26	26	$('.change-owner-cancel-link').bind "click", ->
27	27	modal.hide()
28	28	$('.change-owner-link').show()
	29	+
	30	+@Admin = Admin
...	...
...	...	@@ -3,6 +3,10 @@ $ ->
3	3
4	4	class Dispatcher
5	5	constructor: () ->
	6	+ @initSearch()
	7	+ @initPageScripts()
	8	+
	9	+ initPageScripts: ->
6	10	page = $('body').attr('data-page')
7	11	project_id = $('body').attr('data-project-id')
8	12
...	...	@@ -25,6 +29,9 @@ class Dispatcher
25	29	new Wall(project_id)
26	30
27	31	switch path.first()
28		- when 'admin' then Admin.init()
	32	+ when 'admin' then new Admin()
29	33	when 'wikis' then new Wikis()
30	34
	35	+ initSearch: ->
	36	+ autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')
	37	+ new SearchAutocomplete(autocomplete_json)
...	...
...	...	@@ -0,0 +1,8 @@
	1	+class SearchAutocomplete
	2	+ constructor: (json) ->
	3	+ $("#search").autocomplete
	4	+ source: json
	5	+ select: (event, ui) ->
	6	+ location.href = ui.item.url
	7	+
	8	+@SearchAutocomplete = SearchAutocomplete
...	...
...	...	@@ -3,11 +3,4 @@
3	3	= text_field_tag "search", nil, placeholder: "Search", class: "search-input"
4	4	= hidden_field_tag :group_id, @group.try(:id)
5	5	= hidden_field_tag :project_id, @project.try(:id)
6		-
7		-:javascript
8		- $(function(){
9		- $("#search").autocomplete({
10		- source: #{raw search_autocomplete_source},
11		- select: function(event, ui) { location.href = ui.item.url }
12		- });
13		- });
	6	+ .search-autocomplete-json.hide{:'data-autocomplete-opts' => search_autocomplete_source }
...	...