diff --git a/panoramix/assets/javascripts/dashboard.js b/panoramix/assets/javascripts/dashboard.js index 8c5b47a65a8e2..20f3432178f1b 100644 --- a/panoramix/assets/javascripts/dashboard.js +++ b/panoramix/assets/javascripts/dashboard.js @@ -8,7 +8,7 @@ var ace = require('brace'); require('brace/mode/css'); require('brace/theme/crimson_editor'); -require('select2'); +require('./panoramix_select2.js'); require('../node_modules/gridster/dist/jquery.gridster.min.js'); var Dashboard = function (dashboardData) { diff --git a/panoramix/assets/javascripts/explore.js b/panoramix/assets/javascripts/explore.js index 8817f6be92cbb..6cd9847bf4256 100644 --- a/panoramix/assets/javascripts/explore.js +++ b/panoramix/assets/javascripts/explore.js @@ -11,7 +11,9 @@ require('jquery-ui'); $.widget.bridge('uitooltip', $.ui.tooltip); // Shutting down jq-ui tooltips require('bootstrap'); -require('select2'); +require('./panoramix_select2.js'); + + require('../node_modules/bootstrap-toggle/js/bootstrap-toggle.min.js'); require('../vendor/select2.sortable.js'); diff --git a/panoramix/assets/javascripts/panoramix_select2.js b/panoramix/assets/javascripts/panoramix_select2.js new file mode 100644 index 0000000000000..6be060500f022 --- /dev/null +++ b/panoramix/assets/javascripts/panoramix_select2.js @@ -0,0 +1,2 @@ +require('../node_modules/select2-bootstrap-css/select2-bootstrap.min.css'); +require('select2'); diff --git a/panoramix/assets/package.json b/panoramix/assets/package.json index 57595355ba7d0..650140db49cce 100644 --- a/panoramix/assets/package.json +++ b/panoramix/assets/package.json @@ -64,6 +64,7 @@ "react-bootstrap": "^0.28.3", "react-dom": "^0.14.7", "select2": "3.5", + "select2-bootstrap-css": "^1.4.6", "style-loader": "^0.13.0", "topojson": "^1.6.22", "webpack": "^1.12.12" diff --git a/panoramix/assets/visualizations/filter_box.js b/panoramix/assets/visualizations/filter_box.js index 249e8efa57029..a6212ce4dcb0b 100644 --- a/panoramix/assets/visualizations/filter_box.js +++ b/panoramix/assets/visualizations/filter_box.js @@ -5,6 +5,8 @@ var d3 = window.d3 || require('d3'); // CSS require('./filter_box.css'); +require('../javascripts/panoramix_select2.js') + function filterBox(slice) { var filtersObj = {};