create a common.js bundle and include all jQuery plugins

4 files changed, 25 insertions, 17 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4c24d35b5bb..8441a335ac0 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -6,23 +6,8 @@
 /* global AwardsHandler */
 /* global Aside */
 
-window.$ = window.jQuery = require('jquery');
-require('jquery-ujs');
-require('vendor/jquery.endless-scroll');
-require('vendor/jquery.waitforimages');
-require('vendor/jquery.caret');
-require('vendor/jquery.atwho');
-require('vendor/jquery.scrollTo');
+// common libraries
 window.Cookies = require('js-cookie');
-require('./autosave');
-require('bootstrap/js/affix');
-require('bootstrap/js/alert');
-require('bootstrap/js/dropdown');
-require('bootstrap/js/modal');
-require('bootstrap/js/tab');
-require('bootstrap/js/transition');
-require('bootstrap/js/tooltip');
-require('select2/select2.js');
 window.Pikaday = require('pikaday');
 window._ = require('underscore');
 window.Dropzone = require('dropzone');
@@ -34,7 +19,6 @@ require('./shortcuts_navigation');
 require('./shortcuts_dashboard_navigation');
 require('./shortcuts_issuable');
 require('./shortcuts_network');
-require('vendor/jquery.nicescroll');
 
 // behaviors
 require('./behaviors/autosize');
diff --git a/app/assets/javascripts/commons/bootstrap.js b/app/assets/javascripts/commons/bootstrap.js
new file mode 100644
index 00000000000..72e43d34a74
--- /dev/null
+++ b/app/assets/javascripts/commons/bootstrap.js
@@ -0,0 +1,10 @@
+require('./jquery');
+
+// twitter bootstrap plugins
+require('bootstrap-sass/assets/javascripts/bootstrap/affix');
+require('bootstrap-sass/assets/javascripts/bootstrap/alert');
+require('bootstrap-sass/assets/javascripts/bootstrap/dropdown');
+require('bootstrap-sass/assets/javascripts/bootstrap/modal');
+require('bootstrap-sass/assets/javascripts/bootstrap/tab');
+require('bootstrap-sass/assets/javascripts/bootstrap/transition');
+require('bootstrap-sass/assets/javascripts/bootstrap/tooltip');
diff --git a/app/assets/javascripts/commons/index.js b/app/assets/javascripts/commons/index.js
new file mode 100644
index 00000000000..a9226bc1325
--- /dev/null
+++ b/app/assets/javascripts/commons/index.js
@@ -0,0 +1,2 @@
+require('./jquery');
+require('./bootstrap');
diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js
new file mode 100644
index 00000000000..9ef415d6a95
--- /dev/null
+++ b/app/assets/javascripts/commons/jquery.js
@@ -0,0 +1,12 @@
+// jQuery library
+window.$ = window.jQuery = require('jquery');
+
+// jQuery plugins
+require('jquery-ujs');
+require('vendor/jquery.endless-scroll');
+require('vendor/jquery.caret');
+require('vendor/jquery.atwho');
+require('vendor/jquery.scrollTo');
+require('vendor/jquery.nicescroll');
+require('vendor/jquery.waitforimages');
+require('select2/select2.js');