@@ -70,6 +70,17 @@ trait GistControllerBase extends ControllerBase {
7070 _gist(params(" userName" ), Some (params(" repoName" )))
7171 }
7272
73+ get(" /gist/:userName/:repoName.js" ){
74+ val userName = params(" userName" )
75+ val repoName = params(" repoName" )
76+ getGist(userName, repoName) match {
77+ case Some (gist) =>
78+ _embedJs(gist, userName, repoName, " master" )
79+ case None =>
80+ NotFound ()
81+ }
82+ }
83+
7384 get(" /gist/:userName/:repoName/:revision" ){
7485 _gist(params(" userName" ), Some (params(" repoName" )), params(" revision" ))
7586 }
@@ -417,12 +428,7 @@ trait GistControllerBase extends ControllerBase {
417428 // //////////////////////////////////////////////////////////////////////////////
418429
419430
420- private def _gist (userName : String , repoName : Option [String ] = None , revision : String = " master" , isEmbed : Boolean = false ): Any = {
421-
422- if ( repoName.isDefined && repoName.get.endsWith(" .js" )) {
423- return _gist(userName, Some (repoName.get.substring(0 ,repoName.get.length()- 3 )), revision, true )
424- }
425-
431+ private def _gist (userName : String , repoName : Option [String ] = None , revision : String = " master" ): Any = {
426432 repoName match {
427433 case None => {
428434 val page = params.get(" page" ) match {
@@ -450,14 +456,11 @@ trait GistControllerBase extends ControllerBase {
450456 case Some (gist) =>
451457 if (gist.mode == " PRIVATE" ){
452458 context.loginAccount match {
453- case Some (x) if (x.userName == userName) =>
454- if (isEmbed) _embedJs(gist, userName, repoName, revision)
455- else _gistDetail(gist, userName, repoName, revision)
459+ case Some (x) if (x.userName == userName) => _gistDetail(gist, userName, repoName, revision)
456460 case _ => Unauthorized ()
457461 }
458462 } else {
459- if (isEmbed) _embedJs(gist, userName, repoName, revision)
460- else _gistDetail(gist, userName, repoName, revision)
463+ _gistDetail(gist, userName, repoName, revision)
461464 }
462465 case None =>
463466 NotFound ()
0 commit comments