From 046fea2dbb2ad127089bf39cc13f07f32caf4b35 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Fri, 12 Jun 2015 14:46:38 -0800
Subject: [PATCH] select2

---
 app/pods/measurements/route.js     | 16 ++++++++--------
 app/pods/measurements/template.hbs | 16 +++++++++-------
 bower.json                         |  3 ++-
 config/environment.js              |  2 +-
 package.json                       |  1 +
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/pods/measurements/route.js b/app/pods/measurements/route.js
index 1b8e793..9c45e22 100644
--- a/app/pods/measurements/route.js
+++ b/app/pods/measurements/route.js
@@ -16,26 +16,26 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
     models.strains = models.strains.sortBy('fullName');
     let strains = models.strains.map((strain)=>{
       return Ember.Object.create({
-        val: strain.get('id'),
-        lab: strain.get('fullName'),
+        id: strain.get('id'),
+        text: strain.get('fullName'),
       });
     });
     strains.unshiftObjects(Ember.Object.create({
-      val: 'all',
-      lab: 'All Strains',
+      id: 'all',
+      text: 'All Strains',
     }));
     controller.set('strains', strains);
 
     models.characteristics = models.characteristics.sortBy('characteristicName');
     let characteristics = models.characteristics.map((characteristic)=>{
       return Ember.Object.create({
-        val: characteristic.get('id'),
-        lab: characteristic.get('characteristicName'),
+        id: characteristic.get('id'),
+        text: characteristic.get('characteristicName'),
       });
     });
     characteristics.unshiftObjects(Ember.Object.create({
-      val: 'all',
-      lab: 'All Characteristics',
+      id: 'all',
+      text: 'All Characteristics',
     }));
     controller.set('characteristics', characteristics);
   },
diff --git a/app/pods/measurements/template.hbs b/app/pods/measurements/template.hbs
index e99f3e2..882fce6 100644
--- a/app/pods/measurements/template.hbs
+++ b/app/pods/measurements/template.hbs
@@ -5,11 +5,12 @@
   </div>
   <div class="span-8">
     {{
-      view "select"
+      select-2
+      multiple=true
       content=strains
-      optionValuePath="content.val"
-      optionLabelPath="content.lab"
-      value=selectedStrain
+      value=selectedStrains
+      optionValuePath="id"
+      placeholder="Choose a strain"
     }}
   </div>
 </div>
@@ -19,11 +20,12 @@
   </div>
   <div class="span-8">
     {{
-      view "select"
+      select-2
+      multiple=true
       content=characteristics
-      optionValuePath="content.val"
-      optionLabelPath="content.lab"
       value=selectedCharacteristic
+      optionValuePath="id"
+      placeholder="Choose a characteristic"
     }}
   </div>
 </div>
diff --git a/bower.json b/bower.json
index bb963a8..6b573d8 100644
--- a/bower.json
+++ b/bower.json
@@ -14,6 +14,7 @@
     "qunit": "~1.17.1",
     "flakes": "~1.0.0",
     "ember-simple-auth": "~0.8.0-beta.3",
-    "moment": "~2.9.0"
+    "moment": "~2.9.0",
+    "select2": "3.5.2"
   }
 }
diff --git a/config/environment.js b/config/environment.js
index c1ece05..3ce0d37 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -41,7 +41,7 @@ module.exports = function(environment) {
       'font-src': "'self'",
       'connect-src': "'self' http://127.0.0.1:4200",
       'img-src': "'self'",
-      'style-src': "'self'",
+      'style-src': "'self' 'unsafe-inline'",
       'media-src': "'self'"
     }
   }
diff --git a/package.json b/package.json
index 1dcc597..d2dc24b 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "ember-data": "1.0.0-beta.18",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
+    "ember-select-2": "1.3.0",
     "express": "^4.12.4",
     "glob": "^4.5.3",
     "jsonwebtoken": "^5.0.0",