Permalink
Browse files

Revert "Fix issue #1388 - Allow Paginator to send correct page links …

…on ajax"

This reverts commit 8c26903.
  • Loading branch information...
kjozsa authored and fmpwizard committed Jan 8, 2013
1 parent 9f3e187 commit 903c684251932ef867136c084f6c92d904b9b7d4
Showing with 2 additions and 12 deletions.
  1. +1 −7 contributors.md
  2. +1 −5 web/webkit/src/main/scala/net/liftweb/http/Paginator.scala
View
@@ -94,10 +94,4 @@ alexandre at russel dot fr
Ali Salim Rashid
### Email: ###
-a.rashid at zantekk dot com
-
-### Name: ###
-Kristof Jozsa
-
-### Email: ###
-kristof.jozsa at gmail dot com
+a.rashid at zantekk dot com
@@ -187,14 +187,10 @@ trait PaginatorSnippet[T] extends Paginator[T] {
* Sets the default starting record of the page (URL query parameters take precedence over this)
*/
def first_=(f: Long) = _first = f max 0 min (count-1)
- /**
- * Set base URI for pagination when snippet loads
- */
- val paginationBaseUri = S.uri
/**
* Returns a URL used to link to a page starting at the given record offset.
*/
- def pageUrl(offset: Long): String = appendParams(paginationBaseUri, List(offsetParam -> offset.toString))
+ def pageUrl(offset: Long): String = appendParams(S.uri, List(offsetParam -> offset.toString))
/**
* Returns XML that links to a page starting at the given record offset, if the offset is valid and not the current one.
* @param ns The link text, if the offset is valid and not the current offset; or, if that is not the case, the static unlinked text to display

0 comments on commit 903c684

Please sign in to comment.