jquery-bootstrap-pagination 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fe90a359d24b67688cad8fc478e711e6d833e7e
-  data.tar.gz: 18df3798a64479c3a6dde1b4947f81cfc5181771
+  metadata.gz: fa901f4f244d5d5c664df752adda4a4657c8129f
+  data.tar.gz: b9af6375f692acd96716344ab279dc25e578a6c4
 SHA512:
-  metadata.gz: abcadac0c5f4d0da8664e748cac09086d817c4b23ec6dae8f1d6632147b76d5406639074451a3aad0ad0ad1637d3b2955e53a6a13bf885b5d48ab57bbe5b7e24
-  data.tar.gz: 20cd02574649b743a7f77230c91f4b6091fd59edf050e529f11e2c3e13b86bbbb77d1d1c6116b20b619c637442f18fe3b89d4a68197d65fed23a0352b08bdbf0
+  metadata.gz: 50138ccce52f55c99680e1022c2c72cd300c9963e8e6769acf741f76d9042f380468b9339f039e25fdfd0e6f50d3033eddb646f98aa0189b9f6bb4994a88fe61
+  data.tar.gz: 7a5cd2aa11ade9416f27e35bd30008d2e8e2b061dd037e2a28260fa50ae779215a86df00cb4081fc9cd91d3111bc1f5f11183ddfb3564f1320b34767002b3494

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jquery-bootstrap-pagination (1.0.4)
+    jquery-bootstrap-pagination (1.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -94,6 +94,8 @@ last: false
 display_max: 8
 # render nothing if there is only 1 page:
 ignore_single_page: true
+# disable turbolinks:
+no_turbolink: false
 ```
 
 ## Contributing
@@ -104,3 +106,9 @@ ignore_single_page: true
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
+
+## Contributors
+
+* Mark Bates
+* Eric Wollesen
+* Clinton Blackburn

data/lib/jquery-bootstrap-pagination/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Bootstrap
     module Pagination
-      VERSION = "1.1.0"
+      VERSION = "1.2.0"
     end
   end
 end

data/spec/javascripts/jquery-bootstrap-pagination_spec.coffee

@@ -78,6 +78,12 @@ describe "pagination", ->
       expect(links[2]).toEqual("<li><a href='#' data-page='2'>2</a></li>")
       expect(links[3]).toEqual("<li><a href='#' data-page='3'>3</a></li>")
       
+    it "disables turbolinks (if requested)", ->
+      @view.settings.prev = "prev"
+      @view.settings.current_page = 2
+      @view.settings.no_turbolink = true
+      links = @view.buildLinks()
+      expect(links[0]).toEqual("<li><a href='#' data-page='1' data-no-turbolink='1'>prev</a></li>")
 
   describe "render", ->
     
@@ -256,6 +262,164 @@ describe "pagination", ->
         </div>
       """)
 
+
+  describe "change", ->
+
+    it "re-renders the pagination links", ->
+      @view.settings.total_pages = 50
+      @view.settings.current_page = 2
+      @view.render()
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="active"><a href="#" data-page="2">2</a></li>
+        <li><a href="#" data-page="3">3</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li><a href="#" data-page="8">8</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+      @view.change(8)
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li class="active"><a href="#" data-page="8">8</a></li>
+        <li><a href="#" data-page="9">9</a></li>
+        <li><a href="#" data-page="10">10</a></li>
+        <li><a href="#" data-page="11">11</a></li>
+        <li><a href="#" data-page="12">12</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+
+    it "doesn't re-render if page > total_pages (invalid)", ->
+      @view.settings.total_pages = 50
+      @view.settings.current_page = 2
+      @view.render()
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="active"><a href="#" data-page="2">2</a></li>
+        <li><a href="#" data-page="3">3</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li><a href="#" data-page="8">8</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+      @view.change(51)
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="active"><a href="#" data-page="2">2</a></li>
+        <li><a href="#" data-page="3">3</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li><a href="#" data-page="8">8</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+
+    it "doesn't re-render if page < 1 (invalid)", ->
+      @view.settings.total_pages = 50
+      @view.settings.current_page = 2
+      @view.render()
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="active"><a href="#" data-page="2">2</a></li>
+        <li><a href="#" data-page="3">3</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li><a href="#" data-page="8">8</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+      @view.change(0)
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="active"><a href="#" data-page="2">2</a></li>
+        <li><a href="#" data-page="3">3</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li><a href="#" data-page="8">8</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+
+    it "doesn't re-render if there's no change in page", ->
+      @view.settings.total_pages = 50
+      @view.settings.current_page = 2
+      @view.render()
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="active"><a href="#" data-page="2">2</a></li>
+        <li><a href="#" data-page="3">3</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li><a href="#" data-page="8">8</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+      @view.change(2)
+      expect(@page.html()).toEqual("""
+        <div class="jquery-bootstrap-pagination pagination">
+        <ul>
+        <li><a href="#" data-page="1">1</a></li>
+        <li class="active"><a href="#" data-page="2">2</a></li>
+        <li><a href="#" data-page="3">3</a></li>
+        <li><a href="#" data-page="4">4</a></li>
+        <li><a href="#" data-page="5">5</a></li>
+        <li><a href="#" data-page="6">6</a></li>
+        <li><a href="#" data-page="7">7</a></li>
+        <li><a href="#" data-page="8">8</a></li>
+        <li class="disabled"><a href="#" data-page="..">..</a></li>
+        <li><a href="#" data-page="50">50</a></li>
+        </ul>
+        </div>
+      """)
+
   describe "pages", ->
 
     describe "less than or equal to 10 pages", ->

data/src/jquery-bootstrap-pagination.coffee

@@ -42,6 +42,8 @@
         display_max: 8
         # render nothing if there is only 1 page:
         ignore_single_page: true
+        # disable turbolinks
+        no_turbolink: false
 
       # merge defaults with passed in options:
       @settings = $.extend(defaults, options)
@@ -83,8 +85,16 @@
       return links
 
     # build the `li` element for the link:
-    buildLi: (page, text = page)=>
-      "<li><a href='#' data-page='#{page}'>#{text}</a></li>"
+    buildLi: (page, text = page) =>
+      "<li>#{@buildLink(page, text)}</li>"
+
+    # build the link element
+    buildLink: (page, text = page) =>
+      if @settings.no_turbolink
+        data_attr = " data-no-turbolink='1'"
+      else
+        data_attr = ""
+      "<a href='#' data-page='#{page}'#{data_attr}>#{text}</a>"
 
     # returns an array of all of the 'pages' in the pagination:
     pages: =>
@@ -163,16 +173,28 @@
       if @settings.current_page is @settings.total_pages and @settings.last
         $("li:last", @el).removeClass("active").addClass("disabled")
 
+    isValidPage: (page) =>
+      page > 0 and \
+        page isnt @settings.current_page and \
+        page <= @settings.total_pages
+
     # called when a link is clicked in the pagination list:
     clicked: (event) =>
       page = parseInt($(event.target).attr("data-page"))
+      return unless @isValidPage(page)
       # if there is a callback registered, then call it
       # passing the original event and the page number that was clicked:
       if @settings.callback?
         @settings.callback(event, page)
+      @change(page)
+
+    change: (page) =>
+      page = parseInt(page)
+      return unless @isValidPage(page)
       # set the current page to the clicked page:
       @settings.current_page = page
       # re-render the pagination information to reflect the newly
-      # clicked page:
+      # current page:
       @render()
+
 )(jQuery)

data/vendor/assets/javascripts/jquery-bootstrap-pagination.js

@@ -29,9 +29,12 @@
         var defaults;
 
         this.el = el;
+        this.change = __bind(this.change, this);
         this.clicked = __bind(this.clicked, this);
+        this.isValidPage = __bind(this.isValidPage, this);
         this.render = __bind(this.render, this);
         this.pages = __bind(this.pages, this);
+        this.buildLink = __bind(this.buildLink, this);
         this.buildLi = __bind(this.buildLi, this);
         this.buildLinks = __bind(this.buildLinks, this);
         defaults = {
@@ -42,7 +45,8 @@
           first: false,
           last: false,
           display_max: 8,
-          ignore_single_page: true
+          ignore_single_page: true,
+          no_turbolink: false
         };
         this.settings = $.extend(defaults, options);
         if ($(document).on) {
@@ -82,7 +86,21 @@
         if (text == null) {
           text = page;
         }
-        return "<li><a href='#' data-page='" + page + "'>" + text + "</a></li>";
+        return "<li>" + (this.buildLink(page, text)) + "</li>";
+      };
+
+      PaginationView.prototype.buildLink = function(page, text) {
+        var data_attr;
+
+        if (text == null) {
+          text = page;
+        }
+        if (this.settings.no_turbolink) {
+          data_attr = " data-no-turbolink='1'";
+        } else {
+          data_attr = "";
+        }
+        return "<a href='#' data-page='" + page + "'" + data_attr + ">" + text + "</a>";
       };
 
       PaginationView.prototype.pages = function() {
@@ -162,13 +180,28 @@
         }
       };
 
+      PaginationView.prototype.isValidPage = function(page) {
+        return page > 0 && page !== this.settings.current_page && page <= this.settings.total_pages;
+      };
+
       PaginationView.prototype.clicked = function(event) {
         var page;
 
         page = parseInt($(event.target).attr("data-page"));
+        if (!this.isValidPage(page)) {
+          return;
+        }
         if (this.settings.callback != null) {
           this.settings.callback(event, page);
         }
+        return this.change(page);
+      };
+
+      PaginationView.prototype.change = function(page) {
+        page = parseInt(page);
+        if (!this.isValidPage(page)) {
+          return;
+        }
         this.settings.current_page = page;
         return this.render();
       };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-bootstrap-pagination
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mark Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies: []
 description: A simple and clean pagination implementation for jQuery and Twitter Bootstrap.
 email: