Add angular-ui-selec2 to configuration

Trustroots · Oct 7, 2014 · 3469c55 · 3469c55
1 parent 211a7d4
commit 3469c55
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js
@@ -92,6 +92,12 @@ var UserSchema = new Schema({
 		}],
 		default: ['']
 	},
+	languages: {
+		type: [{
+			type: String,
+		}],
+		default: ['']
+	},
 	locationLiving: {
 		type: Schema.ObjectId,
 		ref: 'Geo'

diff --git a/bower.json b/bower.json
@@ -18,6 +18,9 @@
     "angular-moment": "~0.8.2",
     "angular-medium-editor": "*",
     "angular-socket-io": "~0.6.0",
-    "angular-perfect-scrollbar": "*"
+    "angular-perfect-scrollbar": "*",
+    "angular-ui-select": "~0.8.0",
+    "select2": "~3.4.5",
+    "selectize": "~0.8.5"
   }
 }
diff --git a/config/env/all.js b/config/env/all.js
@@ -21,6 +21,7 @@ module.exports = {
 			css: [
 			    'public/lib/medium-editor/dist/css/medium-editor.css',
 			    'public/lib/perfect-scrollbar/src/perfect-scrollbar.css',
+					'public/lib/angular-ui-select/dist/select.css'
 			],
 			js: [
 				'public/lib/jquery/dist/jquery.js',
@@ -32,6 +33,8 @@ module.exports = {
 				'public/lib/angular-sanitize/angular-sanitize.js',
 				'public/lib/angular-ui-router/release/angular-ui-router.js',
 				'public/lib/angular-ui-utils/ui-utils.js',
+				'public/lib/angular-ui-select/dist/select.js',
+				'public/lib/select2/select2.js',
 				'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
 				'public/lib/moment/moment.js',
 				'public/lib/angular-moment/angular-moment.js',

diff --git a/gruntfile.js b/gruntfile.js
@@ -91,8 +91,10 @@ module.exports = function(grunt) {
         	css: {
         		src: watchFiles.clientCSS.concat([
         		    // @todo: should be '<%= applicationCSSFiles %>' instead!
-			        'public/lib/medium-editor/dist/css/medium-editor.css',
-                    'public/lib/perfect-scrollbar/src/perfect-scrollbar.css',
+			        		'public/lib/medium-editor/dist/css/medium-editor.css',
+                  'public/lib/perfect-scrollbar/src/perfect-scrollbar.css',
+                  'public/lib/angular-ui-select/dist/select.css',
+                  'public/lib/select2/select2.css'
                 ]),
         		dest: 'public/dist/application.min.css',
         	}

diff --git a/public/config.js b/public/config.js
@@ -14,6 +14,7 @@ var ApplicationConfiguration = (function() {
 	                                            'ui.router',
 	                                            'ui.bootstrap',
 	                                            'ui.utils',
+	                                            'ui.select',
 	                                            'angularMoment',
 	                                            'angular-medium-editor',
 	                                            'perfect_scrollbar'

diff --git a/public/modules/users/views/profile/edit-profile.client.view.html b/public/modules/users/views/profile/edit-profile.client.view.html
@@ -73,9 +73,14 @@ <h4>Last seen</h4>
 
                 <div class="form-group">
                   <label for="languages"><h4>Languages</h4></label>
-                  <select id="languages" class="form-control">
-                    <option value=""></option>
-                  </select>
+                  <div>
+                    <ui-select multiple ng-model="user.languages" theme="select2" ng-disabled="disabled">
+                      <ui-select-match placeholder="Type in languages...">{{$item}}</ui-select-match>
+                      <ui-select-choices repeat="language in languages | filter:$select.search">
+                        {{language}}
+                      </ui-select-choices>
+                    </ui-select>
+                  </div>
                 </div>
 
                 <div class="form-group">