Renamed LiftRules.includeFixedEventAttributesAsDataAttributes_? and a…

…dded configurable attribute-name for "data-lift-removed-attributes", set in LiftRules.removedEventAttributesAttributeName
Fashionbase · Jun 24, 2015 · 33c772c · 33c772c
1 parent ec5ed51
commit 33c772c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftMerge.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftMerge.scala
@@ -203,8 +203,8 @@ private[http] trait LiftMerge {
     def fixElementAndAttributes(element: Elem, attributeToFix: String, fixURL: Boolean, fixedChildren: NodeSeq) = {
       val (id, fixedAttributes, eventAttributes) = fixAttrs(attributeToFix, element.attributes, fixURL)
 
-      val attributesIncludingEventsAsData = if (LiftRules.includeFixedEventAttributesAsDataAttributes_? && eventAttributes.nonEmpty) {
-        new UnprefixedAttribute(s"data-lift-removed-attributes", eventAttributes.map(ea => s"on${ea.eventName}").join(" "), fixedAttributes)
+      val attributesIncludingEventsAsData = if (LiftRules.includeRemovedEventAttributesAsDataAttributes_? && eventAttributes.nonEmpty) {
+        new UnprefixedAttribute(LiftRules.removedEventAttributesAttributeName, eventAttributes.map(ea => s"on${ea.eventName}").join(" "), fixedAttributes)
       } else {
         fixedAttributes
       }

diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
@@ -597,7 +597,9 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
    * }
    * </pre>
    */
-  @volatile var includeFixedEventAttributesAsDataAttributes_? = false
+  @volatile var includeRemovedEventAttributesAsDataAttributes_? = false
+
+  @volatile var removedEventAttributesAttributeName = "data-lift-removed-attributes"
 
   /**
    * The default location to send people if SiteMap access control fails. The path is