Use S.appendGlobalJs for JavaScript in XmlOrJsCmd.outSpan

lift · May 3, 2016 · 9dd6829 · 9dd6829
1 parent 147a801
commit 9dd6829
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/web/webkit/src/main/scala/net/liftweb/http/CometActor.scala b/web/webkit/src/main/scala/net/liftweb/http/CometActor.scala
@@ -1444,8 +1444,10 @@ private[http] class XmlOrJsCmd(val id: String,
 
   def inSpan: NodeSeq = xml.openOr(Text("")) ++ javaScript.map(s => Script(s)).openOr(Text(""))
 
-  def outSpan: NodeSeq = Script(Run("var destroy_" + id + " = function() {" + (destroy.openOr(JsCmds.Noop).toJsCmd) + "}")) ++
+  def outSpan: NodeSeq = {
+    S.appendGlobalJs(Run("var destroy_" + id + " = function() {" + (destroy.openOr(JsCmds.Noop).toJsCmd) + "}"))
     fixedXhtml.openOr(Text(""))
+  }
 }
 
 /**

diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
@@ -614,7 +614,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
    *
    * {{{
    * <span id="lift-event-js-F827001738725NKMEQNF"
-   *       data-lift=removed-attributes="onclick">Do something!</span>
+   *       data-lift-removed-attributes="onclick">Do something!</span>
    * }}}
    *
    * This makes it possible to replace the old CSS with with similar

diff --git a/web/webkit/src/main/scala/net/liftweb/http/SecurityRules.scala b/web/webkit/src/main/scala/net/liftweb/http/SecurityRules.scala
@@ -111,7 +111,7 @@ object ContentSourceRestriction {
   }
   /**
    * Indicates content from the given host path is allowed. See the
-   * `Content-Security-Policy` spec's [[http://www.w3.org/TR/CSP/#matching
+   * `Content-Security-Policy` spec's [[https://www.w3.org/TR/CSP/#source-list-path-patching
    * matching rules for `host-source`]] for more about what this can look
    * like.
    *