Skip to content
This repository was archived by the owner on Sep 10, 2023. It is now read-only.

Commit ab26a77

Browse files
raihan2006iraihan2006i
committed
Merge branch 'master' into setoptions
Sync 'master' branch of https://github.com/loopj/jquery-tokeninput Conflicts: demo.html src/jquery.tokeninput.js
2 parents 576340f + 2c66817 commit ab26a77

File tree

2 files changed

+134
-17
lines changed

2 files changed

+134
-17
lines changed

‎demo.html

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<html>
22
<head>
3-
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
3+
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
44
<script type="text/javascript" src="src/jquery.tokeninput.js"></script>
55

66
<link rel="stylesheet" href="styles/token-input.css" type="text/css" />
@@ -471,168 +471,196 @@ <h2>Change propertyToSearch anytime</h2>
471471
});
472472

473473
$("#demo-input-change-propertytosearch-anytime").tokenInput([{
474+
"id": 1,
474475
"first_name": "Arthur",
475476
"last_name": "Godfrey",
476477
"email": "[email protected]",
477478
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
478479
},
479480
{
481+
"id": 2,
480482
"first_name": "Adam",
481483
"last_name": "Johnson",
482484
"email": "[email protected]",
483485
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
484486
},
485487
{
488+
"id": 3,
486489
"first_name": "Jeff",
487490
"last_name": "Johnson",
488491
"email": "[email protected]",
489492
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
490493
},
491494
{
495+
"id": 4,
492496
"first_name": "Adriana",
493497
"last_name": "Jameson",
494498
"email": "[email protected]",
495499
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
496500
},
497501
{
502+
"id": 5,
498503
"first_name": "Adriano",
499504
"last_name": "Pooley",
500505
"email": "[email protected]",
501506
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
502507
},
503508
{
509+
"id": 6,
504510
"first_name": "Alcir",
505511
"last_name": "Reis",
506512
"email": "[email protected]",
507513
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
508514
},
509515
{
516+
"id": 7,
510517
"first_name": "Jack",
511518
"last_name": "Cunningham",
512519
"email": "[email protected]",
513520
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
514521
},
515522
{
523+
"id": 8,
516524
"first_name": "Alejandro",
517525
"last_name": "Forbes",
518526
"email": "[email protected]",
519527
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
520528
},
521529
{
530+
"id": 9,
522531
"first_name": "Alessandra",
523532
"last_name": "Mineiro",
524533
"email": "[email protected]",
525534
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
526535
},
527536
{
537+
"id": 10,
528538
"first_name": "Alex",
529539
"last_name": "Frazo",
530540
"email": "[email protected]",
531541
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
532542
},
533543
{
544+
"id": 11,
534545
"first_name": "Alexandre",
535546
"last_name": "Crawford",
536547
"email": "[email protected]",
537548
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
538549
},
539550
{
551+
"id": 12,
540552
"first_name": "Alexandre",
541553
"last_name": "Lalwani",
542554
"email": "[email protected]",
543555
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
544556
},
545557
{
558+
"id": 13,
546559
"first_name": "Alexandre",
547560
"last_name": "Jokos",
548561
"email": "[email protected]",
549562
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
550563
},
551564
{
565+
"id": 14,
552566
"first_name": "Alexandre",
553567
"last_name": "Paro",
554568
"email": "[email protected]",
555569
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
556570
},
557571
{
572+
"id": 15,
558573
"first_name": "Andre",
559574
"last_name": "Niemeyer",
560575
"email": "[email protected]",
561576
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
562577
},
563578
{
579+
"id": 16,
564580
"first_name": "Alyssa",
565581
"last_name": "Fortes",
566582
"email": "[email protected]",
567583
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
568584
},
569585
{
586+
"id": 17,
570587
"first_name": "Amit",
571588
"last_name": "Alvarenga",
572589
"email": "[email protected]",
573590
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
574591
},
575592
{
593+
"id": 18,
576594
"first_name": "Ana Bia",
577595
"last_name": "Borges",
578596
"email": "[email protected]",
579597
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
580598
},
581599
{
600+
"id": 19,
582601
"first_name": "Ana",
583602
"last_name": "Akamine",
584603
"email": "[email protected]",
585604
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
586605
},
587606
{
607+
"id": 20,
588608
"first_name": "Anderson",
589609
"last_name": "Tovoros",
590610
"email": "[email protected]",
591611
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
592612
},
593613
{
614+
"id": 21,
594615
"first_name": "Andre",
595616
"last_name": "Borges",
596617
"email": "[email protected]",
597618
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
598619
},
599620
{
621+
"id": 22,
600622
"first_name": "Andre",
601623
"last_name": "Wexler",
602624
"email": "[email protected]",
603625
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
604626
},
605627
{
628+
"id": 23,
606629
"first_name": "Andre",
607630
"last_name": "Williams",
608631
"email": "[email protected]",
609632
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
610633
},
611634
{
635+
"id": 24,
612636
"first_name": "Andre",
613637
"last_name": "Sanford",
614638
"email": "[email protected]",
615639
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
616640
},
617641
{
642+
"id": 25,
618643
"first_name": "Andre",
619644
"last_name": "Wayne",
620645
"email": "[email protected]",
621646
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
622647
},
623648
{
649+
"id": 26,
624650
"first_name": "Andre",
625651
"last_name": "Jackson",
626652
"email": "[email protected]",
627653
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
628654
},
629655
{
656+
"id": 27,
630657
"first_name": "Andre",
631658
"last_name": "Jolly",
632659
"email": "[email protected]",
633660
"url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_2_normal.png"
634661
},
635662
{
663+
"id": 28,
636664
"first_name": "Andre",
637665
"last_name": "Henderson",
638666
"email": "[email protected]",
@@ -678,6 +706,19 @@ <h2>Start disabled</h2>
678706
</script>
679707
</div>
680708

681-
709+
710+
<h2>Free Tagging</h2>
711+
<div>
712+
<input type="text" id="demo-input-free-tagging" name="blah" />
713+
<input type="button" value="Submit" />
714+
<script type="text/javascript">
715+
$(document).ready(function() {
716+
$("#demo-input-free-tagging").tokenInput("http://shell.loopj.com/tokeninput/tvshows.php", {
717+
allowFreeTagging: true
718+
});
719+
});
720+
</script>
721+
</div>
722+
682723
</body>
683724
</html>

0 commit comments

Comments
 (0)