compass-jquery-plugin 0.3.3.0 → 0.3.3.1

data/templates/jquery/jquery.themeswitchertool.js

@@ -32,7 +32,7 @@ $.fn.themeswitcher = function(settings) {
             }
             return false;
           }
-          );
+  );
 
   //menu events (mouseout didn't work...)
   switcherpane.hover(
@@ -43,7 +43,7 @@ $.fn.themeswitcher = function(settings) {
               $(this).spHide();
             }
           }
-          );
+  );
 
   //show/hide panel functions
   $.fn.spShow = function() {
@@ -130,13 +130,13 @@ $.fn.themeswitcher = function(settings) {
               $(this).css(button_default);
             }
           }
-          )
+  )
           .find('.jquery-ui-themeswitcher-icon').css({
-                                                       'float': 'right',
-                                                       width: '16px',
-                                                       height: '16px',
-                                                       background: 'image_url("jquery/ui/themeSwitcher/icon_color_arrow.gif") 50% 50% no-repeat'
-                                                     });
+            'float': 'right',
+            width: '16px',
+            height: '16px',
+            background: 'image_url("jquery/ui/themeSwitcher/icon_color_arrow.gif") 50% 50% no-repeat'
+          });
   //pane css
   switcherpane.css({
     position: 'absolute',
@@ -156,12 +156,12 @@ $.fn.themeswitcher = function(settings) {
     width: options.width - 6//minus must match left and right padding
   })
           .find('ul').css({
-                            listStyle: 'none',
-                            margin: '0',
-                            padding: '0',
-                            overflow: 'auto',
-                            height: options.height
-                          }).end()
+            listStyle: 'none',
+            margin: '0',
+            padding: '0',
+            overflow: 'auto',
+            height: options.height
+          }).end()
           .find('li').hover(
           function() {
             $(this).css({
@@ -177,32 +177,32 @@ $.fn.themeswitcher = function(settings) {
               cursor: 'auto'
             });
           }
-          ).css({
-                  width: options.width - 30,
-                  height: '',
-                  padding: '2px',
-                  margin: '1px',
-                  border: '1px solid #111',
-                  '-moz-border-radius': '4px',
-                  clear: 'left',
-                  'float': 'left'
-                }).end()
+  ).css({
+            width: options.width - 30,
+            height: '',
+            padding: '2px',
+            margin: '1px',
+            border: '1px solid #111',
+            '-moz-border-radius': '4px',
+            clear: 'left',
+            'float': 'left'
+          }).end()
           .find('a').css({
-                           color: '#aaa',
-                           textDecoration: 'none',
-                           'float': 'left',
-                           width: '100%',
-                           outline: '0'
-                         }).end()
+            color: '#aaa',
+            textDecoration: 'none',
+            'float': 'left',
+            width: '100%',
+            outline: '0'
+          }).end()
           .find('img').css({
-                             'float': 'left',
-                             border: '1px solid #333',
-                             margin: '0 2px'
-                           }).end()
+            'float': 'left',
+            border: '1px solid #333',
+            margin: '0 2px'
+          }).end()
           .find('.themeName').css({
-                                    'float': 'left',
-                                    margin: '3px 0'
-                                  }).end();
+            'float': 'left',
+            margin: '3px 0'
+          }).end();
 
   $(this).append(button);
   $('body').append(switcherpane);

data/templates/jquery/jquery.tmpl.js

@@ -317,7 +317,7 @@
   // Generate a reusable function that will serve to render a template against data
   function buildTmplFn(markup) {
     return new Function("jQuery", "$item",
-      // Use the variable __ to hold a string array while building the compiled template. (See https://github.com/jquery/jquery-tmpl/issues#issue/10).
+            // Use the variable __ to hold a string array while building the compiled template. (See https://github.com/jquery/jquery-tmpl/issues#issue/10).
             "var $=jQuery,call,__=[],$data=$item.data;" +
 
               // Introduce the data as local variables using with(){}
@@ -359,15 +359,15 @@
                                       "__.push('";
                             }) +
                     "');}return __;"
-            );
+    );
   }
 
   function updateWrapped(options, wrapped) {
     // Build the wrapped content.
     options._wrap = build(options, true,
-      // Suport imperative scenario in which options.wrapped can be set to a selector or an HTML string.
+            // Suport imperative scenario in which options.wrapped can be set to a selector or an HTML string.
             jQuery.isArray(wrapped) ? wrapped : [htmlExpr.test(wrapped) ? wrapped : jQuery(wrapped).html()]
-            ).join("");
+    ).join("");
   }
 
   function unescape(args) {

data/templates/jquery/jquery.tmpl.min.js

@@ -1,12 +1,12 @@
-(function(d){function m(a,b,e,c){c={data:c||c===0||c===!1?c:b?b.data:{},_wrap:b?b._wrap:null,tmpl:null,parent:b||null,nodes:[],calls:B,nest:C,wrap:D,html:E,update:F};a&&d.extend(c,a,{nodes:[],parent:b});if(e)c.tmpl=e,c._ctnt=c._ctnt||c.tmpl(d,c),c.key=++n,(t.length?o:j)[n]=c;return c}function p(a,b,e){var c,e=e?d.map(e,function(b){return typeof b==="string"?a.key?b.replace(/(<\w+)(?=[\s>])(?![^>]*_tmplitem)([^>]*)/g,"$1 "+l+'="'+a.key+'" $2'):b:p(b,a,b._ctnt)}):a;if(b)return e;e=e.join("");e.replace(/^\s*([^<\s][^<]*)?(<[\w\W]+>)([^>]*[^>\s])?\s*$/,
+(function(d){function n(a,b,e,c){c={data:c||c===0||c===!1?c:b?b.data:{},_wrap:b?b._wrap:null,tmpl:null,parent:b||null,nodes:[],calls:B,nest:C,wrap:D,html:E,update:F};a&&d.extend(c,a,{nodes:[],parent:b});if(e)c.tmpl=e,c._ctnt=c._ctnt||c.tmpl(d,c),c.key=++o,(t.length?p:j)[o]=c;return c}function q(a,b,e){var c,e=e?d.map(e,function(b){return typeof b==="string"?a.key?b.replace(/(<\w+)(?=[\s>])(?![^>]*_tmplitem)([^>]*)/g,"$1 "+m+'="'+a.key+'" $2'):b:q(b,a,b._ctnt)}):a;if(b)return e;e=e.join("");e.replace(/^\s*([^<\s][^<]*)?(<[\w\W]+>)([^>]*[^>\s])?\s*$/,
 function(b,a,e,i){c=d(e).get();v(c);a&&(c=u(a).concat(c));i&&(c=c.concat(u(i)))});return c?c:u(e)}function u(a){var b=document.createElement("div");b.innerHTML=a;return d.makeArray(b.childNodes)}function w(a){return new Function("jQuery","$item","var $=jQuery,call,__=[],$data=$item.data;with($data){__.push('"+d.trim(a).replace(/([\\'])/g,"\\$1").replace(/[\r\t\n]/g," ").replace(/\$\{([^\}]*)\}/g,"{{= $1}}").replace(/\{\{(\/?)(\w+|.)(?:\(((?:[^\}]|\}(?!\}))*?)?\))?(?:\s+(.*?)?)?(\(((?:[^\}]|\}(?!\}))*?)\))?\s*\}\}/g,
-function(a,e,c,g,h,f,i){a=d.tmpl.tag[c];if(!a)throw"Unknown template tag: "+c;c=a._default||[];f&&!/\w$/.test(h)&&(h+=f,f="");h?(h=q(h),i=i?","+q(i)+")":f?")":"",i=f?h.indexOf(".")>-1?h+q(f):"("+h+").call($item"+i:h,f=f?i:"(typeof("+h+")==='function'?("+h+").call($item):("+h+"))"):f=i=c.$1||"null";g=q(g);return"');"+a[e?"close":"open"].split("$notnull_1").join(h?"typeof("+h+")!=='undefined' && ("+h+")!=null":"true").split("$1a").join(f).split("$1").join(i).split("$2").join(g||c.$2||"")+"__.push('"})+
-"');}return __;")}function x(a,b){a._wrap=p(a,!0,d.isArray(b)?b:[y.test(b)?b:d(b).html()]).join("")}function q(a){return a?a.replace(/\\'/g,"'").replace(/\\\\/g,"\\"):null}function v(a){function b(a){function b(a){var G;a+=e;G=h[a]=h[a]||m(f,j[f.parent.key+e]||f.parent),f=G}var c,g=a,f,i;if(i=a.getAttribute(l)){for(;g.parentNode&&(g=g.parentNode).nodeType===1&&!(c=g.getAttribute(l)););if(c!==i){g=g.parentNode?g.nodeType===11?0:g.getAttribute(l)||0:0;if(!(f=j[i]))f=o[i],f=m(f,j[g]||o[g]),f.key=++n,
-j[n]=f;k&&b(i)}a.removeAttribute(l)}else if(k&&(f=d.data(a,"tmplItem")))b(f.key),j[f.key]=f,g=(g=d.data(a.parentNode,"tmplItem"))?g.key:0;if(f){for(c=f;c&&c.key!=g;)c.nodes.push(a),c=c.parent;delete f._ctnt;delete f._wrap;d.data(a,"tmplItem",f)}}var e="_"+k,c,g,h={},f,i,r;f=0;for(i=a.length;f<i;f++)if((c=a[f]).nodeType===1){g=c.getElementsByTagName("*");for(r=g.length-1;r>=0;r--)b(g[r]);b(c)}}function B(a,b,d,c){if(!a)return t.pop();t.push({_:a,tmpl:b,item:this,data:d,options:c})}function C(a,b,e){return d.tmpl(d.template(a),
-b,e,this)}function D(a,b){var e=a.options||{};e.wrapped=b;return d.tmpl(d.template(a.tmpl),a.data,e,a.item)}function E(a,b){var e=this._wrap;return d.map(d(d.isArray(e)?e.join(""):e).filter(a||"*"),function(a){if(b)a=a.innerText||a.textContent;else{var d;if(!(d=a.outerHTML))d=document.createElement("div"),d.appendChild(a.cloneNode(!0)),d=d.innerHTML;a=d}return a})}function F(){var a=this.nodes;d.tmpl(null,null,null,this).insertBefore(a[0]);d(a).remove()}var z=d.fn.domManip,l="_tmplitem",y=/^[^<]*(<[\w\W]+>)[^>]*$|\{\{\! /,
-j={},o={},s,A={key:0,data:{}},n=0,k=0,t=[];d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(e){var c=[],e=d(e),g,h,f;g=this.length===1&&this[0].parentNode;s=j||{};if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1)e[b](this[0]),c=this;else{h=0;for(f=e.length;h<f;h++)k=h,g=(h>0?this.clone(!0):this).get(),d(e[h])[b](g),c=c.concat(g);k=0;c=this.pushStack(c,a,e.selector)}e=s;s=null;d.tmpl.complete(e);
-return c}});d.fn.extend({tmpl:function(a,b,e){return d.tmpl(this[0],a,b,e)},tmplItem:function(){return d.tmplItem(this[0])},template:function(a){return d.template(a,this[0])},domManip:function(a,b,e){if(a[0]&&d.isArray(a[0])){for(var c=d.makeArray(arguments),g=a[0],h=g.length,f=0,i;f<h&&!(i=d.data(g[f++],"tmplItem")););i&&k&&(c[2]=function(a){d.tmpl.afterManip(this,a,e)});z.apply(this,c)}else z.apply(this,arguments);k=0;s||d.tmpl.complete(j);return this}});d.extend({tmpl:function(a,b,e,c){var g=!c;
-if(g)c=A,a=d.template[a]||d.template(null,a),o={};else if(!a)return a=c.tmpl,j[c.key]=c,c.nodes=[],c.wrapped&&x(c,c.wrapped),d(p(c,null,c.tmpl(d,c)));if(!a)return[];typeof b==="function"&&(b=b.call(c||{}));e&&e.wrapped&&x(e,e.wrapped);b=d.isArray(b)?d.map(b,function(b){return b?m(e,c,a,b):null}):[m(e,c,a,b)];return g?d(p(c,null,b)):b},tmplItem:function(a){var b;for(a instanceof d&&(a=a[0]);a&&a.nodeType===1&&!(b=d.data(a,"tmplItem"))&&(a=a.parentNode););return b||A},template:function(a,b){if(b)return typeof b===
-"string"?b=w(b):b instanceof d&&(b=b[0]||{}),b.nodeType&&(b=d.data(b,"tmpl")||d.data(b,"tmpl",w(b.innerHTML))),typeof a==="string"?d.template[a]=b:b;return a?typeof a!=="string"?d.template(null,a):d.template[a]||d.template(null,y.test(a)?a:d(a)):null},encode:function(a){return(""+a).split("<").join("&lt;").split(">").join("&gt;").split('"').join("&#34;").split("'").join("&#39;")}});d.extend(d.tmpl,{tag:{tmpl:{_default:{$2:"null"},open:"if($notnull_1){__=__.concat($item.nest($1,$2));}"},wrap:{_default:{$2:"null"},
+function(a,e,c,g,h,f,i){a=d.tmpl.tag[c];if(!a)throw"Unknown template tag: "+c;c=a._default||[];f&&!/\w$/.test(h)&&(h+=f,f="");h?(h=r(h),i=i?","+r(i)+")":f?")":"",i=f?h.indexOf(".")>-1?h+r(f):"("+h+").call($item"+i:h,f=f?i:"(typeof("+h+")==='function'?("+h+").call($item):("+h+"))"):f=i=c.$1||"null";g=r(g);return"');"+a[e?"close":"open"].split("$notnull_1").join(h?"typeof("+h+")!=='undefined' && ("+h+")!=null":"true").split("$1a").join(f).split("$1").join(i).split("$2").join(g||c.$2||"")+"__.push('"})+
+"');}return __;")}function x(a,b){a._wrap=q(a,!0,d.isArray(b)?b:[y.test(b)?b:d(b).html()]).join("")}function r(a){return a?a.replace(/\\'/g,"'").replace(/\\\\/g,"\\"):null}function v(a){function b(a){function b(a){var G;a+=e;G=h[a]=h[a]||n(f,j[f.parent.key+e]||f.parent),f=G}var c,g=a,f,i;if(i=a.getAttribute(m)){for(;g.parentNode&&(g=g.parentNode).nodeType===1&&!(c=g.getAttribute(m)););if(c!==i){g=g.parentNode?g.nodeType===11?0:g.getAttribute(m)||0:0;if(!(f=j[i]))f=p[i],f=n(f,j[g]||p[g]),f.key=++o,
+j[o]=f;k&&b(i)}a.removeAttribute(m)}else if(k&&(f=d.data(a,"tmplItem")))b(f.key),j[f.key]=f,g=(g=d.data(a.parentNode,"tmplItem"))?g.key:0;if(f){for(c=f;c&&c.key!=g;)c.nodes.push(a),c=c.parent;delete f._ctnt;delete f._wrap;d.data(a,"tmplItem",f)}}var e="_"+k,c,g,h={},f,i,l;f=0;for(i=a.length;f<i;f++)if((c=a[f]).nodeType===1){g=c.getElementsByTagName("*");for(l=g.length-1;l>=0;l--)b(g[l]);b(c)}}function B(a,b,d,c){if(!a)return t.pop();t.push({_:a,tmpl:b,item:this,data:d,options:c})}function C(a,b,e){return d.tmpl(d.template(a),
+b,e,this)}function D(a,b){var e=a.options||{};e.wrapped=b;return d.tmpl(d.template(a.tmpl),a.data,e,a.item)}function E(a,b){var e=this._wrap;return d.map(d(d.isArray(e)?e.join(""):e).filter(a||"*"),function(a){if(b)a=a.innerText||a.textContent;else{var d;if(!(d=a.outerHTML))d=document.createElement("div"),d.appendChild(a.cloneNode(!0)),d=d.innerHTML;a=d}return a})}function F(){var a=this.nodes;d.tmpl(null,null,null,this).insertBefore(a[0]);d(a).remove()}var z=d.fn.domManip,m="_tmplitem",y=/^[^<]*(<[\w\W]+>)[^>]*$|\{\{\! /,
+j={},p={},s,A={key:0,data:{}},o=0,k=0,t=[];d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(e){var c=[],e=d(e),g,h,f;g=this.length===1&&this[0].parentNode;s=j||{};if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1)e[b](this[0]),c=this;else{h=0;for(f=e.length;h<f;h++)k=h,g=(h>0?this.clone(!0):this).get(),d(e[h])[b](g),c=c.concat(g);k=0;c=this.pushStack(c,a,e.selector)}e=s;s=null;d.tmpl.complete(e);
+return c}});d.fn.extend({tmpl:function(a,b,e){return d.tmpl(this[0],a,b,e)},tmplItem:function(){return d.tmplItem(this[0])},template:function(a){return d.template(a,this[0])},domManip:function(a,b,e,c){if(a[0]&&d.isArray(a[0])){for(var g=d.makeArray(arguments),h=a[0],f=h.length,i=0,l;i<f&&!(l=d.data(h[i++],"tmplItem")););l&&k&&(g[2]=function(a){d.tmpl.afterManip(this,a,e)});z.apply(this,g)}else z.apply(this,arguments);k=0;s||d.tmpl.complete(j);return this}});d.extend({tmpl:function(a,b,e,c){var g=
+!c;if(g)c=A,a=d.template[a]||d.template(null,a),p={};else if(!a)return a=c.tmpl,j[c.key]=c,c.nodes=[],c.wrapped&&x(c,c.wrapped),d(q(c,null,c.tmpl(d,c)));if(!a)return[];typeof b==="function"&&(b=b.call(c||{}));e&&e.wrapped&&x(e,e.wrapped);b=d.isArray(b)?d.map(b,function(b){return b?n(e,c,a,b):null}):[n(e,c,a,b)];return g?d(q(c,null,b)):b},tmplItem:function(a){var b;for(a instanceof d&&(a=a[0]);a&&a.nodeType===1&&!(b=d.data(a,"tmplItem"))&&(a=a.parentNode););return b||A},template:function(a,b){return b?
+(typeof b==="string"?b=w(b):b instanceof d&&(b=b[0]||{}),b.nodeType&&(b=d.data(b,"tmpl")||d.data(b,"tmpl",w(b.innerHTML))),typeof a==="string"?d.template[a]=b:b):a?typeof a!=="string"?d.template(null,a):d.template[a]||d.template(null,y.test(a)?a:d(a)):null},encode:function(a){return(""+a).split("<").join("&lt;").split(">").join("&gt;").split('"').join("&#34;").split("'").join("&#39;")}});d.extend(d.tmpl,{tag:{tmpl:{_default:{$2:"null"},open:"if($notnull_1){__=__.concat($item.nest($1,$2));}"},wrap:{_default:{$2:"null"},
 open:"$item.calls(__,$1,$2);__=[];",close:"call=$item.calls();__=call._.concat($item.wrap(call,__));"},each:{_default:{$2:"$index, $value"},open:"if($notnull_1){$.each($1a,function($2){with(this){",close:"}});}"},"if":{open:"if(($notnull_1) && $1a){",close:"}"},"else":{_default:{$1:"true"},open:"}else if(($notnull_1) && $1a){"},html:{open:"if($notnull_1){__.push($1a);}"},"=":{_default:{$1:"$data"},open:"if($notnull_1){__.push($.encode($1a));}"},"!":{open:""}},complete:function(){j={}},afterManip:function(a,
 b,e){var c=b.nodeType===11?d.makeArray(b.childNodes):b.nodeType===1?[b]:[];e.call(a,b);v(c);k++}})})(jQuery);

data/templates/jquery/jquery.tmplPlus.min.js

@@ -1,3 +1,3 @@
-(function(b){var i=b.tmpl.complete,h=b.fn.domManip;b.tmpl.complete=function(c){var a;i(c);for(a in c)a=c[a],a.addedTmplItems&&b.inArray(a,a.addedTmplItems)===-1&&a.addedTmplItems.push(a);for(a in c)a=c[a],a.rendered&&a.rendered(a)};b.extend({tmplCmd:function(c,a,e){function d(a,b){for(var c=[],e,f,d=b.length,g,h=0,i=a.length;h<i;){g=a[h++];for(f=0;f<d;)e=b[f++],e.data===g&&c.push(e)}return c}var g=[],f,a=b.isArray(a)?a:[a];switch(c){case "find":return d(a,e);case "replace":a.reverse()}b.each(e?d(a,
-e):a,function(a,d){coll=d.nodes;switch(c){case "update":d.update();break;case "remove":b(coll).remove();e&&e.splice(b.inArray(d,e),1);break;case "replace":f=f?b(coll).insertBefore(f)[0]:b(coll).appendTo(coll[0].parentNode)[0],g.unshift(d)}});return g}});b.fn.extend({domManip:function(c,a,e){var d=c[1],g=c[0],f;if(c.length>=2&&typeof d==="object"&&!d.nodeType&&!(d instanceof b))return f=b.makeArray(arguments),f[0]=[b.tmpl(b.template(g),d,c[2],c[3])],f[2]=function(a){b.tmpl.afterManip(this,a,e)},h.apply(this,
-f);return h.apply(this,arguments)}})})(jQuery);
+(function(b){var j=b.tmpl.complete,h=b.fn.domManip;b.tmpl.complete=function(c){var a;j(c);for(a in c)a=c[a],a.addedTmplItems&&b.inArray(a,a.addedTmplItems)===-1&&a.addedTmplItems.push(a);for(a in c)a=c[a],a.rendered&&a.rendered(a)};b.extend({tmplCmd:function(c,a,d){function e(a,b){for(var c=[],d,f,g=b.length,e,h=0,j=a.length;h<j;){e=a[h++];for(f=0;f<g;)d=b[f++],d.data===e&&c.push(d)}return c}var f=[],g,a=b.isArray(a)?a:[a];switch(c){case "find":return e(a,d);case "replace":a.reverse()}b.each(d?e(a,
+d):a,function(a,e){coll=e.nodes;switch(c){case "update":e.update();break;case "remove":b(coll).remove();d&&d.splice(b.inArray(e,d),1);break;case "replace":g=g?b(coll).insertBefore(g)[0]:b(coll).appendTo(coll[0].parentNode)[0],f.unshift(e)}});return f}});b.fn.extend({domManip:function(c,a,d,e){var f=c[1],g=c[0],i;return c.length>=2&&typeof f==="object"&&!f.nodeType&&!(f instanceof b)?(i=b.makeArray(arguments),i[0]=[b.tmpl(b.template(g),f,c[2],c[3])],i[2]=function(a){b.tmpl.afterManip(this,a,d)},h.apply(this,
+i)):h.apply(this,arguments)}})})(jQuery);

data/templates/jquery/jquery.tokeninput.js

@@ -1,6 +1,6 @@
 /*
  * jQuery Plugin: Tokenizing Autocomplete Text Entry
- * Version 1.4.2
+ * Version 1.6.0
  *
  * Copyright (c) 2009 James Smith (http://loopj.com)
  * Licensed jointly under the GPL and MIT licenses,
@@ -10,29 +10,48 @@
 
 (function ($) {
 // Default settings
-  var DEFAULT_SETTINGS = {
+var DEFAULT_SETTINGS = {
+    // Search settings
+    method: "GET",
+    queryParam: "q",
+    searchDelay: 300,
+    minChars: 1,
+    propertyToSearch: "name",
+    jsonContainer: null,
+    contentType: "json",
+
+	// Prepopulation settings
+    prePopulate: null,
+    processPrePopulate: false,
+
+    // Display settings
     hintText: "Type in a search term",
     noResultsText: "No results",
     searchingText: "Searching...",
     deleteText: "×",
-    searchDelay: 300,
-    minChars: 1,
+    animateDropdown: true,
+    theme: null,
+    resultsFormatter: function(item){ return "<li>" + item[this.propertyToSearch]+ "</li>" },
+    tokenFormatter: function(item) { return "<li><p>" + item[this.propertyToSearch] + "</p></li>" },
+
+    // Tokenization settings
     tokenLimit: null,
-    jsonContainer: null,
-    method: "GET",
-    contentType: "json",
-    queryParam: "q",
     tokenDelimiter: ",",
     preventDuplicates: false,
-    prePopulate: null,
-    animateDropdown: true,
+    tokenValue: "id",
+
+    // Callbacks
     onResult: null,
     onAdd: null,
-    onDelete: null
-  };
+    onDelete: null,
+    onReady: null,
+
+    // Other settings
+    idPrefix: "token-input-"
+};
 
 // Default classes to use when theming
-  var DEFAULT_CLASSES = {
+var DEFAULT_CLASSES = {
     tokenList: "token-input-list",
     token: "token-input-token",
     tokenDelete: "token-input-delete-token",
@@ -43,17 +62,17 @@
     dropdownItem2: "token-input-dropdown-item2",
     selectedDropdownItem: "token-input-selected-dropdown-item",
     inputToken: "token-input-input-token"
-  };
+};
 
 // Input box position "enum"
-  var POSITION = {
+var POSITION = {
     BEFORE: 0,
     AFTER: 1,
     END: 2
-  };
+};
 
 // Keys "enum"
-  var KEY = {
+var KEY = {
     BACKSPACE: 8,
     TAB: 9,
     ENTER: 13,
@@ -69,55 +88,83 @@
     DOWN: 40,
     NUMPAD_ENTER: 108,
     COMMA: 188
-  };
+};
 
+// Additional public (exposed) methods
+var methods = {
+    init: function(url_or_data_or_function, options) {
+        var settings = $.extend({}, DEFAULT_SETTINGS, options || {});
 
-// Expose the .tokenInput function to jQuery as a plugin
-  $.fn.tokenInput = function (url_or_data, options) {
-    var settings = $.extend({}, DEFAULT_SETTINGS, options || {});
-
-    return this.each(function () {
-      new $.TokenList(this, url_or_data, settings);
-    });
-  };
+        return this.each(function () {
+            $(this).data("tokenInputObject", new $.TokenList(this, url_or_data_or_function, settings));
+        });
+    },
+    clear: function() {
+        this.data("tokenInputObject").clear();
+        return this;
+    },
+    add: function(item) {
+        this.data("tokenInputObject").add(item);
+        return this;
+    },
+    remove: function(item) {
+        this.data("tokenInputObject").remove(item);
+        return this;
+    },
+    get: function() {
+        return this.data("tokenInputObject").getTokens();
+    }
+}
 
+// Expose the .tokenInput function to jQuery as a plugin
+$.fn.tokenInput = function (method) {
+    // Method calling and initialization logic
+    if(methods[method]) {
+        return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+    } else {
+        return methods.init.apply(this, arguments);
+    }
+};
 
 // TokenList class for each input
-  $.TokenList = function (input, url_or_data, settings) {
+$.TokenList = function (input, url_or_data, settings) {
     //
     // Initialization
     //
 
     // Configure the data source
-    if (typeof(url_or_data) === "string") {
-      // Set the url to query against
-      settings.url = url_or_data;
-
-      // Make a smart guess about cross-domain if it wasn't explicitly specified
-      if (settings.crossDomain === undefined) {
-        if (settings.url.indexOf("://") === -1) {
-          settings.crossDomain = false;
-        } else {
-          settings.crossDomain = (location.href.split(/\/+/g)[1] !== settings.url.split(/\/+/g)[1]);
+    if($.type(url_or_data) === "string" || $.type(url_or_data) === "function") {
+        // Set the url to query against
+        settings.url = url_or_data;
+
+        // If the URL is a function, evaluate it here to do our initalization work
+        var url = computeURL();
+
+        // Make a smart guess about cross-domain if it wasn't explicitly specified
+        if(settings.crossDomain === undefined) {
+            if(url.indexOf("://") === -1) {
+                settings.crossDomain = false;
+            } else {
+                settings.crossDomain = (location.href.split(/\/+/g)[1] !== url.split(/\/+/g)[1]);
+            }
         }
-      }
-    } else if (typeof(url_or_data) === "object") {
-      // Set the local data to search through
-      settings.local_data = url_or_data;
+    } else if(typeof(url_or_data) === "object") {
+        // Set the local data to search through
+        settings.local_data = url_or_data;
     }
 
     // Build class names
-    if (settings.classes) {
-      // Use custom class names
-      settings.classes = $.extend({}, DEFAULT_CLASSES, settings.classes);
-    } else if (settings.theme) {
-      // Use theme-suffixed default class names
-      settings.classes = {};
-      $.each(DEFAULT_CLASSES, function(key, value) {
-        settings.classes[key] = value + "-" + settings.theme;
-      });
+    if(settings.classes) {
+        // Use custom class names
+        settings.classes = $.extend({}, DEFAULT_CLASSES, settings.classes);
+    } else if(settings.theme) {
+        // Use theme-suffixed default class names
+        settings.classes = {};
+        $.each(DEFAULT_CLASSES, function(key, value) {
+            settings.classes[key] = value + "-" + settings.theme;
+        });
     } else {
-      settings.classes = DEFAULT_CLASSES;
+        settings.classes = DEFAULT_CLASSES;
     }
 
 
@@ -136,117 +183,117 @@
 
     // Create a new text input an attach keyup events
     var input_box = $("<input type=\"text\"  autocomplete=\"off\">")
-            .css({
-                   outline: "none"
-                 })
-            .focus(function () {
-      if (settings.tokenLimit === null || settings.tokenLimit !== token_count) {
-        show_dropdown_hint();
-      }
-    })
-            .blur(function () {
-      hide_dropdown();
-    })
-            .bind("keyup keydown blur update", resize_input)
-            .keydown(function (event) {
-      var previous_token;
-      var next_token;
-
-      switch (event.keyCode) {
-        case KEY.LEFT:
-        case KEY.RIGHT:
-        case KEY.UP:
-        case KEY.DOWN:
-          if (!$(this).val()) {
-            previous_token = input_token.prev();
-            next_token = input_token.next();
-
-            if ((previous_token.length && previous_token.get(0) === selected_token) || (next_token.length && next_token.get(0) === selected_token)) {
-              // Check if there is a previous/next token and it is selected
-              if (event.keyCode === KEY.LEFT || event.keyCode === KEY.UP) {
-                deselect_token($(selected_token), POSITION.BEFORE);
-              } else {
-                deselect_token($(selected_token), POSITION.AFTER);
-              }
-            } else if ((event.keyCode === KEY.LEFT || event.keyCode === KEY.UP) && previous_token.length) {
-              // We are moving left, select the previous token if it exists
-              select_token($(previous_token.get(0)));
-            } else if ((event.keyCode === KEY.RIGHT || event.keyCode === KEY.DOWN) && next_token.length) {
-              // We are moving right, select the next token if it exists
-              select_token($(next_token.get(0)));
-            }
-          } else {
-            var dropdown_item = null;
-
-            if (event.keyCode === KEY.DOWN || event.keyCode === KEY.RIGHT) {
-              dropdown_item = $(selected_dropdown_item).next();
-            } else {
-              dropdown_item = $(selected_dropdown_item).prev();
-            }
-
-            if (dropdown_item.length) {
-              select_dropdown_item(dropdown_item);
-            }
-            return false;
-          }
-          break;
-
-        case KEY.BACKSPACE:
-          previous_token = input_token.prev();
-
-          if (!$(this).val().length) {
-            if (selected_token) {
-              delete_token($(selected_token));
-            } else if (previous_token.length) {
-              select_token($(previous_token.get(0)));
+        .css({
+            outline: "none"
+        })
+        .attr("id", settings.idPrefix + input.id)
+        .focus(function () {
+            if (settings.tokenLimit === null || settings.tokenLimit !== token_count) {
+                show_dropdown_hint();
             }
-
-            return false;
-          } else if ($(this).val().length === 1) {
+        })
+        .blur(function () {
             hide_dropdown();
-          } else {
-            // set a timeout just long enough to let this function finish.
-            setTimeout(function() {
-              do_search();
-            }, 5);
-          }
-          break;
-
-        case KEY.TAB:
-        case KEY.ENTER:
-        case KEY.NUMPAD_ENTER:
-        case KEY.COMMA:
-          if (selected_dropdown_item) {
-            add_token($(selected_dropdown_item));
-            return false;
-          }
-          break;
-
-        case KEY.ESCAPE:
-          hide_dropdown();
-          return true;
-
-        default:
-          if (String.fromCharCode(event.which)) {
-            // set a timeout just long enough to let this function finish.
-            setTimeout(function() {
-              do_search();
-            }, 5);
-          }
-          break;
-      }
-    });
+            $(this).val("");
+        })
+        .bind("keyup keydown blur update", resize_input)
+        .keydown(function (event) {
+            var previous_token;
+            var next_token;
+
+            switch(event.keyCode) {
+                case KEY.LEFT:
+                case KEY.RIGHT:
+                case KEY.UP:
+                case KEY.DOWN:
+                    if(!$(this).val()) {
+                        previous_token = input_token.prev();
+                        next_token = input_token.next();
+
+                        if((previous_token.length && previous_token.get(0) === selected_token) || (next_token.length && next_token.get(0) === selected_token)) {
+                            // Check if there is a previous/next token and it is selected
+                            if(event.keyCode === KEY.LEFT || event.keyCode === KEY.UP) {
+                                deselect_token($(selected_token), POSITION.BEFORE);
+                            } else {
+                                deselect_token($(selected_token), POSITION.AFTER);
+                            }
+                        } else if((event.keyCode === KEY.LEFT || event.keyCode === KEY.UP) && previous_token.length) {
+                            // We are moving left, select the previous token if it exists
+                            select_token($(previous_token.get(0)));
+                        } else if((event.keyCode === KEY.RIGHT || event.keyCode === KEY.DOWN) && next_token.length) {
+                            // We are moving right, select the next token if it exists
+                            select_token($(next_token.get(0)));
+                        }
+                    } else {
+                        var dropdown_item = null;
+
+                        if(event.keyCode === KEY.DOWN || event.keyCode === KEY.RIGHT) {
+                            dropdown_item = $(selected_dropdown_item).next();
+                        } else {
+                            dropdown_item = $(selected_dropdown_item).prev();
+                        }
+
+                        if(dropdown_item.length) {
+                            select_dropdown_item(dropdown_item);
+                        }
+                        return false;
+                    }
+                    break;
+
+                case KEY.BACKSPACE:
+                    previous_token = input_token.prev();
+
+                    if(!$(this).val().length) {
+                        if(selected_token) {
+                            delete_token($(selected_token));
+                            hidden_input.change();
+                        } else if(previous_token.length) {
+                            select_token($(previous_token.get(0)));
+                        }
+
+                        return false;
+                    } else if($(this).val().length === 1) {
+                        hide_dropdown();
+                    } else {
+                        // set a timeout just long enough to let this function finish.
+                        setTimeout(function(){do_search();}, 5);
+                    }
+                    break;
+
+                case KEY.TAB:
+                case KEY.ENTER:
+                case KEY.NUMPAD_ENTER:
+                case KEY.COMMA:
+                  if(selected_dropdown_item) {
+                    add_token($(selected_dropdown_item).data("tokeninput"));
+                    hidden_input.change();
+                    return false;
+                  }
+                  break;
+
+                case KEY.ESCAPE:
+                  hide_dropdown();
+                  return true;
+
+                default:
+                    if(String.fromCharCode(event.which)) {
+                        // set a timeout just long enough to let this function finish.
+                        setTimeout(function(){do_search();}, 5);
+                    }
+                    break;
+            }
+        });
 
     // Keep a reference to the original input box
     var hidden_input = $(input)
-            .hide()
-            .val("")
-            .focus(function () {
-      input_box.focus();
-    })
-            .blur(function () {
-      input_box.blur();
-    });
+                           .hide()
+                           .val("")
+                           .focus(function () {
+                               input_box.focus();
+                           })
+                           .blur(function () {
+                               input_box.blur();
+                           });
 
     // Keep a reference to the selected token and dropdown item
     var selected_token = null;
@@ -255,480 +302,556 @@
 
     // The list to store the token items in
     var token_list = $("<ul />")
-            .addClass(settings.classes.tokenList)
-            .click(function (event) {
-      var li = $(event.target).closest("li");
-      if (li && li.get(0) && $.data(li.get(0), "tokeninput")) {
-        toggle_select_token(li);
-      } else {
-        // Deselect selected token
-        if (selected_token) {
-          deselect_token($(selected_token), POSITION.END);
-        }
+        .addClass(settings.classes.tokenList)
+        .click(function (event) {
+            var li = $(event.target).closest("li");
+            if(li && li.get(0) && $.data(li.get(0), "tokeninput")) {
+                toggle_select_token(li);
+            } else {
+                // Deselect selected token
+                if(selected_token) {
+                    deselect_token($(selected_token), POSITION.END);
+                }
 
-        // Focus input box
-        input_box.focus();
-      }
-    })
-            .mouseover(function (event) {
-      var li = $(event.target).closest("li");
-      if (li && selected_token !== this) {
-        li.addClass(settings.classes.highlightedToken);
-      }
-    })
-            .mouseout(function (event) {
-      var li = $(event.target).closest("li");
-      if (li && selected_token !== this) {
-        li.removeClass(settings.classes.highlightedToken);
-      }
-    })
-            .insertBefore(hidden_input);
+                // Focus input box
+                input_box.focus();
+            }
+        })
+        .mouseover(function (event) {
+            var li = $(event.target).closest("li");
+            if(li && selected_token !== this) {
+                li.addClass(settings.classes.highlightedToken);
+            }
+        })
+        .mouseout(function (event) {
+            var li = $(event.target).closest("li");
+            if(li && selected_token !== this) {
+                li.removeClass(settings.classes.highlightedToken);
+            }
+        })
+        .insertBefore(hidden_input);
 
     // The token holding the input box
     var input_token = $("<li />")
-            .addClass(settings.classes.inputToken)
-            .appendTo(token_list)
-            .append(input_box);
+        .addClass(settings.classes.inputToken)
+        .appendTo(token_list)
+        .append(input_box);
 
     // The list to store the dropdown items in
     var dropdown = $("<div>")
-            .addClass(settings.classes.dropdown)
-            .appendTo("body")
-            .hide();
+        .addClass(settings.classes.dropdown)
+        .appendTo("body")
+        .hide();
 
     // Magic element to help us resize the text input
     var input_resizer = $("<tester/>")
-            .insertAfter(input_box)
-            .css({
-                   position: "absolute",
-                   top: -9999,
-                   left: -9999,
-                   width: "auto",
-                   fontSize: input_box.css("fontSize"),
-                   fontFamily: input_box.css("fontFamily"),
-                   fontWeight: input_box.css("fontWeight"),
-                   letterSpacing: input_box.css("letterSpacing"),
-                   whiteSpace: "nowrap"
-                 });
+        .insertAfter(input_box)
+        .css({
+            position: "absolute",
+            top: -9999,
+            left: -9999,
+            width: "auto",
+            fontSize: input_box.css("fontSize"),
+            fontFamily: input_box.css("fontFamily"),
+            fontWeight: input_box.css("fontWeight"),
+            letterSpacing: input_box.css("letterSpacing"),
+            whiteSpace: "nowrap"
+        });
 
     // Pre-populate list if items exist
     hidden_input.val("");
-    li_data = settings.prePopulate || hidden_input.data("pre");
-    if (li_data && li_data.length) {
-      $.each(li_data, function (index, value) {
-        insert_token(value.id, value.name);
-      });
+    var li_data = settings.prePopulate || hidden_input.data("pre");
+    if(settings.processPrePopulate && $.isFunction(settings.onResult)) {
+        li_data = settings.onResult.call(hidden_input, li_data);
+    }
+    if(li_data && li_data.length) {
+        $.each(li_data, function (index, value) {
+            insert_token(value);
+            checkTokenLimit();
+        });
+    }
+
+    // Initialization is done
+    if($.isFunction(settings.onReady)) {
+        settings.onReady.call();
+    }
+
+    //
+    // Public functions
+    //
+
+    this.clear = function() {
+        token_list.children("li").each(function() {
+            if ($(this).children("input").length === 0) {
+                delete_token($(this));
+            }
+        });
     }
 
+    this.add = function(item) {
+        add_token(item);
+    }
+
+    this.remove = function(item) {
+        token_list.children("li").each(function() {
+            if ($(this).children("input").length === 0) {
+                var currToken = $(this).data("tokeninput");
+                var match = true;
+                for (var prop in item) {
+                    if (item[prop] !== currToken[prop]) {
+                        match = false;
+                        break;
+                    }
+                }
+                if (match) {
+                    delete_token($(this));
+                }
+            }
+        });
+    }
+
+    this.getTokens = function() {
+        return saved_tokens;
+    }
 
     //
     // Private functions
     //
 
+    function checkTokenLimit() {
+        if(settings.tokenLimit !== null && token_count >= settings.tokenLimit) {
+            input_box.hide();
+            hide_dropdown();
+            return;
+        }
+    }
+
     function resize_input() {
-      if (input_val === (input_val = input_box.val())) {
-        return;
-      }
+        if(input_val === (input_val = input_box.val())) {return;}
 
-      // Enter new content into resizer and resize input accordingly
-      var escaped = input_val.replace(/&/g, '&amp;').replace(/\s/g, ' ').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-      input_resizer.html(escaped);
-      input_box.width(input_resizer.width() + 30);
+        // Enter new content into resizer and resize input accordingly
+        var escaped = input_val.replace(/&/g, '&amp;').replace(/\s/g,' ').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        input_resizer.html(escaped);
+        input_box.width(input_resizer.width() + 30);
     }
 
     function is_printable_character(keycode) {
-      return ((keycode >= 48 && keycode <= 90) || // 0-1a-z
-              (keycode >= 96 && keycode <= 111) || // numpad 0-9 + - / * .
-              (keycode >= 186 && keycode <= 192) || // ; = , - . / ^
-              (keycode >= 219 && keycode <= 222));    // ( \ ) '
+        return ((keycode >= 48 && keycode <= 90) ||     // 0-1a-z
+                (keycode >= 96 && keycode <= 111) ||    // numpad 0-9 + - / * .
+                (keycode >= 186 && keycode <= 192) ||   // ; = , - . / ^
+                (keycode >= 219 && keycode <= 222));    // ( \ ) '
     }
 
     // Inner function to a token to the list
-    function insert_token(id, value) {
-      var this_token = $("<li><p>" + value + "</p></li>")
-              .addClass(settings.classes.token)
-              .insertBefore(input_token);
+    function insert_token(item) {
+        var this_token = settings.tokenFormatter(item);
+        this_token = $(this_token)
+          .addClass(settings.classes.token)
+          .insertBefore(input_token);
+
+        // The 'delete token' button
+        $("<span>" + settings.deleteText + "</span>")
+            .addClass(settings.classes.tokenDelete)
+            .appendTo(this_token)
+            .click(function () {
+                delete_token($(this).parent());
+                hidden_input.change();
+                return false;
+            });
 
-      // The 'delete token' button
-      $("<span>" + settings.deleteText + "</span>")
-              .addClass(settings.classes.tokenDelete)
-              .appendTo(this_token)
-              .click(function () {
-        delete_token($(this).parent());
-        return false;
-      });
+        // Store data on the token
+        var token_data = {"id": item.id};
+        token_data[settings.propertyToSearch] = item[settings.propertyToSearch];
+        $.data(this_token.get(0), "tokeninput", item);
 
-      // Store data on the token
-      var token_data = {"id": id, "name": value};
-      $.data(this_token.get(0), "tokeninput", token_data);
+        // Save this token for duplicate checking
+        saved_tokens = saved_tokens.slice(0,selected_token_index).concat([token_data]).concat(saved_tokens.slice(selected_token_index));
+        selected_token_index++;
 
-      // Save this token for duplicate checking
-      saved_tokens = saved_tokens.slice(0, selected_token_index).concat([token_data]).concat(saved_tokens.slice(selected_token_index));
-      selected_token_index++;
+        // Update the hidden input
+        update_hidden_input(saved_tokens, hidden_input);
 
-      // Update the hidden input
-      var token_ids = $.map(saved_tokens, function (el) {
-        return el.id;
-      });
-      hidden_input.val(token_ids.join(settings.tokenDelimiter));
+        token_count += 1;
 
-      token_count += 1;
+        // Check the token limit
+        if(settings.tokenLimit !== null && token_count >= settings.tokenLimit) {
+            input_box.hide();
+            hide_dropdown();
+        }
 
-      return this_token;
+        return this_token;
     }
 
     // Add a token to the token list based on user input
-    function add_token(item) {
-      var li_data = $.data(item.get(0), "tokeninput");
-      var callback = settings.onAdd;
-
-      // See if the token already exists and select it if we don't want duplicates
-      if (token_count > 0 && settings.preventDuplicates) {
-        var found_existing_token = null;
-        token_list.children().each(function () {
-          var existing_token = $(this);
-          var existing_data = $.data(existing_token.get(0), "tokeninput");
-          if (existing_data && existing_data.id === li_data.id) {
-            found_existing_token = existing_token;
-            return false;
-          }
-        });
+    function add_token (item) {
+        var callback = settings.onAdd;
+
+        // See if the token already exists and select it if we don't want duplicates
+        if(token_count > 0 && settings.preventDuplicates) {
+            var found_existing_token = null;
+            token_list.children().each(function () {
+                var existing_token = $(this);
+                var existing_data = $.data(existing_token.get(0), "tokeninput");
+                if(existing_data && existing_data.id === item.id) {
+                    found_existing_token = existing_token;
+                    return false;
+                }
+            });
 
-        if (found_existing_token) {
-          select_token(found_existing_token);
-          input_token.insertAfter(found_existing_token);
-          input_box.focus();
-          return;
+            if(found_existing_token) {
+                select_token(found_existing_token);
+                input_token.insertAfter(found_existing_token);
+                input_box.focus();
+                return;
+            }
         }
-      }
 
-      // Insert the new tokens
-      insert_token(li_data.id, li_data.name);
-
-      // Check the token limit
-      if (settings.tokenLimit !== null && token_count >= settings.tokenLimit) {
-        input_box.hide();
-        hide_dropdown();
-        return;
-      } else {
-        input_box.focus();
-      }
+        // Insert the new tokens
+        if(settings.tokenLimit == null || token_count < settings.tokenLimit) {
+            insert_token(item);
+            checkTokenLimit();
+        }
 
-      // Clear input box
-      input_box.val("");
+        // Clear input box
+        input_box.val("");
 
-      // Don't show the help dropdown, they've got the idea
-      hide_dropdown();
+        // Don't show the help dropdown, they've got the idea
+        hide_dropdown();
 
-      // Execute the onAdd callback if defined
-      if ($.isFunction(callback)) {
-        callback(li_data);
-      }
+        // Execute the onAdd callback if defined
+        if($.isFunction(callback)) {
+            callback.call(hidden_input,item);
+        }
     }
 
     // Select a token in the token list
-    function select_token(token) {
-      token.addClass(settings.classes.selectedToken);
-      selected_token = token.get(0);
+    function select_token (token) {
+        token.addClass(settings.classes.selectedToken);
+        selected_token = token.get(0);
 
-      // Hide input box
-      input_box.val("");
+        // Hide input box
+        input_box.val("");
 
-      // Hide dropdown if it is visible (eg if we clicked to select token)
-      hide_dropdown();
+        // Hide dropdown if it is visible (eg if we clicked to select token)
+        hide_dropdown();
     }
 
     // Deselect a token in the token list
-    function deselect_token(token, position) {
-      token.removeClass(settings.classes.selectedToken);
-      selected_token = null;
-
-      if (position === POSITION.BEFORE) {
-        input_token.insertBefore(token);
-        selected_token_index--;
-      } else if (position === POSITION.AFTER) {
-        input_token.insertAfter(token);
-        selected_token_index++;
-      } else {
-        input_token.appendTo(token_list);
-        selected_token_index = token_count;
-      }
+    function deselect_token (token, position) {
+        token.removeClass(settings.classes.selectedToken);
+        selected_token = null;
+
+        if(position === POSITION.BEFORE) {
+            input_token.insertBefore(token);
+            selected_token_index--;
+        } else if(position === POSITION.AFTER) {
+            input_token.insertAfter(token);
+            selected_token_index++;
+        } else {
+            input_token.appendTo(token_list);
+            selected_token_index = token_count;
+        }
 
-      // Show the input box and give it focus again
-      input_box.focus();
+        // Show the input box and give it focus again
+        input_box.focus();
     }
 
     // Toggle selection of a token in the token list
     function toggle_select_token(token) {
-      var previous_selected_token = selected_token;
+        var previous_selected_token = selected_token;
 
-      if (selected_token) {
-        deselect_token($(selected_token), POSITION.END);
-      }
+        if(selected_token) {
+            deselect_token($(selected_token), POSITION.END);
+        }
 
-      if (previous_selected_token === token.get(0)) {
-        deselect_token(token, POSITION.END);
-      } else {
-        select_token(token);
-      }
+        if(previous_selected_token === token.get(0)) {
+            deselect_token(token, POSITION.END);
+        } else {
+            select_token(token);
+        }
     }
 
     // Delete a token from the token list
-    function delete_token(token) {
-      // Remove the id from the saved list
-      var token_data = $.data(token.get(0), "tokeninput");
-      var callback = settings.onDelete;
+    function delete_token (token) {
+        // Remove the id from the saved list
+        var token_data = $.data(token.get(0), "tokeninput");
+        var callback = settings.onDelete;
 
-      var index = token.prevAll().length;
-      if (index > selected_token_index) index--;
+        var index = token.prevAll().length;
+        if(index > selected_token_index) index--;
 
-      // Delete the token
-      token.remove();
-      selected_token = null;
+        // Delete the token
+        token.remove();
+        selected_token = null;
 
-      // Show the input box and give it focus again
-      input_box.focus();
+        // Show the input box and give it focus again
+        input_box.focus();
 
-      // Remove this token from the saved list
-      saved_tokens = saved_tokens.slice(0, index).concat(saved_tokens.slice(index + 1));
-      if (index < selected_token_index) selected_token_index--;
+        // Remove this token from the saved list
+        saved_tokens = saved_tokens.slice(0,index).concat(saved_tokens.slice(index+1));
+        if(index < selected_token_index) selected_token_index--;
 
-      // Update the hidden input
-      var token_ids = $.map(saved_tokens, function (el) {
-        return el.id;
-      });
-      hidden_input.val(token_ids.join(settings.tokenDelimiter));
+        // Update the hidden input
+        update_hidden_input(saved_tokens, hidden_input);
 
-      token_count -= 1;
+        token_count -= 1;
 
-      if (settings.tokenLimit !== null) {
-        input_box
+        if(settings.tokenLimit !== null) {
+            input_box
                 .show()
                 .val("")
                 .focus();
-      }
+        }
+
+        // Execute the onDelete callback if defined
+        if($.isFunction(callback)) {
+            callback.call(hidden_input,token_data);
+        }
+    }
+
+    // Update the hidden input box value
+    function update_hidden_input(saved_tokens, hidden_input) {
+        var token_values = $.map(saved_tokens, function (el) {
+            return el[settings.tokenValue];
+        });
+        hidden_input.val(token_values.join(settings.tokenDelimiter));
 
-      // Execute the onDelete callback if defined
-      if ($.isFunction(callback)) {
-        callback(token_data);
-      }
     }
 
     // Hide and clear the results dropdown
-    function hide_dropdown() {
-      dropdown.hide().empty();
-      selected_dropdown_item = null;
+    function hide_dropdown () {
+        dropdown.hide().empty();
+        selected_dropdown_item = null;
     }
 
     function show_dropdown() {
-      dropdown
-              .css({
-                     position: "absolute",
-                     top: $(token_list).offset().top + $(token_list).outerHeight(),
-                     left: $(token_list).offset().left,
-                     zindex: 999
-                   })
-              .show();
+        dropdown
+            .css({
+                position: "absolute",
+                top: $(token_list).offset().top + $(token_list).outerHeight(),
+                left: $(token_list).offset().left,
+                zindex: 999
+            })
+            .show();
     }
 
-    function show_dropdown_searching() {
-      if (settings.searchingText) {
-        dropdown.html("<p>" + settings.searchingText + "</p>");
-        show_dropdown();
-      }
+    function show_dropdown_searching () {
+        if(settings.searchingText) {
+            dropdown.html("<p>"+settings.searchingText+"</p>");
+            show_dropdown();
+        }
     }
 
-    function show_dropdown_hint() {
-      if (settings.hintText) {
-        dropdown.html("<p>" + settings.hintText + "</p>");
-        show_dropdown();
-      }
+    function show_dropdown_hint () {
+        if(settings.hintText) {
+            dropdown.html("<p>"+settings.hintText+"</p>");
+            show_dropdown();
+        }
     }
 
     // Highlight the query part of the search term
     function highlight_term(value, term) {
-      return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>");
+        return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>");
+    }
+
+    function find_value_and_highlight_term(template, value, term) {
+        return template.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + value + ")(?![^<>]*>)(?![^&;]+;)", "g"), highlight_term(value, term));
     }
 
     // Populate the results dropdown with some results
-    function populate_dropdown(query, results) {
-      if (results && results.length) {
-        dropdown.empty();
-        var dropdown_ul = $("<ul>")
+    function populate_dropdown (query, results) {
+        if(results && results.length) {
+            dropdown.empty();
+            var dropdown_ul = $("<ul>")
                 .appendTo(dropdown)
                 .mouseover(function (event) {
-          select_dropdown_item($(event.target).closest("li"));
-        })
+                    select_dropdown_item($(event.target).closest("li"));
+                })
                 .mousedown(function (event) {
-          add_token($(event.target).closest("li"));
-          return false;
-        })
+                    add_token($(event.target).closest("li").data("tokeninput"));
+                    hidden_input.change();
+                    return false;
+                })
                 .hide();
 
-        $.each(results, function(index, value) {
-          var this_li = $("<li>" + highlight_term(value.name, query) + "</li>")
-                  .appendTo(dropdown_ul);
+            $.each(results, function(index, value) {
+                var this_li = settings.resultsFormatter(value);
 
-          if (index % 2) {
-            this_li.addClass(settings.classes.dropdownItem);
-          } else {
-            this_li.addClass(settings.classes.dropdownItem2);
-          }
+                this_li = find_value_and_highlight_term(this_li ,value[settings.propertyToSearch], query);
 
-          if (index === 0) {
-            select_dropdown_item(this_li);
-          }
+                this_li = $(this_li).appendTo(dropdown_ul);
 
-          $.data(this_li.get(0), "tokeninput", {"id": value.id, "name": value.name});
-        });
+                if(index % 2) {
+                    this_li.addClass(settings.classes.dropdownItem);
+                } else {
+                    this_li.addClass(settings.classes.dropdownItem2);
+                }
 
-        show_dropdown();
+                if(index === 0) {
+                    select_dropdown_item(this_li);
+                }
+
+                $.data(this_li.get(0), "tokeninput", value);
+            });
 
-        if (settings.animateDropdown) {
-          dropdown_ul.slideDown("fast");
+            show_dropdown();
+
+            if(settings.animateDropdown) {
+                dropdown_ul.slideDown("fast");
+            } else {
+                dropdown_ul.show();
+            }
         } else {
-          dropdown_ul.show();
-        }
-      } else {
-        if (settings.noResultsText) {
-          dropdown.html("<p>" + settings.noResultsText + "</p>");
-          show_dropdown();
+            if(settings.noResultsText) {
+                dropdown.html("<p>"+settings.noResultsText+"</p>");
+                show_dropdown();
+            }
         }
-      }
     }
 
     // Highlight an item in the results dropdown
-    function select_dropdown_item(item) {
-      if (item) {
-        if (selected_dropdown_item) {
-          deselect_dropdown_item($(selected_dropdown_item));
-        }
+    function select_dropdown_item (item) {
+        if(item) {
+            if(selected_dropdown_item) {
+                deselect_dropdown_item($(selected_dropdown_item));
+            }
 
-        item.addClass(settings.classes.selectedDropdownItem);
-        selected_dropdown_item = item.get(0);
-      }
+            item.addClass(settings.classes.selectedDropdownItem);
+            selected_dropdown_item = item.get(0);
+        }
     }
 
     // Remove highlighting from an item in the results dropdown
-    function deselect_dropdown_item(item) {
-      item.removeClass(settings.classes.selectedDropdownItem);
-      selected_dropdown_item = null;
+    function deselect_dropdown_item (item) {
+        item.removeClass(settings.classes.selectedDropdownItem);
+        selected_dropdown_item = null;
     }
 
     // Do a search and show the "searching" dropdown if the input is longer
     // than settings.minChars
     function do_search() {
-      var query = input_box.val().toLowerCase();
+        var query = input_box.val().toLowerCase();
 
-      if (query && query.length) {
-        if (selected_token) {
-          deselect_token($(selected_token), POSITION.AFTER);
-        }
+        if(query && query.length) {
+            if(selected_token) {
+                deselect_token($(selected_token), POSITION.AFTER);
+            }
 
-        if (query.length >= settings.minChars) {
-          show_dropdown_searching();
-          clearTimeout(timeout);
+            if(query.length >= settings.minChars) {
+                show_dropdown_searching();
+                clearTimeout(timeout);
 
-          timeout = setTimeout(function() {
-            run_search(query);
-          }, settings.searchDelay);
-        } else {
-          hide_dropdown();
+                timeout = setTimeout(function(){
+                    run_search(query);
+                }, settings.searchDelay);
+            } else {
+                hide_dropdown();
+            }
         }
-      }
     }
 
     // Do the actual search
     function run_search(query) {
-      var cached_results = cache.get(query);
-      if (cached_results) {
-        populate_dropdown(query, cached_results);
-      } else {
-        // Are we doing an ajax search or local data search?
-        if (settings.url) {
-          // Extract exisiting get params
-          var ajax_params = {};
-          ajax_params.data = {};
-          if (settings.url.indexOf("?") > -1) {
-            var parts = settings.url.split("?");
-            ajax_params.url = parts[0];
-
-            var param_array = parts[1].split("&");
-            $.each(param_array, function (index, value) {
-              var kv = value.split("=");
-              ajax_params.data[kv[0]] = kv[1];
-            });
-          } else {
-            ajax_params.url = settings.url;
-          }
-
-          // Prepare the request
-          ajax_params.data[settings.queryParam] = query;
-          ajax_params.type = settings.method;
-          ajax_params.dataType = settings.contentType;
-          if (settings.crossDomain) {
-            ajax_params.dataType = "jsonp";
-          }
-
-          // Attach the success callback
-          ajax_params.success = function(results) {
-            if ($.isFunction(settings.onResult)) {
-              results = settings.onResult.call(this, results);
+        var cache_key = query + computeURL();
+        var cached_results = cache.get(cache_key);
+        if(cached_results) {
+            populate_dropdown(query, cached_results);
+        } else {
+            // Are we doing an ajax search or local data search?
+            if(settings.url) {
+                var url = computeURL();
+                // Extract exisiting get params
+                var ajax_params = {};
+                ajax_params.data = {};
+                if(url.indexOf("?") > -1) {
+                    var parts = url.split("?");
+                    ajax_params.url = parts[0];
+
+                    var param_array = parts[1].split("&");
+                    $.each(param_array, function (index, value) {
+                        var kv = value.split("=");
+                        ajax_params.data[kv[0]] = kv[1];
+                    });
+                } else {
+                    ajax_params.url = url;
+                }
+
+                // Prepare the request
+                ajax_params.data[settings.queryParam] = query;
+                ajax_params.type = settings.method;
+                ajax_params.dataType = settings.contentType;
+                if(settings.crossDomain) {
+                    ajax_params.dataType = "jsonp";
+                }
+
+                // Attach the success callback
+                ajax_params.success = function(results) {
+                  if($.isFunction(settings.onResult)) {
+                      results = settings.onResult.call(hidden_input, results);
+                  }
+                  cache.add(cache_key, settings.jsonContainer ? results[settings.jsonContainer] : results);
+
+                  // only populate the dropdown if the results are associated with the active search query
+                  if(input_box.val().toLowerCase() === query) {
+                      populate_dropdown(query, settings.jsonContainer ? results[settings.jsonContainer] : results);
+                  }
+                };
+
+                // Make the request
+                $.ajax(ajax_params);
+            } else if(settings.local_data) {
+                // Do the search through local data
+                var results = $.grep(settings.local_data, function (row) {
+                    return row[settings.propertyToSearch].toLowerCase().indexOf(query.toLowerCase()) > -1;
+                });
+
+                if($.isFunction(settings.onResult)) {
+                    results = settings.onResult.call(hidden_input, results);
+                }
+                cache.add(cache_key, results);
+                populate_dropdown(query, results);
             }
-            cache.add(query, settings.jsonContainer ? results[settings.jsonContainer] : results);
+        }
+    }
 
-            // only populate the dropdown if the results are associated with the active search query
-            if (input_box.val().toLowerCase() === query) {
-              populate_dropdown(query, settings.jsonContainer ? results[settings.jsonContainer] : results);
-            }
-          };
-
-          // Make the request
-          $.ajax(ajax_params);
-        } else if (settings.local_data) {
-          // Do the search through local data
-          var results = $.grep(settings.local_data, function (row) {
-            return row.name.toLowerCase().indexOf(query.toLowerCase()) > -1;
-          });
-
-          if ($.isFunction(settings.onResult)) {
-            results = settings.onResult.call(this, results);
-          }
-          cache.add(query, results);
-          populate_dropdown(query, results);
+    // compute the dynamic URL
+    function computeURL() {
+        var url = settings.url;
+        if(typeof settings.url == 'function') {
+            url = settings.url.call();
         }
-      }
+        return url;
     }
-  };
+};
 
 // Really basic cache for the results
-  $.TokenList.Cache = function (options) {
+$.TokenList.Cache = function (options) {
     var settings = $.extend({
-      max_size: 500
+        max_size: 500
     }, options);
 
     var data = {};
     var size = 0;
 
     var flush = function () {
-      data = {};
-      size = 0;
+        data = {};
+        size = 0;
     };
 
     this.add = function (query, results) {
-      if (size > settings.max_size) {
-        flush();
-      }
+        if(size > settings.max_size) {
+            flush();
+        }
 
-      if (!data[query]) {
-        size += 1;
-      }
+        if(!data[query]) {
+            size += 1;
+        }
 
-      data[query] = results;
+        data[query] = results;
     };
 
     this.get = function (query) {
-      return data[query];
+        return data[query];
     };
-  };
+};
 }(jQuery));