Merge pull request #2329 from tonydspaniard/1094-modal-generator-autocomplete-fix

extensions/gii/CHANGELOG.md

@@ -5,6 +5,7 @@ Yii Framework 2 gii extension Change Log
 ----------------------------
 
 - Bug #1405: fixed disambiguation of relation names generated by gii (qiangxue)
+- Bug #1904: Fixed autocomplete to work with underscore inputs "_" (tonydspaniard)
 - Bug #2298: Fixed the bug that Gii controller generator did not allow digit in the controller ID (qiangxue)
 - Bug: fixed controller in crud template to avoid returning query in findModel() (cebe)
 - Enh #1624: generate rules for unique indexes (lucianobaraglia)

extensions/gii/assets/gii.js

@@ -71,6 +71,15 @@ yii.gii = (function ($) {
 	};
 
 	return {
+		autocomplete: function (counter, data) {
+			var datum = new Bloodhound({
+				datumTokenizer: function(d){return Bloodhound.tokenizers.whitespace(d.word);},
+				queryTokenizer: Bloodhound.tokenizers.whitespace,
+				local: data
+			});
+			datum.initialize();
+			jQuery('.typeahead-'+counter).typeahead(null,{displayKey: 'word', source: datum.ttAdapter()});
+		},
 		init: function () {
 			initHintBlocks();
 			initStickyInputs();

extensions/gii/components/ActiveField.php

@@ -63,7 +63,10 @@ class ActiveField extends \yii\widgets\ActiveField
 	{
 		static $counter = 0;
 		$this->inputOptions['class'] .= ' typeahead-' . (++$counter);
-		$this->form->getView()->registerJs("jQuery('.typeahead-{$counter}').typeahead({local: " . Json::encode($data) . "});");
+		foreach ($data as &$item) {
+			$item = array('word' => $item);
+		}
+		$this->form->getView()->registerJs("yii.gii.autocomplete($counter, " . Json::encode($data) . ");");
 		return $this;
 	}
 }