Added DontMergeClass and marked DontMergeAttributes as deprecated dur…

…ing confusing name
lift · Jun 25, 2019 · 823f300 · 823f300
1 parent 7308f84
commit 823f300
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/core/util/src/main/scala/net/liftweb/util/CssSel.scala b/core/util/src/main/scala/net/liftweb/util/CssSel.scala
@@ -393,16 +393,19 @@ private class SelectorMap(binds: List[CssBind]) extends Function1[NodeSeq, NodeS
           }
         }
 
-        case x if x.isInstanceOf[EmptyBox] || x == Full(DontMergeAttributes) => {
+        case x if x.isInstanceOf[EmptyBox] ||
+          x == Full(DontMergeClass) ||
+          x == Full(DontMergeAttributes) => {
           val calced = bind.calculate(realE).map(findElemIfThereIsOne _)
+          val skipClassMerge = x == Full(DontMergeClass) || x == Full(DontMergeAttributes)
 
           calced.length match {
             case 0 => NodeSeq.Empty
             case 1 => {
               calced.head match {
                 case Group(g) => g
                 case e: Elem => new Elem(e.prefix,
-                  e.label, mergeAll(e.attributes, false, x == Full(DontMergeAttributes)),
+                  e.label, mergeAll(e.attributes, false, skipClassMerge),
                   e.scope, e.minimizeEmpty, e.child: _*)
                 case x => x
               }
@@ -425,7 +428,7 @@ private class SelectorMap(binds: List[CssBind]) extends Function1[NodeSeq, NodeS
                         id => ids.contains(id)
                       } getOrElse (false)
                       val newIds = targetId filter (_ => keepId) map (i => ids - i) getOrElse (ids)
-                      val newElem = new Elem(e.prefix, e.label, mergeAll(e.attributes, !keepId, x == Full(DontMergeAttributes)), e.scope, e.minimizeEmpty, e.child: _*)
+                      val newElem = new Elem(e.prefix, e.label, mergeAll(e.attributes, !keepId, skipClassMerge), e.scope, e.minimizeEmpty, e.child: _*)
                       (newIds, newElem :: result)
                     }
                     case x => (ids, x :: result)

diff --git a/core/util/src/main/scala/net/liftweb/util/CssSelector.scala b/core/util/src/main/scala/net/liftweb/util/CssSelector.scala
@@ -80,8 +80,10 @@ final case class PrependKidsSubNode() extends SubNode with WithKids {
   def transform(original: NodeSeq, newNs: NodeSeq): NodeSeq = newNs ++ original
 }
 
-final case object DontMergeAttributes extends SubNode {
-  }
+@deprecated("Please use DontMergeClassValue instead.", "3.3.0")
+final case object DontMergeAttributes extends SubNode
+
+final case object DontMergeClass extends SubNode
 
 final case class SurroundKids() extends SubNode with WithKids {
   def transform(original: NodeSeq, newNs: NodeSeq): NodeSeq = {
@@ -253,7 +255,7 @@ object CssSelectorParser extends PackratParsers with ImplicitConversions {
      name => AttrSubNode(name)
    }) |
 
-   ('!' ~ '!' ^^ (a => DontMergeAttributes)) |
+   ('!' ~ '!' ^^ (a => DontMergeClass)) |
    ('<' ~ '*' ~ '>') ^^ (a => SurroundKids()) |
    ('-' ~ '*' ^^ (a => PrependKidsSubNode())) |
    ('>' ~ '*' ^^ (a => PrependKidsSubNode())) |