javaScriptSettings returns Box[LiftSession=>JsObj]

We remove autoIncludeJSSettings in favor of an Empty Box
returned from javaScriptSettings; we also fix the
capitalization of javaScriptSettings (it was
javascriptSettings).

web/webkit/src/main/scala/net/liftweb/http/LiftMerge.scala

@@ -34,10 +34,9 @@ private[http] trait LiftMerge {
   // Gather all page-specific JS into one JsCmd.
   private def assemblePageSpecificJavaScript: JsCmd = {
     val allJs =
-      Some(LiftRules.autoIncludeJSSettings.vend().apply(this)).collect {
-        case true =>
-          LiftJavaScript.initCmd(LiftRules.javascriptSettings.vend().apply(this))
-      } ++
+      LiftRules.javaScriptSettings.vend().map { settingsFn =>
+        LiftJavaScript.initCmd(settingsFn(this))
+      }.toList ++
       S.jsToAppend
 
     allJs.foldLeft(js.JsCmds.Noop)(_ & _)

web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala

@@ -1573,16 +1573,11 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
   new FactoryMaker(() => () => (session: LiftSession) => true) {}
 
   /**
-   * Tells Lift if the Ajax/Comet JavaScript should be initialized with LiftRules via LiftJavaScript
+   * Tells Lift which JavaScript settings to use. If Empty, does not
+   * include the JS settings.
    */
-  val autoIncludeJSSettings: FactoryMaker[() => LiftSession => Boolean] =
-  new FactoryMaker(() => () => (session: LiftSession) => true) {}
-
-  /**
-   * Tells Lift which JavaScript settings to use.
-   */
-  val javascriptSettings: FactoryMaker[() => LiftSession => JsObj] =
-  new FactoryMaker(() => () => (session: LiftSession) => LiftJavaScript.settings) {}
+  val javaScriptSettings: FactoryMaker[() => Box[LiftSession => JsObj]] =
+  new FactoryMaker(() => () => (Full((session: LiftSession) => LiftJavaScript.settings): Box[LiftSession => JsObj])) {}
 
   /**
    * Define the XHTML validator