Преглед на файлове

AutoComplete usage: code cleanup

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@935 a333f486-631f-4898-b8df-5754b55c2be0
dflaven преди 14 години
родител
ревизия
5e8f2a7458
променени са 2 файла, в които са добавени 1 реда и са изтрити 19 реда
  1. 1 1
      application/cmdbabstract.class.inc.php
  2. 0 18
      application/itopwebpage.class.inc.php

+ 1 - 1
application/cmdbabstract.class.inc.php

@@ -1126,7 +1126,7 @@ EOF
 							$sHTMLValue = "<input count=\"".count($aAllowedValues)."\" type=\"text\" id=\"label_$iId\" size=\"30\" maxlength=\"$iFieldSize\" value=\"$sDisplayValue\"/>&nbsp;{$sValidationField}";
 							$sHTMLValue = "<input count=\"".count($aAllowedValues)."\" type=\"text\" id=\"label_$iId\" size=\"30\" maxlength=\"$iFieldSize\" value=\"$sDisplayValue\"/>&nbsp;{$sValidationField}";
 							// another hidden input to store & pass the object's Id
 							// another hidden input to store & pass the object's Id
 							$sHTMLValue .= "<input type=\"hidden\" id=\"$iId\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"$value\" />\n";
 							$sHTMLValue .= "<input type=\"hidden\" id=\"$iId\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"$value\" />\n";
-							$oPage->add_ready_script("\$('#label_$iId').autocomplete('./ajax.render.php', { scroll:true, minChars:3, onItemSelect:selectItem, onFindValue:findValue, formatItem:formatItem, autoFill:true, keyHolder:'#$iId', extraParams:{operation:'autocomplete', sclass:'$sClass',attCode:'".$sAttCode."'}});");
+							$oPage->add_ready_script("\$('#label_$iId').autocomplete('./ajax.render.php', { scroll:true, minChars:3, formatItem:formatItem, autoFill:true, keyHolder:'#$iId', extraParams:{operation:'autocomplete', sclass:'$sClass',attCode:'".$sAttCode."'}});");
 							$oPage->add_ready_script("\$('#label_$iId').blur(function() { $(this).search(); } );");
 							$oPage->add_ready_script("\$('#label_$iId').blur(function() { $(this).search(); } );");
 							$oPage->add_ready_script("\$('#label_$iId').result( function(event, data, formatted) { OnAutoComplete('$iId', event, data, formatted); } );");
 							$oPage->add_ready_script("\$('#label_$iId').result( function(event, data, formatted) { OnAutoComplete('$iId', event, data, formatted); } );");
 							$aEventsList[] ='change';
 							$aEventsList[] ='change';

+ 0 - 18
application/itopwebpage.class.inc.php

@@ -359,24 +359,6 @@ EOF
 //			}
 //			}
 //		}
 //		}
 
 
-		// For automplete
-		function findValue(li) {
-			if( li == null ) return alert("No match!");
-			
-			// if coming from an AJAX call, let's use the CityId as the value
-			if( !!li.extra ) var sValue = li.extra[0];
-			
-			// otherwise, let's just display the value in the text box
-			else var sValue = li.selectValue;
-			
-			//alert(\"The value you selected was: \" + sValue);
-		}
-		
-		function selectItem(li) {
-			findValue(li);
-		}
-		
-		
 		function formatItem(row) {
 		function formatItem(row) {
 			return row[0];
 			return row[0];
 		}
 		}