Merge branch 'staging' into remove-angular

2015-08-19 16:00:19 -07:00 · 2015-08-19 16:00:19 -07:00 · 1ea6adbd4f
parent 1dadc48aea e35e306b0c
commit 1ea6adbd4f
1 changed files with 0 additions and 2 deletions
--- a/public/js/main_0.0.3.js
+++ b/public/js/main_0.0.3.js
@ -159,12 +159,10 @@ $(document).ready(function() {
          $('#complete-zipline-or-basejump-dialog').modal('show');
      });

-      $('#completed-courseware-dialog').unbind('click');
      $('#complete-courseware-dialog').on('hidden.bs.modal', function() {
          editor.focus();
      });

-      $('#completed-zipline-or-basejump').unbind('click');
      $('#complete-zipline-or-basejump').on('hidden.bs.modal', function() {
          editor.focus();
      });