From c52d32fbd0b921fc92a38ada6ca93b7d1f41764a Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 19 Jan 2016 18:58:15 +1030
Subject: [PATCH] Remove usage of `finally`

See flarum/core@60d78ce
---
 extensions/flags/js/forum/dist/extension.js               | 4 ++--
 extensions/flags/js/forum/src/components/FlagList.js      | 3 ++-
 extensions/flags/js/forum/src/components/FlagPostModal.js | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extensions/flags/js/forum/dist/extension.js b/extensions/flags/js/forum/dist/extension.js
index caf88d4d1..b79117898 100644
--- a/extensions/flags/js/forum/dist/extension.js
+++ b/extensions/flags/js/forum/dist/extension.js
@@ -322,7 +322,7 @@ System.register('flarum/flags/components/FlagList', ['flarum/Component', 'flarum
               app.cache.flags = flags.sort(function (a, b) {
                 return b.time() - a.time();
               });
-            })['finally'](function () {
+            })['catch'](function () {}).then(function () {
               _this.loading = false;
               m.redraw();
             });
@@ -498,7 +498,7 @@ System.register('flarum/flags/components/FlagPostModal', ['flarum/components/Mod
               }
             }).then(function () {
               return _this.success = true;
-            })['finally'](this.loaded.bind(this));
+            })['catch'](function () {}).then(this.loaded.bind(this));
           }
         }]);
         return FlagPostModal;
diff --git a/extensions/flags/js/forum/src/components/FlagList.js b/extensions/flags/js/forum/src/components/FlagList.js
index e6c6f6ecc..e13878cc1 100644
--- a/extensions/flags/js/forum/src/components/FlagList.js
+++ b/extensions/flags/js/forum/src/components/FlagList.js
@@ -75,7 +75,8 @@ export default class FlagList extends Component {
         app.session.user.pushAttributes({newFlagsCount: 0});
         app.cache.flags = flags.sort((a, b) => b.time() - a.time());
       })
-      .finally(() => {
+      .catch(() => {})
+      .then(() => {
         this.loading = false;
         m.redraw();
       });
diff --git a/extensions/flags/js/forum/src/components/FlagPostModal.js b/extensions/flags/js/forum/src/components/FlagPostModal.js
index 6681532e4..9921a54a2 100644
--- a/extensions/flags/js/forum/src/components/FlagPostModal.js
+++ b/extensions/flags/js/forum/src/components/FlagPostModal.js
@@ -100,6 +100,7 @@ export default class FlagPostModal extends Modal {
       }
     })
       .then(() => this.success = true)
-      .finally(this.loaded.bind(this));
+      .catch(() => {})
+      .then(this.loaded.bind(this));
   }
 }