Merge remote-tracking branch 'origin/master'

taylorotwell · taylorotwell · commit 8482bbfb6298 · 2015-10-27T12:31:08.000-05:00
diff --git a/build/sami/sami.php b/build/sami/sami.php
@@ -5,6 +5,7 @@
 use Sami\Sami;
 use Symfony\Component\Finder\Finder;
 use Sami\Version\GitVersionCollection;
+use Sami\RemoteRepository\GitHubRemoteRepository;
 
 $iterator = Finder::create()
 	->files()
@@ -23,4 +24,5 @@
 	'build_dir' => __DIR__.'/build/%version%',
 	'cache_dir' => __DIR__.'/cache/%version%',
 	'default_opened_level' => 2,
+	'remote_repository' => new GitHubRemoteRepository('laravel/framework', dirname($dir)),
 ));
diff --git a/resources/assets/js/laravel.js b/resources/assets/js/laravel.js
@@ -112,7 +112,7 @@ $(function() {
     });
 
     $('#cross').click(function() {
-      typeahead.val('').keyup();
+      typeahead.typeahead('val', '').keyup();
       $article.css('opacity', '1');
     });
   }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ $(function() {`
`112`	`112`	`});`
`113`	`113`
`114`	`114`	`$('#cross').click(function() {`
`115`		`- typeahead.val('').keyup();`
	`115`	`+ typeahead.typeahead('val', '').keyup();`
`116`	`116`	`$article.css('opacity', '1');`
`117`	`117`	`});`
`118`	`118`	`}`