livelist-rails 0.0.10 → 0.0.11

data/app/assets/javascripts/livelist.coffee

@@ -4,55 +4,45 @@ class window.Utilities
 
 class window.LiveList extends Utilities
   constructor: (options) ->
-    @globalOptions.listSelector = options.list.renderTo
-    @globalOptions.eventName    = "livelist:#{options.global.resourceName}"
-    @globalOptions.urlPrefix    = "/#{options.global.resourceName}"
-
-    @setOptions(options.global, @globalOptions)
-
-    @search     = new Search(@globalOptions, options.search)
-    @filters    = new Filters(@globalOptions, options.filters)
-    @pagination = new Pagination(@globalOptions, options.pagination)
-    @list       = new List(@search, @filters, @pagination, @globalOptions, options.list)
-
-  globalOptions:
-    data: null
-    resourceName: 'items'
-    resourceNameSingular: 'item'
+    @listSelector         = options.list.renderTo
+    @resourceName         = options.global.resourceName
+    @resourceNameSingular = options.global.resourceNameSingular
+    @eventName            = "livelist:#{@resourceName}"
+    @urlPrefix            = "/#{@resourceName}"
+    @search               = new Search(options.search, @)
+    @filters              = new Filters(options.filters, @)
+    @pagination           = new Pagination(options.pagination, @)
+    @list                 = new List(options.list, @)
 
 class window.List extends Utilities
-  constructor: (search, filters, pagination, globalOptions, options = {}) ->
-    @data         = globalOptions.data
+  constructor: (options, livelist) ->
     @fetchRequest = null
-    @search       = search
-    @filters      = filters
-    @pagination   = pagination
+    @livelist     = livelist
 
-    @setOptions(globalOptions)
-    @listTemplate            = "{{##{@resourceName}}}{{>#{@resourceNameSingular}}}{{/#{@resourceName}}}"
+    @listTemplate            = "{{##{@livelist.resourceName}}}{{>#{@livelist.resourceNameSingular}}}{{/#{@livelist.resourceName}}}"
     @listItemTemplate        = '<li>{{id}}</li>'
     @fetchingIndicationClass = 'updating'
-    @setOptions(options)
+    @renderTo                = "ul##{@livelist.resourceName}"
 
-    $(@renderTo).bind(@eventName, (event, params) => @fetch(presets: null, page: params?.page))
+    @setOptions(options)
 
-    presets = @filters.presets()
-    @fetch(presets: presets)
+    $(@renderTo).bind(@livelist.eventName, (event, params) => @fetch(presets: null, page: params?.page))
+    @fetch(presets: @livelist.filters.getPresets())
 
   displayFetchingIndication: => $(@renderTo).addClass(@fetchingIndicationClass)
   removeFetchingIndication:  => $(@renderTo).removeClass(@fetchingIndicationClass)
 
   renderIndex: (data, textStatus, jqXHR) =>
-    @data = data
+    @livelist.data = data
     @render()
-    @pagination.render(@data)
-    @filters.render(@data)
+    @livelist.pagination.render(@livelist.data)
+    @livelist.filters.render(@livelist.data)
 
   fetch: (options) ->
     @fetchRequest.abort() if @fetchRequest
-    searchTerm = @search.searchTerm()
+    searchTerm = @livelist.search.searchTerm()
     params = {}
-    params.filters = @filters.setPresets(options.presets)
+    params.filters = @livelist.filters.setPresets(options.presets)
 
     if searchTerm
       params.q = searchTerm
@@ -60,37 +50,38 @@ class window.List extends Utilities
       params.page = options.page
 
     @fetchRequest = $.ajax(
-      url         : @urlPrefix
+      url         : @livelist.urlPrefix
+      type        : @livelist.httpMethod
       dataType    : 'json'
       data        : params
-      type        : @httpMethod
       beforeSend  : @displayFetchingIndication
       success     : @renderIndex
     )
 
   render: ->
     partials = {}
-    partials[@resourceNameSingular] = @listItemTemplate
-    listHTML = Mustache.to_html(@listTemplate, @data, partials)
+    partials[@livelist.resourceNameSingular] = @listItemTemplate
+    listHTML = Mustache.to_html(@listTemplate, @livelist.data, partials)
     $(@renderTo).html( listHTML )
     @removeFetchingIndication()
 
 window.LiveList.version = '0.0.5'
 
 class window.Filters extends Utilities
-  constructor: (globalOptions, options = {}) ->
-    @setOptions(globalOptions)
+  constructor: (options, livelist) ->
+    @livelist = livelist
     @filters = if options.presets then _.keys(options.presets) else []
     @initializeCookies()
     @setOptions(options)
-    $('input.filter_option', @renderTo).live( 'change', => $(@listSelector).trigger(@eventName) )
+
+    $('input.filter_option', @renderTo).live( 'change', => $(@livelist.listSelector).trigger(@livelist.eventName) )
     $(@advancedOptionsToggleSelector).click(@handleAdvancedOptionsClick)
 
   initializeCookies: ->
     if jQuery.cookie && @useCookies && @cookieName
       @cookieName = 'livelist_filter_presets'
 
-  presets: ->
+  getPresets: ->
     cookie = jQuery.cookie(@cookieName) if jQuery.cookie && @useCookies
     if @useCookies && cookie
       JSON.parse(cookie)
@@ -101,7 +92,7 @@ class window.Filters extends Utilities
     filters = {}
     if jQuery.isEmptyObject(presets)
       filters = @selections()
-      @setCookie() if jQuery.cookie
+      @setCookie(filters) if jQuery.cookie
     else
       filters = presets
     filters
@@ -151,11 +142,25 @@ class window.Filters extends Utilities
       )
     )
 
+  sortOptions: (filters) ->
+    _.map( filters, (filter) ->
+      filter.options = _.sortBy( filter.options, (option) -> option.name)
+      filter
+    )
+
+  sort: (filters) ->
+    _.sortBy( filters, (filter) -> filter.name )
+
   render: (data) ->
+    #What is this for?
     @filters = _.pluck( data.filters, 'filter_slug' )
+
+    @sort(data.filters)
+    @sortOptions(data.filters)
+
     filtersHTML = Mustache.to_html(@template, data)
     $(@renderTo).html( filtersHTML )
-    if @noFiltersSelected(data) && data[@resourceName].length > 0
+    if @noFiltersSelected(data) && data[@livelist.resourceName].length > 0
       $('input[type="checkbox"]', @renderTo).attr('checked', 'checked')
 
 
@@ -164,12 +169,12 @@ class window.Filters extends Utilities
     $(@renderTo).slideToggle()
 
 class window.Pagination extends Utilities
-  constructor: (globalOptions, options = {}) ->
+  constructor: (options, livelist) ->
+    @livelist = livelist
     @pagination = null
     @maxPages   = 30
 
-    @setOptions(globalOptions)
-    @emptyListMessage = "<p>No #{@resourceName} matched your filter criteria</p>"
+    @emptyListMessage = "<p>No #{@livelist.resourceName} matched your filter criteria</p>"
     @setOptions(options)
 
     $("#{@renderTo} a").live( 'click', (event) -> event.preventDefault() )
@@ -201,13 +206,13 @@ class window.Pagination extends Utilities
   '''
 
   pagesJSON: (currentPage, totalPages) ->
-    groupSize = @maxPages / 2
-    firstPage = if currentPage < groupSize then 1 else currentPage - groupSize
+    groupSize = Math.floor(@maxPages / 2)
+    firstPage = if currentPage <= groupSize then 1 else currentPage - groupSize
     previousPage = firstPage + groupSize * 2 - 1
     lastPage  = if previousPage >= totalPages then totalPages else previousPage
     _.map([firstPage..lastPage], (page) ->
       page: page
-      currentPage: -> currentPage is page
+      currentPage: currentPage is page
     )
 
   paginationJSON: (pagination) ->
@@ -217,7 +222,7 @@ class window.Pagination extends Utilities
       currentPage      : pagination.current_page
       nextPage         : pagination.next_page
       previousPage     : pagination.previous_page
-      urlPrefix        : @urlPrefix
+      urlPrefix        : @livelist.urlPrefix
       pages            : @pagesJSON(pagination.current_page, pagination.total_pages)
     }
 
@@ -228,11 +233,11 @@ class window.Pagination extends Utilities
 
   handlePaginationLinkClick: (event) =>
     event.preventDefault()
-    $(@listSelector).trigger(@eventName, {page: $(event.target).data('page')})
+    $(@livelist.listSelector).trigger(@livelist.eventName, {page: $(event.target).data('page')})
 
 class window.Search extends Utilities
-  constructor: (globalOptions, options = {}) ->
-    @setOptions(globalOptions)
+  constructor: (options, livelist) ->
+    @livelist = livelist
     @setOptions(options)
     $(@formSelector).submit( (event) => @handleSearchFormSubmit(event) )
 
@@ -242,4 +247,4 @@ class window.Search extends Utilities
 
   handleSearchFormSubmit: (event) =>
     event.preventDefault()
-    $(@listSelector).trigger(@eventName)
+    $(@livelist.listSelector).trigger(@livelist.eventName)

data/app/assets/javascripts/livelist.js

@@ -26,22 +26,17 @@
     __extends(LiveList, _super);
 
     function LiveList(options) {
-      this.globalOptions.listSelector = options.list.renderTo;
-      this.globalOptions.eventName = "livelist:" + options.global.resourceName;
-      this.globalOptions.urlPrefix = "/" + options.global.resourceName;
-      this.setOptions(options.global, this.globalOptions);
-      this.search = new Search(this.globalOptions, options.search);
-      this.filters = new Filters(this.globalOptions, options.filters);
-      this.pagination = new Pagination(this.globalOptions, options.pagination);
-      this.list = new List(this.search, this.filters, this.pagination, this.globalOptions, options.list);
+      this.listSelector = options.list.renderTo;
+      this.resourceName = options.global.resourceName;
+      this.resourceNameSingular = options.global.resourceNameSingular;
+      this.eventName = "livelist:" + this.resourceName;
+      this.urlPrefix = "/" + this.resourceName;
+      this.search = new Search(options.search, this);
+      this.filters = new Filters(options.filters, this);
+      this.pagination = new Pagination(options.pagination, this);
+      this.list = new List(options.list, this);
     }
 
-    LiveList.prototype.globalOptions = {
-      data: null,
-      resourceName: 'items',
-      resourceNameSingular: 'item'
-    };
-
     return LiveList;
 
   })(Utilities);
@@ -50,32 +45,26 @@
 
     __extends(List, _super);
 
-    function List(search, filters, pagination, globalOptions, options) {
-      var presets,
-        _this = this;
-      if (options == null) options = {};
+    function List(options, livelist) {
       this.renderIndex = __bind(this.renderIndex, this);
       this.removeFetchingIndication = __bind(this.removeFetchingIndication, this);
       this.displayFetchingIndication = __bind(this.displayFetchingIndication, this);
-      this.data = globalOptions.data;
+      var _this = this;
       this.fetchRequest = null;
-      this.search = search;
-      this.filters = filters;
-      this.pagination = pagination;
-      this.setOptions(globalOptions);
-      this.listTemplate = "{{#" + this.resourceName + "}}{{>" + this.resourceNameSingular + "}}{{/" + this.resourceName + "}}";
+      this.livelist = livelist;
+      this.listTemplate = "{{#" + this.livelist.resourceName + "}}{{>" + this.livelist.resourceNameSingular + "}}{{/" + this.livelist.resourceName + "}}";
       this.listItemTemplate = '<li>{{id}}</li>';
       this.fetchingIndicationClass = 'updating';
+      this.renderTo = "ul#" + this.livelist.resourceName;
       this.setOptions(options);
-      $(this.renderTo).bind(this.eventName, function(event, params) {
+      $(this.renderTo).bind(this.livelist.eventName, function(event, params) {
         return _this.fetch({
           presets: null,
           page: params != null ? params.page : void 0
         });
       });
-      presets = this.filters.presets();
       this.fetch({
-        presets: presets
+        presets: this.livelist.filters.getPresets()
       });
     }
 
@@ -88,25 +77,25 @@
     };
 
     List.prototype.renderIndex = function(data, textStatus, jqXHR) {
-      this.data = data;
+      this.livelist.data = data;
       this.render();
-      this.pagination.render(this.data);
-      return this.filters.render(this.data);
+      this.livelist.pagination.render(this.livelist.data);
+      return this.livelist.filters.render(this.livelist.data);
     };
 
     List.prototype.fetch = function(options) {
       var params, searchTerm;
       if (this.fetchRequest) this.fetchRequest.abort();
-      searchTerm = this.search.searchTerm();
+      searchTerm = this.livelist.search.searchTerm();
       params = {};
-      params.filters = this.filters.setPresets(options.presets);
+      params.filters = this.livelist.filters.setPresets(options.presets);
       if (searchTerm) params.q = searchTerm;
       if (options.page) params.page = options.page;
       return this.fetchRequest = $.ajax({
-        url: this.urlPrefix,
+        url: this.livelist.urlPrefix,
+        type: this.livelist.httpMethod,
         dataType: 'json',
         data: params,
-        type: this.httpMethod,
         beforeSend: this.displayFetchingIndication,
         success: this.renderIndex
       });
@@ -115,8 +104,8 @@
     List.prototype.render = function() {
       var listHTML, partials;
       partials = {};
-      partials[this.resourceNameSingular] = this.listItemTemplate;
-      listHTML = Mustache.to_html(this.listTemplate, this.data, partials);
+      partials[this.livelist.resourceNameSingular] = this.listItemTemplate;
+      listHTML = Mustache.to_html(this.listTemplate, this.livelist.data, partials);
       $(this.renderTo).html(listHTML);
       return this.removeFetchingIndication();
     };
@@ -131,16 +120,15 @@
 
     __extends(Filters, _super);
 
-    function Filters(globalOptions, options) {
-      var _this = this;
-      if (options == null) options = {};
+    function Filters(options, livelist) {
       this.handleAdvancedOptionsClick = __bind(this.handleAdvancedOptionsClick, this);
-      this.setOptions(globalOptions);
+      var _this = this;
+      this.livelist = livelist;
       this.filters = options.presets ? _.keys(options.presets) : [];
       this.initializeCookies();
       this.setOptions(options);
       $('input.filter_option', this.renderTo).live('change', function() {
-        return $(_this.listSelector).trigger(_this.eventName);
+        return $(_this.livelist.listSelector).trigger(_this.livelist.eventName);
       });
       $(this.advancedOptionsToggleSelector).click(this.handleAdvancedOptionsClick);
     }
@@ -151,7 +139,7 @@
       }
     };
 
-    Filters.prototype.presets = function() {
+    Filters.prototype.getPresets = function() {
       var cookie;
       if (jQuery.cookie && this.useCookies) {
         cookie = jQuery.cookie(this.cookieName);
@@ -168,7 +156,7 @@
       filters = {};
       if (jQuery.isEmptyObject(presets)) {
         filters = this.selections();
-        if (jQuery.cookie) this.setCookie();
+        if (jQuery.cookie) this.setCookie(filters);
       } else {
         filters = presets;
       }
@@ -201,12 +189,29 @@
       });
     };
 
+    Filters.prototype.sortOptions = function(filters) {
+      return _.map(filters, function(filter) {
+        filter.options = _.sortBy(filter.options, function(option) {
+          return option.name;
+        });
+        return filter;
+      });
+    };
+
+    Filters.prototype.sort = function(filters) {
+      return _.sortBy(filters, function(filter) {
+        return filter.name;
+      });
+    };
+
     Filters.prototype.render = function(data) {
       var filtersHTML;
       this.filters = _.pluck(data.filters, 'filter_slug');
+      this.sort(data.filters);
+      this.sortOptions(data.filters);
       filtersHTML = Mustache.to_html(this.template, data);
       $(this.renderTo).html(filtersHTML);
-      if (this.noFiltersSelected(data) && data[this.resourceName].length > 0) {
+      if (this.noFiltersSelected(data) && data[this.livelist.resourceName].length > 0) {
         return $('input[type="checkbox"]', this.renderTo).attr('checked', 'checked');
       }
     };
@@ -224,13 +229,11 @@
 
     __extends(Pagination, _super);
 
-    function Pagination(globalOptions, options) {
-      if (options == null) options = {};
-      this.handlePaginationLinkClick = __bind(this.handlePaginationLinkClick, this);
+    function Pagination(options, livelist) {
+      this.handlePaginationLinkClick = __bind(this.handlePaginationLinkClick, this);      this.livelist = livelist;
       this.pagination = null;
       this.maxPages = 30;
-      this.setOptions(globalOptions);
-      this.emptyListMessage = "<p>No " + this.resourceName + " matched your filter criteria</p>";
+      this.emptyListMessage = "<p>No " + this.livelist.resourceName + " matched your filter criteria</p>";
       this.setOptions(options);
       $("" + this.renderTo + " a").live('click', function(event) {
         return event.preventDefault();
@@ -242,8 +245,8 @@
 
     Pagination.prototype.pagesJSON = function(currentPage, totalPages) {
       var firstPage, groupSize, lastPage, previousPage, _i, _results;
-      groupSize = this.maxPages / 2;
-      firstPage = currentPage < groupSize ? 1 : currentPage - groupSize;
+      groupSize = Math.floor(this.maxPages / 2);
+      firstPage = currentPage <= groupSize ? 1 : currentPage - groupSize;
       previousPage = firstPage + groupSize * 2 - 1;
       lastPage = previousPage >= totalPages ? totalPages : previousPage;
       return _.map((function() {
@@ -253,9 +256,7 @@
       }).apply(this), function(page) {
         return {
           page: page,
-          currentPage: function() {
-            return currentPage === page;
-          }
+          currentPage: currentPage === page
         };
       });
     };
@@ -267,7 +268,7 @@
         currentPage: pagination.current_page,
         nextPage: pagination.next_page,
         previousPage: pagination.previous_page,
-        urlPrefix: this.urlPrefix,
+        urlPrefix: this.livelist.urlPrefix,
         pages: this.pagesJSON(pagination.current_page, pagination.total_pages)
       };
     };
@@ -281,7 +282,7 @@
 
     Pagination.prototype.handlePaginationLinkClick = function(event) {
       event.preventDefault();
-      return $(this.listSelector).trigger(this.eventName, {
+      return $(this.livelist.listSelector).trigger(this.livelist.eventName, {
         page: $(event.target).data('page')
       });
     };
@@ -294,11 +295,10 @@
 
     __extends(Search, _super);
 
-    function Search(globalOptions, options) {
-      var _this = this;
-      if (options == null) options = {};
+    function Search(options, livelist) {
       this.handleSearchFormSubmit = __bind(this.handleSearchFormSubmit, this);
-      this.setOptions(globalOptions);
+      var _this = this;
+      this.livelist = livelist;
       this.setOptions(options);
       $(this.formSelector).submit(function(event) {
         return _this.handleSearchFormSubmit(event);
@@ -317,7 +317,7 @@
 
     Search.prototype.handleSearchFormSubmit = function(event) {
       event.preventDefault();
-      return $(this.listSelector).trigger(this.eventName);
+      return $(this.livelist.listSelector).trigger(this.livelist.eventName);
     };
 
     return Search;