Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Fashionbase/framework
...
head fork: lift/framework
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
2  core/common/src/main/scala/net/liftweb/common/LRU.scala
@@ -34,7 +34,6 @@ private[common] trait LinkedListElem[T1, T2] {
what._prev = this
_next._prev = what
this._next = what
- what
}
private[common] def addAtTail(what: LinkedListElem[T1, T2]) {
@@ -42,7 +41,6 @@ private[common] trait LinkedListElem[T1, T2] {
what._next = this
_prev._next = what
this._prev = what
- what
}
}
View
4 core/json/src/main/scala/net/liftweb/json/Xml.scala
@@ -187,7 +187,7 @@ object Xml {
}
}
- private[json] class XmlNode(name: String, children: Seq[Node]) extends Elem(null, name, xml.Null, TopScope, children :_*)
+ private[json] class XmlNode(name: String, children: Seq[Node]) extends Elem(null, name, xml.Null, TopScope, true, children :_*)
- private[json] class XmlElem(name: String, value: String) extends Elem(null, name, xml.Null, TopScope, Text(value))
+ private[json] class XmlElem(name: String, value: String) extends Elem(null, name, xml.Null, TopScope, true, Text(value))
}
View
6 web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
@@ -424,7 +424,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
val ret: Box[String] =
for{
url <- Box !! LiftRules.getClass.getResource("/" + cn + ".class")
- val newUrl = new java.net.URL(url.toExternalForm.split("!")(0) + "!" + "/META-INF/MANIFEST.MF")
+ newUrl = new java.net.URL(url.toExternalForm.split("!")(0) + "!" + "/META-INF/MANIFEST.MF")
str <- tryo(new String(readWholeStream(newUrl.openConnection.getInputStream), "UTF-8"))
ma <- """Implementation-Version: (.*)""".r.findFirstMatchIn(str)
} yield ma.group(1)
@@ -437,7 +437,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
val ret: Box[Date] =
for{
url <- Box !! LiftRules.getClass.getResource("/" + cn + ".class")
- val newUrl = new java.net.URL(url.toExternalForm.split("!")(0) + "!" + "/META-INF/MANIFEST.MF")
+ newUrl = new java.net.URL(url.toExternalForm.split("!")(0) + "!" + "/META-INF/MANIFEST.MF")
str <- tryo(new String(readWholeStream(newUrl.openConnection.getInputStream), "UTF-8"))
ma <- """Built-Time: (.*)""".r.findFirstMatchIn(str)
asLong <- asLong(ma.group(1))
@@ -926,7 +926,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
val sm = smf()
_sitemap = Full(sm)
for (menu <- sm.menus;
- val loc = menu.loc;
+ loc = menu.loc;
rewrite <- loc.rewritePF) LiftRules.statefulRewrite.append(PerRequestPF(rewrite))
_sitemap
View
2  web/webkit/src/main/scala/net/liftweb/http/S.scala
@@ -541,7 +541,7 @@ trait S extends HasParams with Loggable {
// TODO: Is this used anywhere? - DCB
def templateFromTemplateAttr: Box[NodeSeq] =
for (templateName <- attr("template") ?~ "Template Attribute missing";
- val tmplList = templateName.roboSplit("/");
+ tmplList = templateName.roboSplit("/");
template <- Templates(tmplList) ?~
"couldn't find template") yield template
View
18 web/webkit/src/main/scala/net/liftweb/http/SHtml.scala
@@ -101,9 +101,8 @@ trait SHtml {
def applyToAllElems(in: Seq[Node], elemAttrs: Seq[ElemAttr]): Seq[Node] = in map {
case Group(ns) => Group(applyToAllElems(ns, elemAttrs))
case e: Elem => val updated = elemAttrs.foldLeft(e)((e, f) => f(e))
-
new Elem(updated.prefix, updated.label,
- updated.attributes, updated.scope,
+ updated.attributes, updated.scope, updated.minimizeEmpty,
applyToAllElems(updated.child, elemAttrs) :_*)
case n => n
}
@@ -370,6 +369,7 @@ trait SHtml {
latestElem.label,
latestElem.attributes,
latestElem.scope,
+ latestElem.minimizeEmpty,
f(this)(latestKids) :_*)
def setHtml(): JsCmd = SetHtml(latestId, f(this)(latestKids))
@@ -1017,7 +1017,7 @@ trait SHtml {
(elem \ "@onblur").toList match {
case Nil => elem % ("onblur" -> blurCmd)
case x :: xs => val attrs = elem.attributes.filter(_.key != "onblur")
- Elem(elem.prefix, elem.label, new UnprefixedAttribute("onblur", Text(blurCmd + x.text), attrs), elem.scope, elem.child: _*)
+ Elem(elem.prefix, elem.label, new UnprefixedAttribute("onblur", Text(blurCmd + x.text), attrs), elem.scope, elem.minimizeEmpty, elem.child: _*)
}
}
@@ -1088,6 +1088,7 @@ trait SHtml {
case _ => true
}),
elem.scope,
+ elem.minimizeEmpty,
elem.child :_*)
}
@@ -1138,7 +1139,7 @@ trait SHtml {
funcName+"=_"),
meta)
- }, e.scope, e.child :_*)
+ }, e.scope, e.minimizeEmpty, e.child :_*)
}
}
@@ -1198,7 +1199,7 @@ trait SHtml {
cmd,
meta)
- }, e.scope, e.child :_*)
+ }, e.scope, e.minimizeEmpty, e.child :_*)
}
@@ -1685,7 +1686,7 @@ trait SHtml {
}
new Elem(e.prefix, e.label,
- newMeta, e.scope, e.child :_*) % ("id" -> id) %
+ newMeta, e.scope, e.minimizeEmpty, e.child :_*) % ("id" -> id) %
("action" -> "javascript://") %
("onsubmit" ->
(SHtml.makeAjaxCall(LiftRules.jsArtifacts.serialize(id)).toJsCmd +
@@ -2187,8 +2188,9 @@ trait SHtml {
}
-object AjaxType extends Enumeration("javascript", "json") {
- val JavaScript, JSON = Value
+object AjaxType extends Enumeration {
+ val JavaScript = Value("javascript")
+ val JSON = Value("json")
}
object AjaxContext {

No commit comments for this range

Something went wrong with that request. Please try again.