Skip to content
This repository
Browse code

* 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
Diego Medina authored July 06, 2012
4  web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
@@ -323,9 +323,9 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
323 323
   @volatile var resourceServerPath = "classpath"
324 324
 
325 325
   /**
326  
-   * Holds the JS library specific UI artifacts. By efault it uses JQuery's artifacts
  326
+   * Holds the JS library specific UI artifacts. By default it uses JQuery's artifacts
327 327
    */
328  
-  @volatile var jsArtifacts: JSArtifacts = JQuery13Artifacts
  328
+  @volatile var jsArtifacts: JSArtifacts = JQueryArtifacts
329 329
 
330 330
   /**
331 331
    * Use this PartialFunction to to automatically add static URL parameters
10  web/webkit/src/main/scala/net/liftweb/http/js/jquery/JQueryArtifacts.scala
@@ -53,7 +53,7 @@ trait JQueryArtifacts extends JSArtifacts {
53 53
   }
54 54
 
55 55
   /**
56  
-   * Shows the element denoinated by id and puts the focus on it
  56
+   * Shows the element denominated by id and puts the focus on it
57 57
    */
58 58
   def showAndFocus(id: String) = JqId(id) ~> new JsMember {
59 59
     def toJsCmd = "show().each(function(i) {var t = this; setTimeout(function() { t.focus(); }, 200);})"
@@ -109,7 +109,7 @@ trait JQueryArtifacts extends JSArtifacts {
109 109
   }
110 110
 
111 111
   /**
112  
-   * Trabsforms a JSON object intoits string representation
  112
+   * Transforms a JSON object in to its string representation
113 113
    */
114 114
   def jsonStringify(in: JsExp): JsExp = new JsExp {
115 115
     def toJsCmd = "JSON.stringify(" + in.toJsCmd + ")"
@@ -133,7 +133,7 @@ trait JQueryArtifacts extends JSArtifacts {
133 133
             info.failFunc.map("error : " + _).toList mkString ("{ ", ", ", " }")
134 134
 }
135 135
 
136  
-@deprecated("Either include your own jQuery or use https://github.com/karma4u101/lift-jquery-module")
  136
+@deprecated("Use JQueryArtifacts in LiftRules and see http://liftweb.net/jquery for more information", "2.5")
137 137
 case object JQuery13Artifacts extends JQueryArtifacts {
138 138
   override def pathRewriter: PartialFunction[List[String], List[String]] = {
139 139
     case "jquery.js" :: Nil if Props.devMode => List("jquery-1.3.2.js")
@@ -141,7 +141,7 @@ case object JQuery13Artifacts extends JQueryArtifacts {
141 141
   }
142 142
 }
143 143
 
144  
-@deprecated("Either include your own jQuery or use https://github.com/karma4u101/lift-jquery-module")
  144
+@deprecated("Use JQueryArtifacts in LiftRules and see http://liftweb.net/jquery for more information", "2.5")
145 145
 case object JQuery14Artifacts extends JQueryArtifacts {
146 146
   override def pathRewriter: PartialFunction[List[String], List[String]] = {
147 147
     case "jquery.js" :: Nil if Props.devMode => List("jquery-1.4.4.js")
@@ -149,4 +149,6 @@ case object JQuery14Artifacts extends JQueryArtifacts {
149 149
   }
150 150
 }
151 151
 
  152
+case object JQueryArtifacts extends JQueryArtifacts
  153
+
152 154
 

0 notes on commit b71a2f2

Please sign in to comment.
Something went wrong with that request. Please try again.