ADD: installer scripts fixes

antaresproject · Jun 6, 2017 · 2725843 · 2725843
1 parent c06fb63
commit 2725843
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/public/packages/core/js/installer.js b/public/packages/core/js/installer.js
@@ -10,17 +10,23 @@
     $console.perfectScrollbar();
 
     (function refresh() {
-        $.get(url).then(function (response) {
-            if (parseInt(response.progress) > parseInt($progress.text())) {
-                $progress.text(response.progress);
-            }
-            if (response.redirect) {
-                window.location.replace(response.redirect);
-            } else {
-                var text = response.console.replace(/\r\n/g, "\n");
-                editor.getDoc().setValue(text);
-                editor.execCommand('goDocEnd');
-                setTimeout(refresh, 1000);
+        $.ajax({
+            url: url,
+            success: function (response) {
+                if (parseInt(response.progress) > parseInt($progress.text())) {
+                    $progress.text(response.progress);
+                }
+                if (response.redirect) {
+                    window.location.replace(response.redirect);
+                } else {
+                    var text = response.console.replace(/\r\n/g, "\n");
+                    editor.getDoc().setValue(text);
+                    editor.execCommand('goDocEnd');
+                    setTimeout(refresh, 1000);
+                }
+            },
+            error: function () {
+                window.location.replace('/');
             }
         });
     })();

diff --git a/resources/views/default/layouts/antares/partials/_scripts_webpack.twig b/resources/views/default/layouts/antares/partials/_scripts_webpack.twig
@@ -5,6 +5,7 @@
     {{ asset.scripts()|raw }}
 {% endblock %}
 {{  app('antares.asset').container('antares/foundation::scripts').webpack()|raw }}        
+
 <script>
     window.addEventListener("load", function (event) {
         $('.grid-stack,form').css('opacity', '1');