From 4a8dd75fa22035592a54063ecd0bd1cd2bdbb4fc Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 15 Mar 2015 11:58:20 -0400 Subject: [PATCH] VRFS-2701 VRFS-2923 wip genre selector dialog --- web/app/assets/javascripts/dialog/genreSelectorDialog.js | 2 +- web/app/views/dialogs/_dialogs.html.haml | 3 +-- web/app/views/dialogs/_genreSelectorDialog.html.haml | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web/app/assets/javascripts/dialog/genreSelectorDialog.js b/web/app/assets/javascripts/dialog/genreSelectorDialog.js index 680c613e3..8b497f456 100644 --- a/web/app/assets/javascripts/dialog/genreSelectorDialog.js +++ b/web/app/assets/javascripts/dialog/genreSelectorDialog.js @@ -35,7 +35,7 @@ 'afterHide': afterHide }; - app.bindDialog('genre-selector', dialogBindings); + app.bindDialog('genre-selector-dialog', dialogBindings); events(); } diff --git a/web/app/views/dialogs/_dialogs.html.haml b/web/app/views/dialogs/_dialogs.html.haml index 809181660..fc22bff4b 100644 --- a/web/app/views/dialogs/_dialogs.html.haml +++ b/web/app/views/dialogs/_dialogs.html.haml @@ -33,5 +33,4 @@ = render 'dialogs/allSyncsDialog' = render 'dialogs/adjustGearSpeedDialog' = render 'dialogs/openJamTrackDialog' -= render 'dialogs/openBackingTrackDialog' -= render 'dialogs/genreSelectorDialog' \ No newline at end of file += render 'dialogs/openBackingTrackDialog' \ No newline at end of file diff --git a/web/app/views/dialogs/_genreSelectorDialog.html.haml b/web/app/views/dialogs/_genreSelectorDialog.html.haml index a9d0aaadf..9d84afed9 100644 --- a/web/app/views/dialogs/_genreSelectorDialog.html.haml +++ b/web/app/views/dialogs/_genreSelectorDialog.html.haml @@ -1,5 +1,4 @@ - -.dialog.dialog-overlay-sm{layout: 'dialog', 'layout-id' => 'genre-selector', id: 'genre-selector-dialog'} +.dialog.dialog-overlay-sm{layout: 'dialog', 'layout-id' => 'genre-selector-dialog', id: 'genre-selector-dialog'} .content-head = image_tag "content/icon_friend.png", {:width => 14, :height => 14, :class => 'content-icon' } %h1