Merge branch 'develop' into fix-timeslider

2014-01-24 17:29:10 +01:00 · 2014-01-24 17:29:10 +01:00 · 59f54ad3ae
parent 8dd701b6b6 fd4dd915ce
commit 59f54ad3ae
1 changed files with 1 additions and 0 deletions
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@ -77,6 +77,7 @@ var padimpexp = (function()
        }
        currentImportTimer = null;
        importFailed("Request timed out.");
+        importDone();
      }, 25000); // time out after some number of seconds
      $('#importsubmitinput').attr(
      {