Skip to content

Commit

Permalink
Backing out (removing) Angular Material Design v1.1.0 RC4 prior to
Browse files Browse the repository at this point in the history 
releasing FoBo v1.6 as it seems it will take some time for it to get
released.
  • Loading branch information
@karma4u101
karma4u101 committed May 2, 2016
1 parent 3aba4d4 commit 02cd156
Show file tree
Hide file tree
Showing 6 changed files with 144 additions and 144 deletions.
52 changes: 26 additions & 26 deletions Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,23 +296,23 @@ package object FoBoAJSRes {
FoBoResources.AJMaterial108
}

/**
* Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot.
* @version 1.1.0
*
* '''Example:'''
*
* {{{
* import net.liftmodules.{FoBoAJSRes => FoBo}
* :
* FoBo.Resource.Init=FoBo.Resource.AJMaterial110
* }}}
*
*/
case object AJMaterial110 extends Resource {
FoBoResources.init
FoBoResources.AJMaterial110
}
// /**
// * Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot.
// * @version 1.1.0
// *
// * '''Example:'''
// *
// * {{{
// * import net.liftmodules.{FoBoAJSRes => FoBo}
// * :
// * FoBo.Resource.Init=FoBo.Resource.AJMaterial110
// * }}}
// *
// */
// case object AJMaterial110 extends Resource {
// FoBoResources.init
// FoBoResources.AJMaterial110
// }

/**
* Enable usage of AngularUI-Bootstrap version 0․10․0 resource files in your bootstrap liftweb Boot.
Expand Down Expand Up @@ -4910,15 +4910,15 @@ package object FoBoAJSRes {
}
}

lazy val AJMaterial110 = {
ResourceServer.rewrite {
case "fobo" :: "angular-material.js" :: Nil if Props.devMode => List("fobo", "angular-material", "1.1.0", "js", "angular-material.js")
case "fobo" :: "angular-material.js" :: Nil => List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
case "fobo" :: "angular-material-mocks.js" :: Nil => List("fobo", "angular-material", "1.1.0", "js", "angular-material-mocks.js")
case "fobo" :: "angular-material.css" :: Nil if Props.devMode => List("fobo", "angular-material", "1.1.0", "css", "angular-material.css")
case "fobo" :: "angular-material.css" :: Nil => List("fobo", "angular-material", "1.1.0", "css", "angular-material.min.css")
}
}
// lazy val AJMaterial110 = {
// ResourceServer.rewrite {
// case "fobo" :: "angular-material.js" :: Nil if Props.devMode => List("fobo", "angular-material", "1.1.0", "js", "angular-material.js")
// case "fobo" :: "angular-material.js" :: Nil => List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
// case "fobo" :: "angular-material-mocks.js" :: Nil => List("fobo", "angular-material", "1.1.0", "js", "angular-material-mocks.js")
// case "fobo" :: "angular-material.css" :: Nil if Props.devMode => List("fobo", "angular-material", "1.1.0", "css", "angular-material.css")
// case "fobo" :: "angular-material.css" :: Nil => List("fobo", "angular-material", "1.1.0", "css", "angular-material.min.css")
// }
// }

}
}
Expand Down
28 changes: 14 additions & 14 deletions Angular/AngularJS-Res/src/test/scala/net/liftmodules/FoBoAJSRes/FoBoAJSResSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,20 @@ object FoBoAJSResSpec extends Specification {
}

//Angular Material
//AJMaterial110
"With FoBoAJSRes.Resource.Init set to FoBoAJSRes.Resource.AJMaterial110 the ResourceServer" should {
"allow fobo/angular-material.js" in {
allowResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
}
"rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
rewriteResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
}
"rewrit fobo/angular-material.css to fobo/angular-material/1.1.0/js/angular-material.min.css" in {
rewriteResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.css"::Nil) must_==
List("fobo", "angular-material", "1.1.0", "css", "angular-material.min.css")
}
}
// //AJMaterial110
// "With FoBoAJSRes.Resource.Init set to FoBoAJSRes.Resource.AJMaterial110 the ResourceServer" should {
// "allow fobo/angular-material.js" in {
// allowResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
// }
// "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
// rewriteResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
// List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
// }
// "rewrit fobo/angular-material.css to fobo/angular-material/1.1.0/js/angular-material.min.css" in {
// rewriteResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.css"::Nil) must_==
// List("fobo", "angular-material", "1.1.0", "css", "angular-material.min.css")
// }
// }
//AJMaterial108
"With FoBoAJSRes.Resource.Init set to FoBoAJSRes.Resource.AJMaterial108 the ResourceServer" should {
"allow fobo/angular-material.js" in {
Expand Down
66 changes: 33 additions & 33 deletions Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,23 +309,23 @@ package object FoBoAJS {
FoBoAJSRes.Resource.AJMaterial108
}

/**
* Enable usage of FoBo's Angular Material API and resources version 1․1․0 in your bootstrap liftweb Boot.
* @version 1.1.0
*
* '''Example:'''
*
* {{{
* import net.liftmodules.{FoBoAJS => FoBo}
* :
* FoBo.ToolKit.Init=FoBo.ToolKit.AJMaterial110
* }}}
*
*/
case object AJMaterial110 extends ToolKit {
FoBoAJSAPI.API.Angular1
FoBoAJSRes.Resource.AJMaterial110
}
// /**
// * Enable usage of FoBo's Angular Material API and resources version 1․1․0 in your bootstrap liftweb Boot.
// * @version 1.1.0
// *
// * '''Example:'''
// *
// * {{{
// * import net.liftmodules.{FoBoAJS => FoBo}
// * :
// * FoBo.ToolKit.Init=FoBo.ToolKit.AJMaterial110
// * }}}
// *
// */
// case object AJMaterial110 extends ToolKit {
// FoBoAJSAPI.API.Angular1
// FoBoAJSRes.Resource.AJMaterial110
// }

/**
* Enable usage of FoBo's Angular API and AngularUI-Bootstrap resources version 0․10․0 in your bootstrap liftweb Boot.
Expand Down Expand Up @@ -657,22 +657,22 @@ package object FoBoAJS {
FoBoAJSRes.Resource.AJMaterial108
}

/**
* Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot.
* @version 1.0.7
*
* '''Example:'''
*
* {{{
* import net.liftmodules.{FoBoAJS => FoBo}
* :
* FoBo.Resource.Init=FoBo.Resource.AJMaterial110
* }}}
*
*/
case object AJMaterial110 extends Resource {
FoBoAJSRes.Resource.AJMaterial110
}
// /**
// * Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot.
// * @version 1.0.7
// *
// * '''Example:'''
// *
// * {{{
// * import net.liftmodules.{FoBoAJS => FoBo}
// * :
// * FoBo.Resource.Init=FoBo.Resource.AJMaterial110
// * }}}
// *
// */
// case object AJMaterial110 extends Resource {
// FoBoAJSRes.Resource.AJMaterial110
// }

/**
* Enable usage of AngularUI-Bootstrap version 0․10․0 resource files in your bootstrap liftweb Boot.
Expand Down
38 changes: 19 additions & 19 deletions Angular/AngularJS/src/test/scala/net/liftmodules/FoBo/FoBoAJSSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,25 +161,25 @@ class FoBoAJSSpec extends mutable.Specification {
}

//AJMaterial110
"With FoBoAJS.ToolKit.Init set to FoBoAJS.ToolKit.AJMaterial110 the ResourceServer" should {
"allow fobo/angular-material.js" in {
allowToolKitInit(FoBoAJS.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
}
"rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
rewriteToolKitInit(FoBoAJS.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
}
}

"With FoBoAJS.Resource.Init set to FoBoAJS.Resource.AJMaterial110 the ResourceServer" should {
"allow fobo/angular-material.js" in {
allowResource(FoBoAJS.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
}
"rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
rewriteResource(FoBoAJS.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
}
}
// "With FoBoAJS.ToolKit.Init set to FoBoAJS.ToolKit.AJMaterial110 the ResourceServer" should {
// "allow fobo/angular-material.js" in {
// allowToolKitInit(FoBoAJS.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
// }
// "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
// rewriteToolKitInit(FoBoAJS.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
// List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
// }
// }
//
// "With FoBoAJS.Resource.Init set to FoBoAJS.Resource.AJMaterial110 the ResourceServer" should {
// "allow fobo/angular-material.js" in {
// allowResource(FoBoAJS.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
// }
// "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
// rewriteResource(FoBoAJS.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
// List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
// }
// }

//AJMaterial108
"With FoBoAJS.ToolKit.Init set to FoBoAJS.ToolKit.AJMaterial108 the ResourceServer" should {
Expand Down
64 changes: 32 additions & 32 deletions FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,22 +377,22 @@ package object FoBo {
net.liftmodules.FoBoAJS.ToolKit.AJMaterial108
}

/**
* Enable usage of FoBo's Angular Material API and resources version 1․1․0 in your bootstrap liftweb Boot.
* @version 1.1.0
*
* '''Example:'''
*
* {{{
* import net.liftmodules.FoBo
* :
* FoBo.ToolKit.Init=FoBo.ToolKit.AJMaterial110
* }}}
*
*/
case object AJMaterial110 extends ToolKit {
net.liftmodules.FoBoAJS.ToolKit.AJMaterial110
}
// /**
// * Enable usage of FoBo's Angular Material API and resources version 1․1․0 in your bootstrap liftweb Boot.
// * @version 1.1.0
// *
// * '''Example:'''
// *
// * {{{
// * import net.liftmodules.FoBo
// * :
// * FoBo.ToolKit.Init=FoBo.ToolKit.AJMaterial110
// * }}}
// *
// */
// case object AJMaterial110 extends ToolKit {
// net.liftmodules.FoBoAJS.ToolKit.AJMaterial110
// }

/**
* Enable usage of FoBo's Angular API and AngularUI-Bootstrap resources version 0․10․0 in your bootstrap liftweb Boot.
Expand Down Expand Up @@ -1132,22 +1132,22 @@ package object FoBo {
net.liftmodules.FoBoAJS.Resource.AJMaterial108
}

/**
* Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot.
* @version 1.1.0
*
* '''Example:'''
*
* {{{
* import net.liftmodules.FoBo
* :
* FoBo.Resource.Init=FoBo.Resource.AJMaterial110
* }}}
*
*/
case object AJMaterial110 extends Resource {
net.liftmodules.FoBoAJS.Resource.AJMaterial110
}
// /**
// * Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot.
// * @version 1.1.0
// *
// * '''Example:'''
// *
// * {{{
// * import net.liftmodules.FoBo
// * :
// * FoBo.Resource.Init=FoBo.Resource.AJMaterial110
// * }}}
// *
// */
// case object AJMaterial110 extends Resource {
// net.liftmodules.FoBoAJS.Resource.AJMaterial110
// }

/**
* Enable usage of AngularUI-Bootstrap version 0․10․0 resource files in your bootstrap liftweb Boot.
Expand Down
40 changes: 20 additions & 20 deletions FoBo/FoBo/src/test/scala/net/liftmodules/FoBo/FoBoSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,26 +168,26 @@ object FoBoSpec extends Specification {
}
}

//AJMaterial110
"With FoBo.ToolKit.Init set to FoBo.ToolKit.AJMaterial110 the ResourceServer" should {
"allow fobo/angular-material.js" in {
allowToolKitInit(FoBo.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
}
"rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
rewriteToolKitInit(FoBo.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
}
}

"With FoBo.Resource.Init set to FoBo.Resource.AJMaterial110 the ResourceServer" should {
"allow fobo/angular-material.js" in {
allowResource(FoBo.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
}
"rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
rewriteResource(FoBo.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
}
}
// //AJMaterial110
// "With FoBo.ToolKit.Init set to FoBo.ToolKit.AJMaterial110 the ResourceServer" should {
// "allow fobo/angular-material.js" in {
// allowToolKitInit(FoBo.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
// }
// "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
// rewriteToolKitInit(FoBo.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
// List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
// }
// }
//
// "With FoBo.Resource.Init set to FoBo.Resource.AJMaterial110 the ResourceServer" should {
// "allow fobo/angular-material.js" in {
// allowResource(FoBo.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true
// }
// "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in {
// rewriteResource(FoBo.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_==
// List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js")
// }
// }

//AJMaterial108
"With FoBo.ToolKit.Init set to FoBo.ToolKit.AJMaterial108 the ResourceServer" should {
Expand Down

1 comment on commit 02cd156

@karma4u101
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#75 re-schedule inclusion for a later release of FoBo as it seems it will take some time for v1.1.0 to get released.

Please sign in to comment.