From d82da543b40051de57ae4244cc0a7f629e1cf60f Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 27 Jul 2015 14:16:39 +0930
Subject: [PATCH] Use System.get instead of System.import

Means we get drop Promise polyfill
---
 framework/core/js/bower.json        |  1 -
 framework/core/js/forum/Gulpfile.js |  1 -
 framework/core/views/app.blade.php  | 33 +++++++++++++----------------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/framework/core/js/bower.json b/framework/core/js/bower.json
index a741d373b..2f18ebadf 100644
--- a/framework/core/js/bower.json
+++ b/framework/core/js/bower.json
@@ -9,7 +9,6 @@
     "color-thief": "v2.0",
     "mithril": "lhorie/mithril.js#next",
     "es6-micro-loader": "caridy/es6-micro-loader#v0.2.1",
-    "es6-promise-polyfill": "~1.0.0",
     "fastclick": "~1.0.6"
   }
 }
diff --git a/framework/core/js/forum/Gulpfile.js b/framework/core/js/forum/Gulpfile.js
index 2eca8d9f6..674c70357 100644
--- a/framework/core/js/forum/Gulpfile.js
+++ b/framework/core/js/forum/Gulpfile.js
@@ -7,7 +7,6 @@ gulp({
   files: [
     nodeDir + '/babel-core/external-helpers.js',
 
-    bowerDir + '/es6-promise-polyfill/promise.js',
     bowerDir + '/es6-micro-loader/dist/system-polyfill.js',
 
     bowerDir + '/mithril/mithril.js',
diff --git a/framework/core/views/app.blade.php b/framework/core/views/app.blade.php
index 5a3627f03..df791391b 100644
--- a/framework/core/views/app.blade.php
+++ b/framework/core/views/app.blade.php
@@ -26,26 +26,23 @@
     @endforeach
 
     <script>
-      var app;
-      System.import('flarum/app').then(function(module) {
-        try {
-          app = module.default;
-          app.preload = {
-            data: {!! json_encode($data) !!},
-            document: {!! json_encode($document) !!},
-            session: {!! json_encode($session) !!}
-          };
+      try {
+        var app = System.get('flarum/app').default;
+        app.preload = {
+          data: {!! json_encode($data) !!},
+          document: {!! json_encode($document) !!},
+          session: {!! json_encode($session) !!}
+        };
 
-          @foreach ($bootstrappers as $bootstrapper)
-            System.import('{{ $bootstrapper }}');
-          @endforeach
+        @foreach ($bootstrappers as $bootstrapper)
+          System.import('{{ $bootstrapper }}');
+        @endforeach
 
-          app.boot();
-        } catch (e) {
-          document.write('<div class="container">Something went wrong.</div>');
-          throw e;
-        }
-      });
+        app.boot();
+      } catch (e) {
+        document.write('<div class="container">Something went wrong.</div>');
+        throw e;
+      }
     </script>
 
     @if ($content)