From f7a8f46070ffeb209ad4806d3cf2c45100fd62ed Mon Sep 17 00:00:00 2001 From: Aidan Feay Date: Fri, 29 Jul 2016 14:19:41 -0400 Subject: [PATCH] dropdown qa - #374, #375, #376, #377, #378 --- .../javascripts/autotune/application.js | 27 +++++++++++-------- app/assets/stylesheets/autotune/_core.scss | 6 ++--- .../autotune/_custom_overrides.scss | 11 ++++++-- appjs/templates/project_list.ejs | 10 +++---- appjs/views/edit_project.js | 3 +++ appjs/views/list_projects.js | 6 +++-- 6 files changed, 39 insertions(+), 24 deletions(-) diff --git a/app/assets/javascripts/autotune/application.js b/app/assets/javascripts/autotune/application.js index 13cbe940..1952a835 100644 --- a/app/assets/javascripts/autotune/application.js +++ b/app/assets/javascripts/autotune/application.js @@ -1948,7 +1948,7 @@ __p+='\n (clear)\n '; } __p+='\n  \n \n '; if ( app.themes.length > 1 ) { -__p+='\n
\n \n
\n
\n + - +
- + <% _.each(app.config.project_pub_statuses, function(pub_status) { %> diff --git a/appjs/views/edit_project.js b/appjs/views/edit_project.js index e9a2091e..880dcdbe 100644 --- a/appjs/views/edit_project.js +++ b/appjs/views/edit_project.js @@ -501,6 +501,9 @@ var EditProject = BaseView.extend(require('./mixins/actions'), require('./mixins $( "input[name='google_doc_url']" ).after(''); } } + $('div[data-alpaca-field-name="theme"] .form-control').selectize({ + highlight: false + }); }).catch(function(err) { console.error(err); }).then(function() { diff --git a/appjs/views/list_projects.js b/appjs/views/list_projects.js index 9f44f134..a690e6b0 100644 --- a/appjs/views/list_projects.js +++ b/appjs/views/list_projects.js @@ -14,8 +14,10 @@ module.exports = BaseView.extend(require('./mixins/actions'), require('./mixins/ }, afterRender: function() { - $('.selectize-target').selectize({ - highlight: false + $.each($('.selectize-target'), function(k, v){ + $(v).selectize({ + highlight: false + }); }); },