Permalink
Browse files

Revert "Delimit version in GUID string by a dash."

This reverts commit 1c46530.
  • Loading branch information...
1 parent 1348a66 commit 3188c0c6450fd6e2cd2ac3206e5d7df322b628c4 @fmpwizard fmpwizard committed Aug 31, 2012
@@ -418,11 +418,11 @@ class LiftServlet extends Loggable {
private object AjaxVersions {
def unapply(ajaxPathPart: String) : Option[(String,Int)] = {
- val dash = ajaxPathPart.indexOf("-")
- if (dash > -1 && ajaxPathPart.length > dash + 1)
+ val funcLength = Helpers.nextFuncName.length
+ if (ajaxPathPart.length > funcLength)
Some(
- (ajaxPathPart.substring(0, dash),
- ajaxPathPart.charAt(dash + 1))
+ (ajaxPathPart.substring(0, funcLength),
+ ajaxPathPart.charAt(funcLength))
)
else
None
@@ -186,7 +186,7 @@ object ScriptRenderer {
addPageNameAndVersion: function(url) {
return """ + {
if (LiftRules.enableLiftGC) {
- "url.replace('" + LiftRules.ajaxPath + "', '" + LiftRules.ajaxPath + "/'+lift_page+('-'+liftAjax.lift_ajaxVersion%36).toString(36));"
+ "url.replace('" + LiftRules.ajaxPath + "', '" + LiftRules.ajaxPath + "/'+lift_page+(liftAjax.lift_ajaxVersion % 36).toString(36));"
} else {
"url;"
}

0 comments on commit 3188c0c

Please sign in to comment.