diff --git a/web/webkit/src/main/scala/net/liftweb/http/CssBoundLiftScreen.scala b/web/webkit/src/main/scala/net/liftweb/http/CssBoundLiftScreen.scala index e25042fae7..f935e5a398 100644 --- a/web/webkit/src/main/scala/net/liftweb/http/CssBoundLiftScreen.scala +++ b/web/webkit/src/main/scala/net/liftweb/http/CssBoundLiftScreen.scala @@ -32,10 +32,6 @@ trait CssBoundLiftScreen extends LiftScreen with CssBoundScreen { override lazy val __nameSalt = Helpers.nextFuncName } - protected object NextId extends TransientRequestVar[String]("") { - override lazy val __nameSalt = Helpers.nextFuncName - } - protected object PrevId extends TransientRequestVar[Box[String]](Empty) { override lazy val __nameSalt = Helpers.nextFuncName } diff --git a/web/webkit/src/main/scala/net/liftweb/http/CssBoundScreen.scala b/web/webkit/src/main/scala/net/liftweb/http/CssBoundScreen.scala index 2b43bde3d5..fe79ccdc10 100644 --- a/web/webkit/src/main/scala/net/liftweb/http/CssBoundScreen.scala +++ b/web/webkit/src/main/scala/net/liftweb/http/CssBoundScreen.scala @@ -39,7 +39,8 @@ trait CssBoundScreen extends ScreenWizardRendered { protected val LocalAction: AnyVar[String, _] = vendAVar[String]("") - protected val NextId: AnyVar[String, _] + val NextId: AnyVar[String, _] + protected val PrevId: AnyVar[Box[String], _] protected val CancelId: AnyVar[String, _] diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala index 3efd4521db..78aed2d534 100644 --- a/web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala +++ b/web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala @@ -1358,6 +1358,10 @@ trait LiftScreen extends AbstractScreen with StatefulSnippet with ScreenWizardRe override lazy val __nameSalt = Helpers.nextFuncName } + object NextId extends TransientRequestVar[String](Helpers.nextFuncName) { + override lazy val __nameSalt = Helpers.nextFuncName + } + /** * What to do when the Screen is done. By default, will * do a redirect back to Whence, but you can change this behavior, @@ -1467,7 +1471,7 @@ trait LiftScreen extends AbstractScreen with StatefulSnippet with ScreenWizardRe } protected def renderHtml(): NodeSeq = { - val finishId = Helpers.nextFuncName + val finishId = NextId.get val cancelId = Helpers.nextFuncName val theScreen = this