From a316c1298ccd8bb5d65c01cdbde1f49563586e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Sat, 25 Oct 2014 15:17:56 +0200
Subject: [PATCH] popup schliessen

---
 app/webroot/js/dreamjob.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/webroot/js/dreamjob.js b/app/webroot/js/dreamjob.js
index 2925ca8..621fb1d 100755
--- a/app/webroot/js/dreamjob.js
+++ b/app/webroot/js/dreamjob.js
@@ -71,7 +71,6 @@ var global_load = null;
             });
 
             $(where + " form").submit(function(e) { 
-                $("#popup").modal('hide');
                 if ($(this).attr('enctype') != 'multipart/form-data') {
                     stopLoad(e);
                     if ($(this).hasClass('tableForm')) {
@@ -163,6 +162,7 @@ var global_load = null;
             });
         }
         function setContent(data, back, tab, backignore) {
+           $("#popup").modal('hide');
             title = data.split('<title>')[1].split('</title>')[0];
             if (title.trim().length > 0) {
                 document.title = title.trim();
@@ -205,7 +205,8 @@ var global_load = null;
             }
         }
         function setContentError(data, back, tab) {
-            alert = "<div class=\"alert alert-danger\">" + data.statusText +
+           $("#popup").modal('hide');
+           alert = "<div class=\"alert alert-danger\">" + data.statusText + 
                     "<button type=\"button\" class=\"close\" data-dismiss=\"alert\">&times;</button>"
                     + "</div>";
             $('#alert').removeClass('old');
@@ -214,7 +215,7 @@ var global_load = null;
             $('#container').html(data.responseText);
             event("#container");
         }
-        function load(pageurl, conf, tab) {
+        function load(pageurl, conf, tab) { 
             data = {};
             typemethode = "GET";
             back = false;