dashboard: js fixes

circle/dashboard/static/dashboard/activity.js

@@ -48,7 +48,7 @@ $(function() {
   });
   });
 
 
   /* if the operation fails show the modal again */
   /* if the operation fails show the modal again */
-  $("body").on("click", "#op-form-send", function() {
+  $("body").on("click", "#confirmation-modal #op-form-send", function() {
     var url = $(this).closest("form").prop("action");
     var url = $(this).closest("form").prop("action");
 
 
     $.ajax({
     $.ajax({

circle/dashboard/static/dashboard/vm-create.js

@@ -211,7 +211,7 @@ function vmCustomizeLoaded() {
   });
   });
 
 
   /* start vm button clicks */
   /* start vm button clicks */
-  $('#vm-create-customized-start').click(function() {
+  $('#confirmation-modal #vm-create-customized-start').click(function() {
     var error = false;
     var error = false;
     $(".cpu-count-input, .ram-input, #id_name, #id_amount ").each(function() {
     $(".cpu-count-input, .ram-input, #id_name, #id_amount ").each(function() {
       if(!$(this)[0].checkValidity()) {
       if(!$(this)[0].checkValidity()) {
@@ -222,8 +222,6 @@ function vmCustomizeLoaded() {
 
 
     $(this).find("i").prop("class", "fa fa-spinner fa-spin");
     $(this).find("i").prop("class", "fa fa-spinner fa-spin");
 
 
-    if($("#confirmation-modal")) return true;
-
     $.ajax({
     $.ajax({
       url: '/dashboard/vm/create/',
       url: '/dashboard/vm/create/',
       headers: {"X-CSRFToken": getCookie('csrftoken')},
       headers: {"X-CSRFToken": getCookie('csrftoken')},