diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js index 35834c96..f627ac85 100644 --- a/app/assets/javascripts/ajax_form.js +++ b/app/assets/javascripts/ajax_form.js @@ -23,17 +23,29 @@ $(document).on('click', '#ajax_form_submit', function(){ // dataType: 'script', dataType: 'html', url:$("#ajaxForm").attr("action"), + beforeSubmit: function(){ + var sub = true; + $("span.error").remove(); + $("#ajaxForm input").each(function(){ + if($(this).val() == ""){ + $("Cannot be empty.").insertAfter($(this)); + sub = false; + } + }) + if(!sub) + return false; + }, success: function(response,status,xhr){ if(typeof tinyMCEPopup != "undefined"){ - var x = response.split("#"); + var x = response.split("#"); var returnurl = x[0], - returntitle = x[1], - returndescription = x[2]; - var win = tinyMCEPopup.getWindowArg("window"); - win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl; - win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription; - win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle; - if (typeof(win.ImageDialog) != "undefined") { + returntitle = x[1], + returndescription = x[2]; + var win = tinyMCEPopup.getWindowArg("window"); + win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl; + win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription; + win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle; + if (typeof(win.ImageDialog) != "undefined") { // we are, so update image dimensions... if (win.ImageDialog.getImageData) win.ImageDialog.getImageData(); @@ -41,22 +53,41 @@ $(document).on('click', '#ajax_form_submit', function(){ // ... and preview if necessary if (win.ImageDialog.showPreviewImage) win.ImageDialog.showPreviewImage(returnurl); - } - tinyMCEPopup.close(); + } + tinyMCEPopup.close(); }else{ //incase if we want to do something for quick edit file upload - // $("#modal-file").modal('hide'); + // var modalvalues = ""; // var r = ""; // if(rcom.getInternetExplorerVersion() > -1){ // r = "