From: Benjamin Mako Hill Date: Mon, 7 Nov 2011 23:08:38 +0000 (-0500) Subject: added Thomas Niepraschk's tag autocomplete feature X-Git-Url: https://projects.mako.cc/source/scuttle/commitdiff_plain/04b0f54876eb15dc6b7ccafffc893fcdc3fd379a?ds=inline added Thomas Niepraschk's tag autocomplete feature The work in this patch is taken from the following GH repository: https://github.com/niepi/scuttle-autocomplete The work is Copyright (c) Thomas Niepraschk 2011. Niepraschk's work is not done as a branch to the scuttle git repository, includes a series of unrelated changes, and involves a few mistakes. In this branch, I've provided a clean-up of his work but very little of my own. I have made the following change over what Thomas did in his repository: - Reverted the move of config.inc.php from config.inc.php.example - Changed the script code to not include simple load JQuery from googleapis.com (introducing some privacy issues) but to load it from the copies that Thomas included in the repository instead. - I have also removed from the history several extra files including the full dump of his database (!) which he them removed in a subsequent commit. All credit goes to Thomas Niepraschk for his hard work to build the functionality. I use it and love it! --- diff --git a/jsScuttle.php b/jsScuttle.php index 93fa85b..60e403a 100644 --- a/jsScuttle.php +++ b/jsScuttle.php @@ -3,6 +3,12 @@ header('Content-Type: text/javascript'); require_once 'header.inc.php'; require_once 'functions.inc.php'; $player_root = $root .'includes/player/'; + +$userservice =& ServiceFactory::getServiceInstance('UserService'); +if ($userservice->isLoggedOn()) { + $currentUser = $userservice->getCurrentUser(); + $currentUsername = $currentUser[$userservice->getFieldName('username')]; +} ?> var deleted = false; @@ -49,8 +55,65 @@ function getTitle(input) { } } +function autocomplete() { + $.ajax({ + url: 'alltags/', + success: function(data) { + //console.log($(data)); + var availableTags = new Array(); + $(data).find('a').each(function() { + availableTags.push($(this).html()); + //console.log($(this).html()); + }); + + $( ".autocomplete" ) + // don't navigate away from the field on tab when selecting an item + .bind( "keydown", function( event ) { + if ( event.keyCode === $.ui.keyCode.TAB && + $( this ).data( "autocomplete" ).menu.active ) { + event.preventDefault(); + } + }) + .autocomplete({ + minLength: 0, + source: function( request, response ) { + // delegate back to autocomplete, but extract the last term + response( $.ui.autocomplete.filter( + availableTags, extractLast( request.term ) ) ); + }, + focus: function() { + // prevent value inserted on focus + return false; + }, + select: function( event, ui ) { + var terms = split( this.value ); + // remove the current input + terms.pop(); + // add the selected item + terms.push( ui.item.value ); + // add placeholder to get the comma-and-space at the end + terms.push( "" ); + this.value = terms.join( ", " ); + return false; + } + }); + } + }); + +} + +function split( val ) { + return val.split( /,\s*/ ); + } +function extractLast( term ) { + return split( term ).pop(); +} + /* Page load */ $(function() { + + autocomplete(); + // Insert Flash player for MP3 links if ($("#bookmarks").length > 0) { $("a[href$=.mp3].taggedlink").each(function() { diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php index 16b56c7..e26c412 100644 --- a/templates/editbookmark.tpl.php +++ b/templates/editbookmark.tpl.php @@ -36,7 +36,7 @@ switch ($row['bStatus']) { - + diff --git a/templates/top.inc.php b/templates/top.inc.php index 85c965d..6878622 100644 --- a/templates/top.inc.php +++ b/templates/top.inc.php @@ -5,7 +5,9 @@ <?php echo filter($GLOBALS['sitename'] . (isset($pagetitle) ? ': ' . $pagetitle : '')); ?> + + - - + + + +