Merge branch 'saas-dev' into saas-dev-usability-hints

Conflicts: airtime_mvc/public/js/airtime/schedule/add-show.js
2015-07-14 10:56:12 -04:00 · 2015-07-14 10:56:12 -04:00 · 45b09a0d24
commit 45b09a0d24
parent 5a2ef8d3db d9117721b9
4 changed files with 138 additions and 121 deletions
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@ -115,6 +115,8 @@ function dayClick(date, allDay, jsEvent, view){
            $("#schedule-show-when").show();

            openAddShowForm();
+            makeAddShowButton();
+            toggleAddShowButton();
        }
    }
 }