Merge branch 'feature/lite-2' of https://github.com/summernote/summer…

…note into feature/lite-2
robert-j · Aug 29, 2017 · 44b4eef · 44b4eef
2 parents 9d514c9 + 2ce00b2
commit 44b4eef
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/js/app.js b/src/js/app.js
@@ -47,21 +47,19 @@ require(['jquery', 'summernote'], function ($) {
       promise = requireByPromise(['summernote/lite/settings']);
       break;
     case 'bs3':
-      promise = requireByPromise(['bs3', 'summernote/bs3/settings']).then(function () {
-        return requireByPromise(['lang']);
-      });
+      promise = requireByPromise(['bs3', 'summernote/bs3/settings']);
       break;
     case 'bs4':
       promise = requireByPromise(['popper']).then(function (popper) {
         window.Popper = popper;
-        return requireByPromise(['bs4', 'summernote/bs4/settings']).then(function () {
-          return requireByPromise(['lang']);
-        });
+        return requireByPromise(['bs4', 'summernote/bs4/settings']);
       });
       break;
   }
 
   promise.then(function () {
+    return requireByPromise(['lang']);
+  }).then(function () {
     // initialize summernote
     $('.summernote').summernote({
       height: 300,