re-building assets

mbrodala · Mar 25, 2015 · 145c00c · 145c00c
1 parent 2799ad7
commit 145c00c
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 17 deletions.
diff --git a/bootstrap-tagsinput.jquery.json b/bootstrap-tagsinput.jquery.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-tagsinput",
-  "version": "0.5.1",
+  "version": "0.5.0",
   "title": "Bootstrap Tags Input",
   "author": {
     "name": "Tim Schlechter"
@@ -24,4 +24,4 @@
   ],
   "download": "http://timschlechter.github.io/bootstrap-tagsinput/build/bootstrap-tagsinput.zip",
   "homepage": "http://timschlechter.github.io/bootstrap-tagsinput/examples/"
-}
+}
diff --git a/dist/bootstrap-tagsinput.js b/dist/bootstrap-tagsinput.js
@@ -319,11 +319,21 @@
 
       // typeahead.js
       if (self.options.typeaheadjs) {
-          var typeaheadjs = self.options.typeaheadjs || {};
+          var typeaheadConfig = null;
+          var typeaheadDatasets = {};
+
+          // Determine if main configurations were passed or simply a dataset
+          var typeaheadjs = self.options.typeaheadjs;
+          if ($.isArray(typeaheadjs)) {
+            typeaheadConfig = typeaheadjs[0];
+            typeaheadDatasets = typeaheadjs[1];
+          } else {
+            typeaheadDatasets = typeaheadjs;
+          }
 
-          self.$input.typeahead(null, typeaheadjs).on('typeahead:selected', $.proxy(function (obj, datum) {
-            if (typeaheadjs.valueKey)
-              self.add(datum[typeaheadjs.valueKey]);
+          self.$input.typeahead(typeaheadConfig, typeaheadDatasets).on('typeahead:selected', $.proxy(function (obj, datum) {
+            if (typeaheadDatasets.valueKey)
+              self.add(datum[typeaheadDatasets.valueKey]);
             else
               self.add(datum);
             self.$input.typeahead('val', '');

diff --git a/dist/bootstrap-tagsinput.min.js b/dist/bootstrap-tagsinput.min.js
diff --git a/dist/bootstrap-tagsinput.zip b/dist/bootstrap-tagsinput.zip
diff --git a/examples/assets/app_bs3.js b/examples/assets/app_bs3.js
@@ -67,11 +67,23 @@ elt.tagsinput({
   },
   itemValue: 'value',
   itemText: 'text',
-  typeaheadjs: {
-    name: 'cities',
-    displayKey: 'text',
-    source: cities.ttAdapter()
-  }
+  // typeaheadjs: {
+  //   name: 'cities',
+  //   displayKey: 'text',
+  //   source: cities.ttAdapter()
+  // }
+  typeaheadjs: [
+  {
+      hint: true,
+     highlight: true,
+     minLength: 2
+  },
+   {
+      name: 'cities',
+       displayKey: 'text',
+       source: cities.ttAdapter()
+   }
+  ]
 });
 elt.tagsinput('add', { "value": 1 , "text": "Amsterdam"   , "continent": "Europe"    });
 elt.tagsinput('add', { "value": 4 , "text": "Washington"  , "continent": "America"   });
@@ -80,4 +92,4 @@ elt.tagsinput('add', { "value": 10, "text": "Beijing"     , "continent": "Asia"
 elt.tagsinput('add', { "value": 13, "text": "Cairo"       , "continent": "Africa"    });
 
 // HACK: overrule hardcoded display inline-block of typeahead.js
-$(".twitter-typeahead").css('display', 'inline');
+$(".twitter-typeahead").css('display', 'inline');