diff --git a/Gemfile b/Gemfile index 1d089d5..c762625 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ group :assets do gem "rails-backbone" gem "hogan_assets" gem "bourbon" - gem "bootstrap-sass", "~> 2.0.4.0" + gem "bootstrap-sass", "~> 2.1.0.0" gem "soundmanager-rails" gem "font-awesome-rails" end @@ -29,5 +29,5 @@ end gem "jbuilder" gem "haml" +gem "lastfm-client" gem "robbie", path: "../robbie" -gem "beatparser", path: "../beatparser" diff --git a/Gemfile.lock b/Gemfile.lock index 3bd7036..b24fe8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -PATH - remote: ../beatparser - specs: - beatparser (0.0.1) - lastfm-client - musicbrainz - robbie - PATH remote: ../robbie specs: @@ -45,12 +37,12 @@ GEM multi_json (~> 1.0) arel (3.0.2) awesome_print (1.0.2) - blankslate (2.1.2.4) - bootstrap-sass (2.0.4.0) + blankslate (3.1.2) + bootstrap-sass (2.1.0.0) bourbon (2.1.1) sass (>= 3.1) - builder (3.0.0) - capistrano (2.12.0) + builder (3.0.3) + capistrano (2.13.3) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) @@ -66,27 +58,27 @@ GEM daemons (1.1.9) ejs (1.0.0) erubis (2.7.0) - eventmachine (0.12.10) + eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) font-awesome-rails (0.4.0) railties (~> 3.1) haml (3.1.7) - highline (1.6.13) + highline (1.6.14) hike (1.2.1) hogan_assets (1.3.2) execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt (>= 1.3.3) - httparty (0.8.3) + httparty (0.9.0) multi_json (~> 1.0) multi_xml - i18n (0.6.0) - jbuilder (0.4.0) + i18n (0.6.1) + jbuilder (0.5.0) activesupport (>= 3.0.0) blankslate (>= 2.1.2.4) journey (1.0.4) - jquery-rails (2.1.1) + jquery-rails (2.1.2) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.5) @@ -100,8 +92,6 @@ GEM mime-types (1.19) multi_json (1.3.6) multi_xml (0.5.1) - musicbrainz (0.7.0) - nokogiri net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -109,9 +99,8 @@ GEM net-ssh (2.5.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) - nokogiri (1.5.5) oj (1.3.4) - pg (0.14.0) + pg (0.14.1) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -164,17 +153,16 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - uglifier (1.2.7) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (~> 1.3) + multi_json (~> 1.0, >= 1.0.2) PLATFORMS ruby DEPENDENCIES awesome_print - beatparser! - bootstrap-sass (~> 2.0.4.0) + bootstrap-sass (~> 2.1.0.0) bourbon capistrano coffee-rails (~> 3.2.1) @@ -183,6 +171,7 @@ DEPENDENCIES hogan_assets jbuilder jquery-rails + lastfm-client pg rails (= 3.2.8) rails-backbone diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 512174f..1dc96f3 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -2,7 +2,11 @@ #= require jquery_ujs #= require jquery.autocomplete -# require soundmanager +#= require bootstrap-dropdown +#= require bootstrap-tooltip +#= require bootstrap-popover + +#= require soundmanager #= require vk_music #= require hogan @@ -14,10 +18,4 @@ #= require backbone/beat_haven #= require locale/en #= require locale/ru - -#= require bootstrap-dropdown -#= require bootstrap-tooltip -#= require bootstrap-popover - -#= require_tree . - +#= require_tree ./bindings diff --git a/app/assets/javascripts/backbone/beat_haven.js.coffee b/app/assets/javascripts/backbone/beat_haven.js.coffee index 054c7f0..8e3aa22 100644 --- a/app/assets/javascripts/backbone/beat_haven.js.coffee +++ b/app/assets/javascripts/backbone/beat_haven.js.coffee @@ -5,7 +5,6 @@ #= require_tree ./collections #= require_tree ./views #= require_tree ./routers -#= require ./i18n window.BeatHaven = Modules: {} @@ -29,7 +28,7 @@ window.BeatHaven = @VK = new BeatHaven.Models.VK() @I18n = new BeatHaven.Modules.I18n() - # @VK.init() + @VK.init() Backbone.history.start(pushState: true); $("a").live "click", (e) -> diff --git a/app/assets/javascripts/backbone/models/track.js.coffee b/app/assets/javascripts/backbone/models/track.js.coffee index 583473d..9fa24cc 100644 --- a/app/assets/javascripts/backbone/models/track.js.coffee +++ b/app/assets/javascripts/backbone/models/track.js.coffee @@ -15,9 +15,9 @@ class BeatHaven.Models.Track extends Backbone.Model artists: @.get("artists") track: @.get("title") ) - # unless @.get("sm_obj")? - # this.add_to_library(autoload: true, autoplay: false) - # BH.Player.play(this) + unless @.get("sm_obj")? + this.add_to_library(autoload: true, autoplay: false) + BH.Player.play(this) $(".artist-page .tracks li[data-id]").removeClass("now-playing").removeClass("paused") this.node().addClass("now-playing") diff --git a/app/assets/javascripts/backbone/templates/album/show.mustache b/app/assets/javascripts/backbone/templates/album/show.mustache index 70a7e0b..ce85d76 100644 --- a/app/assets/javascripts/backbone/templates/album/show.mustache +++ b/app/assets/javascripts/backbone/templates/album/show.mustache @@ -9,12 +9,12 @@ {{i18n_add}} -