Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* When I deprecated JQuery13Artifacts and JQuery14Artifacts I did not…

… add a

replacement Artifact for jQuery (which tells Lift how to do comet/ajax and a few other things)
** Added a case object JQueryArtifacts which simply extends the JQueryArtifacts trait.
** Modified the default JsArtifact in LiftRules ro use the new case obejct for jQuery
*** Minor spelling fixes.
  • Loading branch information...
commit b71a2f247bcb98c749510d8fa1280ca67c3ab4c4 1 parent 868d993
@fmpwizard fmpwizard authored
View
4 web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
@@ -323,9 +323,9 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
@volatile var resourceServerPath = "classpath"
/**
- * Holds the JS library specific UI artifacts. By efault it uses JQuery's artifacts
+ * Holds the JS library specific UI artifacts. By default it uses JQuery's artifacts
*/
- @volatile var jsArtifacts: JSArtifacts = JQuery13Artifacts
+ @volatile var jsArtifacts: JSArtifacts = JQueryArtifacts
/**
* Use this PartialFunction to to automatically add static URL parameters
View
10 web/webkit/src/main/scala/net/liftweb/http/js/jquery/JQueryArtifacts.scala
@@ -53,7 +53,7 @@ trait JQueryArtifacts extends JSArtifacts {
}
/**
- * Shows the element denoinated by id and puts the focus on it
+ * Shows the element denominated by id and puts the focus on it
*/
def showAndFocus(id: String) = JqId(id) ~> new JsMember {
def toJsCmd = "show().each(function(i) {var t = this; setTimeout(function() { t.focus(); }, 200);})"
@@ -109,7 +109,7 @@ trait JQueryArtifacts extends JSArtifacts {
}
/**
- * Trabsforms a JSON object intoits string representation
+ * Transforms a JSON object in to its string representation
*/
def jsonStringify(in: JsExp): JsExp = new JsExp {
def toJsCmd = "JSON.stringify(" + in.toJsCmd + ")"
@@ -133,7 +133,7 @@ trait JQueryArtifacts extends JSArtifacts {
info.failFunc.map("error : " + _).toList mkString ("{ ", ", ", " }")
}
-@deprecated("Either include your own jQuery or use https://github.com/karma4u101/lift-jquery-module")
+@deprecated("Use JQueryArtifacts in LiftRules and see http://liftweb.net/jquery for more information", "2.5")
case object JQuery13Artifacts extends JQueryArtifacts {
override def pathRewriter: PartialFunction[List[String], List[String]] = {
case "jquery.js" :: Nil if Props.devMode => List("jquery-1.3.2.js")
@@ -141,7 +141,7 @@ case object JQuery13Artifacts extends JQueryArtifacts {
}
}
-@deprecated("Either include your own jQuery or use https://github.com/karma4u101/lift-jquery-module")
+@deprecated("Use JQueryArtifacts in LiftRules and see http://liftweb.net/jquery for more information", "2.5")
case object JQuery14Artifacts extends JQueryArtifacts {
override def pathRewriter: PartialFunction[List[String], List[String]] = {
case "jquery.js" :: Nil if Props.devMode => List("jquery-1.4.4.js")
@@ -149,4 +149,6 @@ case object JQuery14Artifacts extends JQueryArtifacts {
}
}
+case object JQueryArtifacts extends JQueryArtifacts
+
Please sign in to comment.
Something went wrong with that request. Please try again.