Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
using es2015 import syntax instead of require
Browse files Browse the repository at this point in the history
Signed-off-by: Vítor Avelino <[email protected]>
  • Loading branch information
vitoravelino committed Mar 11, 2017
1 parent 1ae534c commit 66a0bbe
Showing 1 changed file with 22 additions and 18 deletions.
40 changes: 22 additions & 18 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
// jQuery
window.jQuery = require('jquery');
require('jquery-ujs');
import jQuery from 'jquery';

window.jQuery = jQuery;
window.$ = jQuery;

import 'jquery-ujs';

// Bootstrap
require('bootstrap/js/transition');
require('bootstrap/js/tab');
require('bootstrap/js/tooltip');
require('bootstrap/js/popover');
import 'bootstrap/js/transition';
import 'bootstrap/js/tab';
import 'bootstrap/js/tooltip';
import 'bootstrap/js/popover';

// Life it up
require('vendor/lifeitup_layout');
import 'vendor/lifeitup_layout';

// NOTE: should be removed in the future
require('vendor/bootstrap-typeahead');
import 'vendor/bootstrap-typeahead';

// Require tree.
// NOTE: This should be moved into proper modules.
require('./alert');
require('./bootstrap');
require('./dashboard');
require('./includes/open_close_icon');
require('./includes/set_typehead');
require('./namespaces');
require('./open_search');
require('./repositories');
require('./teams');
import './alert';
import './bootstrap';
import './dashboard';
import './includes/open_close_icon';
import './includes/set_typehead';
import './namespaces';
import './open_search';
import './repositories';
import './teams';

// new modules structure
require('./modules/users');
import './modules/users';

0 comments on commit 66a0bbe

Please sign in to comment.