aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2016-11-10 10:59:41 +0100
committerjpl2016-11-10 10:59:41 +0100
commit45a9720b2cf8cc4eb6166ad1dd545b373ba7160e (patch)
tree483f75c4858a574f132e49b33ab67691500d4c65
parent85bc4f3d19759067e6b028a92522238796f02b75 (diff)
downloadchouette-core-45a9720b2cf8cc4eb6166ad1dd545b373ba7160e.tar.bz2
merge issues
-rw-r--r--app/assets/javascripts/es6_browserified/components/BSelect2.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/components/BSelect2.js
index fc3112f8e..255d5d41c 100644
--- a/app/assets/javascripts/es6_browserified/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/components/BSelect2.js
@@ -6,6 +6,7 @@ var Select2 = require('react-select2')
var origin = window.location.origin
var path = window.location.pathname.split('/', 3).join('/')
+
class BSelect3 extends React.Component{
constructor(props) {
super(props)
@@ -104,7 +105,6 @@ const BSelect2 = (props) => {
)
}
-// to fix: this is for custom results return
const formatRepo = (props) => {
if(props.text) return props.text
// console.log(props)