jQuery from CDN, work on search

This commit is contained in:
magnolia-fan
2011-07-04 19:09:44 +04:00
parent f92693d847
commit 495d0a08df
24 changed files with 235 additions and 924 deletions
+2 -3
View File
@@ -24,12 +24,11 @@ class Ajax
else
_ajax.setArchor '/artist/' +name+ '/'
_pages.renderArtist data
_search.hideSpinner()
false
loadSearchPage: ->
$.get '/templates/search.html', (data) ->
_ajax.setArchor '/search/'
_pages.renderSearch _beathaven.localizeHTML $(data)
false
loadSettingsPage: ->
+9 -1
View File
@@ -52,7 +52,7 @@ class BeatHaven
false
adjustSizes: ->
$('.data-container').height $(window).height() - $('.header-container').height()
$('.data-container').height $(window).height() - $('.header-container').height() - $('.pulldown').height()
$('.data-container').width $(window).width() - $('.player').width()
$('.player-container').height $(window).height()
$('.playlist').height $(window).height() - $('.player').height() - $('.player-container .additional-controls').height()
@@ -103,6 +103,14 @@ class BeatHaven
_locale[id][lang]
else
id
pdShowSpinner: ->
$('.pulldown').html '<div class="pd-spinner"><img src="/images/loader.gif" alt=""/></div>'
false
pdHideSpinner: ->
$('.pulldown').html ''
false
String::htmlsafe = ->
+5 -15
View File
@@ -53,16 +53,9 @@ class Pages
false
renderSearch: (data) ->
$('.data-container').css background: 'url(/images/concrete_wall_2.png) 0 -30px repeat'
$('.data-container .inner').html data
$('.search-container')
.css('marginLeft', ($('.data-container').width() - 425) / 2 + 'px')
.css('marginTop', ($('.data-container').height() / 2 - 230)+ 'px')
.height(($('.data-container').height() - $('#search_form').height()) / 2)
$('.pulldown').html data
setTimeout ->
$('#search_field').bh_autocomplete
$('.search_field').first().bh_autocomplete
serviceUrl: '/artist/autocomplete' # Страница для обработки запросов автозаполнения
minChars: 2 # Минимальная длина запроса для срабатывания автозаполнения
delimiter: /(,|;)\s*/ # Разделитель для нескольких запросов, символ или регулярное выражение
@@ -71,12 +64,9 @@ class Pages
zIndex: 9999 # z-index списка
deferRequestBy: 500 # Задержка запроса (мсек)
onSelect: ->
_ajax.loadArtistData $('#search_field').val()
$('#search_field').focus()
, 501
yaCounter7596904.hit _ajax.getAnchor(), 'Artist Search', _ajax.referer
_ajax.setTitle 'Artist Search'
_ajax.loadArtistData $('.search_field').first().val()
$('.search_field').first().focus()
, 1
false
renderSettings: (data) ->
+22 -10
View File
@@ -3,17 +3,17 @@ class Search
pics: []
showSpinner: ->
$('.search-container input').attr(disabled: 'disabled').blur()
$('.search-container img').show()
$('.search-container input').first().attr(disabled: 'disabled').blur()
$('.search-container img').first().show()
$('.autocomplete-container').hide()
$('.artist_loading.failed').hide()
$('.artist_loading.failed').first().hide()
this.hideSuggestions()
false
hideSpinner: ->
$('.search-container input').removeAttr 'disabled'
$('.search_field').focus()
$('.search-container img').hide()
$('.search-container input').first().removeAttr 'disabled'
$('.search_field').first().focus()
$('.search-container img').first().hide()
false
showSuggestions: (values) ->
@@ -49,14 +49,26 @@ class Search
$('.search').live 'click', ->
_ajax.go '/search/'
if $('.pulldown').css('display') is 'none'
$('.pulldown').width $('.data-container').width() - 50
$('.pulldown').height 300#38
$('.pulldown').slideDown 'fast', ->
data = '<div class="search-container">'+$('.subpages .search-container').html()+'</div>'
_pages.renderSearch _beathaven.localizeHTML $(data)
_beathaven.adjustSizes()
_beathaven.redrawScrollbar()
else
$('.pulldown').slideUp 'fast', ->
$('.pulldown').height 0
_beathaven.adjustSizes()
_beathaven.redrawScrollbar()
false
$('#search_form').live 'submit', ->
$('.search_form').live 'submit', ->
$('.autocomplete-container').remove()
_ajax.loadArtistData $('#search_field').val()
_ajax.loadArtistData $('.search_field').first().val()
false
$('.suggestions a').live 'click', ->
$('#search_field').val $(this).text()
$('.search_field').first().val $(this).text()
false
$('.data.artist').live 'click', ->
_ajax.go('/artist/'+$(this).text().replace(' ', '+')+'/');