Skip to content

Commit

Permalink
Formating using scalafmt v0.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
karma4u101 committed Oct 1, 2016
1 parent b88f5cb commit a06e389
Show file tree
Hide file tree
Showing 48 changed files with 135 additions and 135 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ package object FoBoAJSAPI {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[API]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: API): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
with GenProtoUser { self: ModelType =>

private lazy val msh = new msh();
private val logger = Logger(classOf[MaterialMegaMetaProtoUser[ModelType]])
private val logger = Logger(classOf[MaterialMegaMetaProtoUser[ModelType]])
//overriding lift-core i18 localization to add glyphicons to User menu entries (IF USER SETS fobo.xxx IN APP RESOURCE BUNDLE)
//with fallback back to the i18n lift-core localization properties
/**
Expand Down Expand Up @@ -638,7 +638,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
fields: List[FieldPointerType]): NodeSeq = {
for {
pointer <- fields
field <- computeFieldFromPointer(user, pointer).toList
field <- computeFieldFromPointer(user, pointer).toList
if field.show_? && (!ignorePassword || !pointer.isPasswordField_?)
form <- field.toForm.toList
} yield {
Expand Down Expand Up @@ -684,10 +684,10 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
protected def extractLocalFormPasswordField(
form: NodeSeq,
field: BaseField): (NodeSeq, NodeSeq) = {
val pwInputElems = form \ "input"
val pwInputElems = form \ "input"
val bindAttrToPwInputElems = "input [class]" #> "form-control"
val bsPwInputElems = bindAttrToPwInputElems(pwInputElems)
val pw1 = bsPwInputElems.head
val bsPwInputElems = bindAttrToPwInputElems(pwInputElems)
val pw1 = bsPwInputElems.head
val bindAttrToPw1 =
"input [placeholder]" #> resSignUpPlaceholderPassword &
"input [value]" #> ""
Expand All @@ -702,7 +702,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]

override def signup = {
val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance())
val theName = signUpPath.mkString("")
val theName = signUpPath.mkString("")
val submitAttr: Seq[SHtml.ElemAttr] = Seq(
"class" -> "md-raised md-primary md-button md-default-theme")

Expand Down Expand Up @@ -823,7 +823,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
override def changePassword = {
val user = currentUser.openOrThrowException(
"we can do this because the logged in test has happened")
var oldPassword = ""
var oldPassword = ""
var newPassword: List[String] = Nil

def testAndSet() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Helpers._
class AJSResources extends StatefulSnippet {

def dispatch = {
case "injectJS" => injectJS
case "injectJS" => injectJS
case "injectCSS" => injectCSS
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MDButton extends StatefulSnippet with Loggable {

def dispatch: DispatchIt = {
case "ngHref" => ngHref
case "href" => href
case "href" => href
}

/**
Expand Down Expand Up @@ -50,7 +50,7 @@ class MDButton extends StatefulSnippet with Loggable {
}

private def getLink(name: S.attr.Info): String = {
val loc = SiteMap.findAndTestLoc(name).toList
val loc = SiteMap.findAndTestLoc(name).toList
val link = (if (!loc.isEmpty) loc.head.createDefaultLink else None) getOrElse NodeSeq.Empty
if (!S.contextPath.isEmpty() && !link.isEmpty)
S.contextPath + link.toString()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ package object FoBoAJSRes {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[Resource]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: Resource): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down
2 changes: 1 addition & 1 deletion Angular/AngularJS/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ moduleName <<= (name, liftEdition) { (n, e) =>
}

libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) =>
"net.liftmodules" %% ("fobo-angularjs-res" + "_" + e) % mv % "provided" ::
"net.liftmodules" %% ("fobo-angularjs-res" + "_" + e) % mv % "provided" ::
"net.liftmodules" %% ("fobo-angularjs-api" + "_" + e) % mv % "provided" ::
Nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ package object FoBoAJS {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[Toolkit]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: Toolkit): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down Expand Up @@ -321,7 +321,7 @@ package object FoBoAJS {
* :
* FoBo.Toolkit.Init=FoBo.Toolkit.AJMaterial111
* }}}
*
*
* @since v1.7
*/
case object AJMaterial111 extends Toolkit {
Expand Down Expand Up @@ -444,7 +444,7 @@ package object FoBoAJS {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[Resource]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: Resource): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down Expand Up @@ -803,7 +803,7 @@ package object FoBoAJS {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[API]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: API): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ package object FoBoTBAPI {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[API]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: API): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down Expand Up @@ -87,9 +87,9 @@ package object FoBoTBAPI {
* }}}
*/
object TBLocInfo {
private val hd: Box[String] = Full("divider")
private val vd: Box[String] = Full("divider-vertical")
private val nh: Box[String] = Full("nav-header")
private val hd: Box[String] = Full("divider")
private val vd: Box[String] = Full("divider-vertical")
private val nh: Box[String] = Full("nav-header")
private val ltb: Box[String] = Full("_blank")
private val lts: Box[String] = Full("_self")
private val ltp: Box[String] = Full("_parent")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ class Bootstrap extends StatefulSnippet with Loggable {
private lazy val sch = new sch()

def dispatch = {
case "popover" => popover
case "tooltip" => tooltip
case "popover" => popover
case "tooltip" => tooltip
case "popoverPreventDefault" => popoverPreventDefault
case "activateDropdown" => activateDropdown
case "activateDropdown" => activateDropdown
}

/**
Expand All @@ -50,7 +50,7 @@ class Bootstrap extends StatefulSnippet with Loggable {
* }}}
*/
def popover = {
var id = S.attr("id") openOr "id: NOT DEFINED!?"
var id = S.attr("id") openOr "id: NOT DEFINED!?"
var options = S.attr("options") openOr ""
" *" #> sch.popover(id, options)
}
Expand Down Expand Up @@ -81,7 +81,7 @@ class Bootstrap extends StatefulSnippet with Loggable {
* }}}
*/
def tooltip = {
var id = S.attr("id") openOr "id: NOT DEFINED!?"
var id = S.attr("id") openOr "id: NOT DEFINED!?"
var options = S.attr("options") openOr ""
" *" #> sch.tooltip(id, options)
}
Expand Down Expand Up @@ -145,8 +145,8 @@ class Bootstrap extends StatefulSnippet with Loggable {

private def onTest(on: String): String = on match {
case "arelpop" => "a[rel=popover]"
case "a[rel" => "a[rel=popover]"
case _ => on
case "a[rel" => "a[rel=popover]"
case _ => on
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ trait TBNavLiList extends FlexMenuBuilder with DispatchSnippet {
render
}

override def expandAll = true
override def expandAll = true
override def linkToSelf = true

override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = inner
Expand Down Expand Up @@ -222,7 +222,7 @@ trait TBNavLiList extends FlexMenuBuilder with DispatchSnippet {
case Full(f) => {
buildWithInfo(f, renderInner, item)
}
case Empty =>
case Empty =>
case Failure(message, _, _) => ""
}
//info list has more elements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ trait TBNavbar extends FlexMenuBuilder with DispatchSnippet {
render
}

override def expandAll = true
override def expandAll = true
override def linkToSelf = true

override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = {
Expand Down Expand Up @@ -258,7 +258,7 @@ trait TBNavbar extends FlexMenuBuilder with DispatchSnippet {
case Full(f) => {
buildWithInfo(f, renderInner, item)
}
case Empty =>
case Empty =>
case Failure(message, _, _) => ""
}
//info list has more elements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ trait TBNavlist extends FlexMenuBuilder with DispatchSnippet {
render
}

override def expandAll = true
override def expandAll = true
override def linkToSelf = true

override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = {
Expand Down Expand Up @@ -234,7 +234,7 @@ trait TBNavlist extends FlexMenuBuilder with DispatchSnippet {
case Full(f) => {
buildWithInfo(f, renderInner, item)
}
case Empty =>
case Empty =>
case Failure(message, _, _) => ""
}
//info list has more elements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Helpers._
class TBResources extends StatefulSnippet {

def dispatch = {
case "injectJS" => injectJS
case "injectJS" => injectJS
case "injectCSS" => injectCSS
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ package object FoBoTBRes {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[Resource]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: Resource): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down
2 changes: 1 addition & 1 deletion Bootstrap/Bootstrap2/Twitter-Bootstrap/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ moduleName <<= (name, liftEdition) { (n, e) =>
}

libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) =>
"net.liftmodules" %% ("fobo-twitter-bootstrap-res" + "_" + e) % mv % "provided" ::
"net.liftmodules" %% ("fobo-twitter-bootstrap-res" + "_" + e) % mv % "provided" ::
"net.liftmodules" %% ("fobo-twitter-bootstrap-api" + "_" + e) % mv % "provided" ::
Nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ package object FoBoTB {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[Toolkit]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: Toolkit): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down Expand Up @@ -117,7 +117,7 @@ package object FoBoTB {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[Resource]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: Resource): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down Expand Up @@ -151,7 +151,7 @@ package object FoBoTB {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[API]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: API): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down Expand Up @@ -195,9 +195,9 @@ package object FoBoTB {
* }}}
*/
object TBLocInfo {
private val hd: Box[String] = Full("divider")
private val vd: Box[String] = Full("divider-vertical")
private val nh: Box[String] = Full("nav-header")
private val hd: Box[String] = Full("divider")
private val vd: Box[String] = Full("divider-vertical")
private val nh: Box[String] = Full("nav-header")
private val ltb: Box[String] = Full("_blank")
private val lts: Box[String] = Full("_self")
private val ltp: Box[String] = Full("_parent")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ package object FoBoBsAPI {
//the object name, we can easily change this if we need to
private type Store = List[String] //List[API]
private var store: Store = List()
def Init: Store = store
def Init: Store = store
def Init_=(t: API): Store = {
store = if (store contains t.toString) store else t.toString :: store
store
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
fields: List[FieldPointerType]): NodeSeq = {
for {
pointer <- fields
field <- computeFieldFromPointer(user, pointer).toList
field <- computeFieldFromPointer(user, pointer).toList
if field.show_? && (!ignorePassword || !pointer.isPasswordField_?)
form <- field.toForm.toList
} yield {
Expand Down Expand Up @@ -674,10 +674,10 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
protected def extractLocalFormPasswordField(
form: NodeSeq,
field: BaseField): (NodeSeq, NodeSeq) = {
val pwInputElems = form \ "input"
val pwInputElems = form \ "input"
val bindAttrToPwInputElems = "input [class]" #> "form-control"
val bsPwInputElems = bindAttrToPwInputElems(pwInputElems)
val pw1 = bsPwInputElems.head
val bsPwInputElems = bindAttrToPwInputElems(pwInputElems)
val pw1 = bsPwInputElems.head
val bindAttrToPw1 =
"input [placeholder]" #> resSignUpPlaceholderPassword &
"input [value]" #> ""
Expand All @@ -691,8 +691,8 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
}

override def signup = {
val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance())
val theName = signUpPath.mkString("")
val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance())
val theName = signUpPath.mkString("")
val submitAttr: Seq[SHtml.ElemAttr] = Seq("class" -> "btn btn-default")

def testSignup() {
Expand Down Expand Up @@ -734,7 +734,7 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
override def edit = {
val theUser: TheUserType = mutateUserOnEdit(
currentUser.openOrThrowException("we know we're logged in"))
val theName = editPath.mkString("")
val theName = editPath.mkString("")
val submitAttr: Seq[SHtml.ElemAttr] = Seq("class" -> "btn btn-default")

def testEdit() {
Expand Down Expand Up @@ -808,7 +808,7 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]]
override def changePassword = {
val user = currentUser.openOrThrowException(
"we can do this because the logged in test has happened")
var oldPassword = ""
var oldPassword = ""
var newPassword: List[String] = Nil

def testAndSet() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Helpers._
class BS3Resources extends StatefulSnippet {

def dispatch = {
case "injectJS" => injectJS
case "injectJS" => injectJS
case "injectCSS" => injectCSS
}

Expand Down
Loading

0 comments on commit a06e389

Please sign in to comment.