chr 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a86d147a723188f151bcacca8c35a403bd6fcf3
-  data.tar.gz: f1be1f7997afb7976ecfbda0f1641b69e12e3ac2
+  metadata.gz: 7fceeef7d448d2cdc5eb8b0d8b83b41f9e3286eb
+  data.tar.gz: e7ca6fddaae45df4c2d0e53ee1bd288975d8aa6c
 SHA512:
-  metadata.gz: 2aec7e0a14af19ce53844ab6b58e615a26db8338a9bfbf7382869ce6f796383128b409625bd2fcc091e02b42a92a93f035902f7dfa8857d0c65eeb0e6aefc8be
-  data.tar.gz: 918c153a9f11d8e7add0fcd26fedf80cf701bc398c3f1c7c0367dbf7f0374b61a140ef24516cd73692ed117eaec20cfca4dd944ad8f5f8210fb9a4d3dfd16905
+  metadata.gz: 6c18ab1dafebd9e6321c6d44734b11af06d2b2e42a46a0191c5b6c64b1043633e7621d8224dd75d6c6b543cb181ea456183c7940386a47baff602c93ab626e86
+  data.tar.gz: d568e55272035adadfa181cc463ba89399822a07b8969c1af63e482106a93b096993dd247cf7c59ca8ab5662e61b11ae3c732efa33c6958d6f62eee35d57167d

data/app/assets/javascripts/chr/core/list_pagination.coffee

@@ -12,23 +12,23 @@
     @$items.scroll (e) =>
       # trigger next page loading only when scrolling to bottom
       if @lastScrollTop < e.target.scrollTop
-        @lastScrollTop = e.target.scrollTop
-
         if ! @config.arrayStore.dataFetchLock
 
-          if @listItemsHeight < (@listViewHeight + e.target.scrollTop + 100)
-            @_show_spinner()
-            @config.arrayStore.load
-              onSuccess: => @_update_height_params()
-              onError:   => chr.showAlert("Can't load next page, server error 500.")
+          listViewHeight  = @$el.height()
+          listItemsHeight = 0
+          @$items.children().each -> listItemsHeight += $(this).height()
+
+          if listItemsHeight < (listViewHeight + e.target.scrollTop + 100)
+
+            if ! @config.arrayStore.lastPageLoaded
 
-    @_update_height_params()
+              @_show_spinner()
 
+              @config.arrayStore.load false,
+                onSuccess: => ;
+                onError:   => chr.showAlert("Can't load next page, server error 500.")
 
-  _update_height_params: ->
-    @listViewHeight  = @$el.height()
-    @listItemsHeight = 0
-    @$items.children().each (i, el) => @listItemsHeight += $(el).height()
+      @lastScrollTop = e.target.scrollTop
 
 
 

data/app/assets/javascripts/chr/core/list_search.coffee

@@ -46,8 +46,7 @@
     @$el.removeClass('list-search')
     @$searchInput.val('')
     @_show_spinner()
-    # use reset(false) to do not sync with the existing list items
-    @config.arrayStore.reset(false)
+    @config.arrayStore.reset()
 
 
 

data/app/assets/javascripts/chr/store/_array-store.coffee

@@ -1,12 +1,22 @@
+# -----------------------------------------------------------------------------
+# Author: Alexander Kravets <alex@slatestudio.com>,
+#         Slate Studio (http://www.slatestudio.com)
+#
+# Coding Guide:
+#   https://github.com/thoughtbot/guides/tree/master/style/coffeescript
+# -----------------------------------------------------------------------------
+
 # -----------------------------------------------------------------------------
 # ARRAY STORE
-# javascript object storage implementation that stores/loads objects in memory,
+# -----------------------------------------------------------------------------
+#
+# Javascript object storage implementation that stores/loads objects in memory,
 # no backend database support here, supported features are:
 #   - new / update / remove
 #   - sorting
 #   - reordering
 #
-# configuration options:
+# Config options:
 #   data         — initial array of objects, default: []
 #   sortBy       — objects field name which is used for sorting, does not sort
 #                  when parameter is not provided, default: nil
@@ -14,7 +24,7 @@
 #   reorderable  — list items reordering configuration hash, should have two
 #                  fields: { positionFieldName: '', sortReverse: false }
 #
-# public methods:
+# Public methods:
 #   - on(eventType, callback)
 #        object_added
 #        object_changed
@@ -29,8 +39,9 @@
 #   - addObjects(objects)
 #   - data()
 #
-# todo:
+# TODO:
 #   - support for lists, files, nested objects
+#
 # -----------------------------------------------------------------------------
 class @ArrayStore
   constructor: (@config={}) ->
@@ -42,7 +53,7 @@ class @ArrayStore
     @reorderable = @config.reorderable ? false
 
     @_initialize_reorderable()
-    @_initialize_database()
+    @_initialize_store()
 
 
   # PRIVATE ===============================================
@@ -60,7 +71,7 @@ class @ArrayStore
 
   # this method should be overriden for database initialization
   # and config processing when implementing custom store
-  _initialize_database: ->
+  _initialize_store: ->
     ;
 
 
@@ -111,7 +122,9 @@ class @ArrayStore
 
       position = @_get_data_object_position(object._id)
 
-      $(this).trigger('object_added', { object: object, position: position })
+      data = { object: object, position: position }
+      $(this).trigger('object_added', data)
+      return data
     else
       @_update_data_object(object.id, object)
 
@@ -121,11 +134,13 @@ class @ArrayStore
   _update_data_object: (id, value) ->
     object = $.extend(@get(id), value)
 
+    old_position = @_get_data_object_position(id)
     @_sort_data()
-
     position = @_get_data_object_position(id)
 
-    $(this).trigger('object_changed', { object: object, position: position })
+    data = { object: object, position: position, positionHasChanged: (old_position != position) }
+    $(this).trigger('object_changed', data)
+    return data
 
 
   # delete object by id from _data and _map,
@@ -137,7 +152,9 @@ class @ArrayStore
 
     delete @_map[id]
 
-    $(this).trigger('object_removed', { object_id: id })
+    data = { object_id: id }
+    $(this).trigger('object_removed', data)
+    return data
 
 
   # remove all objects from _data and _map,

data/app/assets/javascripts/chr/store/_object-store.coffee

@@ -11,11 +11,12 @@
 # -----------------------------------------------------------------------------
 class @ObjectStore
   constructor: (@config={}) ->
-    @_initialize_database()
+    @_initialize_store()
+
 
   # PRIVATE ===============================================
 
-  _initialize_database: ->
+  _initialize_store: ->
     @_data = @config.data
 
 

data/app/assets/javascripts/chr/store/mongosteen-array-store.coffee

@@ -7,112 +7,22 @@
 # -----------------------------------------------------------------------------
 
 # -----------------------------------------------------------------------------
-# MONGOSTEEN (RAILS) ARRAY/COLLECTION STORE IMPLEMENTATION
-# this store implementation talks to Mongosteen powered Rails api, supports
-# features:
-#
-#  - pagination
-#    `sortBy` & `sortReverse` options should be set same as on
-#    backend model with `default_scope` method (default), e.g:
-#     - frontend: `{ sortBy: 'created_at', sortReverse: true }`
-#     - backend:  `default_scope -> { desc(:created_at) }`
-#
-#  - search
-#    backend model configuration required, e.g: `search_in :title`
-#
-# configuration options:
-#   @config.pagination - enable pagination, default `true`
-#   @config.searchable - enable search, default `false`
-#
+# RAILS ARRAY STORE
 # -----------------------------------------------------------------------------
 class @MongosteenArrayStore extends RestArrayStore
 
   # PRIVATE ===============================================
 
-  _initialize_database: ->
-    @dataFetchLock  = false
+  _configure_store: ->
     @ajaxConfig =
       processData: false
       contentType: false
 
-    @searchable   = @config.searchable ? false
-    @searchQuery  = ''
-
-    @pagination     = @config.pagination ? true
-    @nextPage       = 1
-    @objectsPerPage = chr.itemsPerPageRequest ? 20
-
-    if @pagination
-      @lastPageLoaded = false
-      @_bind_pagination_sync()
-
-
-  # ---------------------------------------------------------
-  # workarounds to have consistency between arrayStore and
-  # database while loading next page
-  # ---------------------------------------------------------
-  _bind_pagination_sync: ->
-    # when object's added to the end of the list & not on the last page,
-    # we don't know it's position on the backend, so remove it from store
-    $(this).on 'object_added', (e, data) =>
-      if ! @lastPageLoaded
-        new_object          = data.object
-        new_object_position = data.position
-
-        # check if object added to the end of the list
-        if new_object_position >= @objectsNumberForLoadedPages
-          e.stopImmediatePropagation()
-
-          @_remove_data_object(new_object._id)
-
-    # when object's added to the end of the list & not on the last page,
-    # we don't know it's position on the backend, so remove it from store
-    $(this).on 'object_changed', (e, data) =>
-      if ! @lastPageLoaded
-        new_object          = data.object
-        new_object_position = data.position
-
-        # check if object added to the end of the list
-        if new_object_position >= @objectsNumberForLoadedPages - 1
-          e.stopImmediatePropagation()
-
-          @_remove_data_object(new_object._id)
-
-    # load current page again after item delete to sync, last item on the page
-    $(this).on 'object_removed', (e, data) =>
-      if ! @lastPageLoaded
-        @_reload_current_page()
-
-
-  _reload_current_page: ->
-    @nextPage -= 1 ; @load()
-
-
-  _update_next_page: (data) ->
-    if @pagination
-      if data.length > 0
-        @lastPageLoaded = true
-
-        if data.length == @objectsPerPage
-          @nextPage += 1
-          @lastPageLoaded = false
-
-      else
-        @lastPageLoaded = true
-
-    @objectsNumberForLoadedPages = (@nextPage - 1) * @objectsPerPage
-
 
   # generate resource api url
   _resource_url: (type, id) ->
     objectPath = if id then "/#{ id }" else ''
-    url = "#{ @config.path }#{ objectPath }.json"
-
-    if @config.urlParams
-      extraParamsString = $.param(@config.urlParams)
-      url = "#{ url }?#{ extraParamsString }"
-
-    return url
+    "#{ @config.path }#{ objectPath }.json"
 
 
   # get form data object from serialized form object,
@@ -141,70 +51,5 @@ class @MongosteenArrayStore extends RestArrayStore
     return formDataObject
 
 
-  # PUBLIC ================================================
-
-  # load first page of results for search query, skip store 'object_removed'
-  # event handler on @_reset_data()
-  search: (@searchQuery) ->
-    @nextPage       = 1
-    @lastPageLoaded = true
-    @_reset_data()
-    @load()
-
-
-  # load next page objects from database, when finished
-  # trigger 'objects_added' event
-  load: (callbacks={}) ->
-    callbacks.onSuccess ?= $.noop
-    callbacks.onError   ?= $.noop
-
-    params = {}
-
-    if @pagination
-      params.page    = @nextPage
-      params.perPage = @objectsPerPage
-
-    if @searchable && @searchQuery.length > 0
-      params.search = @searchQuery
-
-    params = $.param(params)
-
-    @_ajax 'GET', null, params, ((data) =>
-      @_update_next_page(data)
-      @_add_data_object(o) for o in data
-
-      callbacks.onSuccess(data)
-
-      $(this).trigger('objects_added', { objects: data })
-    ), callbacks.onError
-
-
-  # reset data and load first page, by default this sync with
-  # objects that are currently in the _data, if you want to reset
-  # these use `reset(false)`
-  reset: (sync_with_existing_objects=true)->
-    @searchQuery = ''
-    @nextPage    = 1
-    params       = {}
-
-    if ! sync_with_existing_objects
-      @lastPageLoaded = true
-      @_reset_data()
-
-    if @pagination
-      @lastPageLoaded = false
-      params.page     = @nextPage
-      params.perPage  = @objectsPerPage
-
-    params = $.param(params)
-
-    @_ajax 'GET', null, params, ((data) =>
-      @_update_next_page(data)
-      @_sync_with_data_objects(data)
-
-      $(this).trigger('objects_added', { objects: data })
-    ), -> chr.showError('Error while loading data.')
-
-
 
 

data/app/assets/javascripts/chr/store/mongosteen-object-store.coffee

@@ -7,14 +7,13 @@
 # -----------------------------------------------------------------------------
 
 # -----------------------------------------------------------------------------
-# MONGOSTEEN (RAILS) OBJECT STORE IMPLEMENTATION
+# RAILS OBJECT STORE
 # -----------------------------------------------------------------------------
 class @MongosteenObjectStore extends RestObjectStore
 
   # PRIVATE ===============================================
 
-  _initialize_database: ->
-    @dataFetchLock = false
+  _configure_store: ->
     @ajaxConfig =
       processData: false
       contentType: false

data/app/assets/javascripts/chr/store/rest-array-store.coffee

@@ -9,12 +9,48 @@
 # -----------------------------------------------------------------------------
 # REST ARRAY STORE
 # -----------------------------------------------------------------------------
+#
+# Config options:
+#   pagination  - enable pagination for resource index, default `true`
+#   searchable  - enable resource search, default `false`
+#   urlParams   - additional parameter to be included into request
+#   sortBy      - sort objects by field
+#   sortReverse - reverse sorted objects
+#
+# Public methods:
+#   loadObject
+#   load
+#   reset
+#   search
+#   push
+#   update
+#   remove
+#
+# -----------------------------------------------------------------------------
 class @RestArrayStore extends ArrayStore
 
   # PRIVATE ===============================================
 
-  _initialize_database: ->
-    @dataFetchLock = false
+  _initialize_store: ->
+    @dataFetchLock  = false
+    @lastPageLoaded = false
+
+    @searchable     = @config.searchable ? false
+    @searchQuery    = ''
+
+    @pagination     = @config.pagination ? true
+    @nextPage       = 1
+    @objectsPerPage = chr.itemsPerPageRequest ? 20
+
+    @requestParams ?=
+      page:    'page'
+      perPage: 'perPage'
+      search:  'search'
+
+    @_configure_store()
+
+
+  _configure_store: ->
     @ajaxConfig = {}
 
 
@@ -24,16 +60,25 @@ class @RestArrayStore extends ArrayStore
     "#{ @config.path }#{ objectPath }"
 
 
+  _request_url: (type, id) ->
+    url = @_resource_url(type, id)
+
+    if @config.urlParams
+      extraParamsString = $.param(@config.urlParams)
+      url = "#{ url }?#{ extraParamsString }"
+
+    return url
+
+
   # do requests to database api
   _ajax: (type, id, data, success, error) ->
     options = $.extend @ajaxConfig,
-      url:  @_resource_url(type, id)
+      url:  @_request_url(type, id)
       type: type
       data: data
       success: (data, textStatus, jqXHR) =>
         success?(data)
-        setTimeout ( => @dataFetchLock = false ), 350
-        #@dataFetchLock = false
+        setTimeout ( => @dataFetchLock = false ), 50
       error: (jqXHR, textStatus, errorThrown ) =>
         error?(jqXHR.responseJSON)
         @dataFetchLock = false
@@ -67,10 +112,32 @@ class @RestArrayStore extends ArrayStore
       @_update_data_object(id, objectsMap[id])
 
 
+  # update next page counter and check if the last page was loaded
+  _update_next_page: (data) ->
+    if @pagination
+      if data.length > 0
+        @lastPageLoaded = true
+
+        if data.length == @objectsPerPage
+          @nextPage += 1
+          @lastPageLoaded = false
+
+      else
+        @lastPageLoaded = true
+
+
+  _is_pagination_edge_case: ->
+    ( @pagination && @lastPageLoaded == false )
+
+
+  _reload_current_page: (callbacks) ->
+    @nextPage -= 1
+    @load(true, callbacks)
+
+
   # PUBLIC ================================================
 
-  # load a single object, this is used in view when
-  # store has not required item
+  # load a single object
   loadObject: (id, callbacks={}) ->
     callbacks.onSuccess ?= $.noop
     callbacks.onError   ?= $.noop
@@ -80,21 +147,46 @@ class @RestArrayStore extends ArrayStore
     ), callbacks.onError
 
 
-  # load objects from database, when finished
-  # trigger 'objects_added' event
-  load: (callbacks={}) ->
+  # load next page objects from database and trigger 'objects_added' event
+  load: (sync=false, callbacks={}) ->
     callbacks.onSuccess ?= $.noop
     callbacks.onError   ?= $.noop
 
-    @_ajax 'GET', null, {}, ((data) =>
-      if data.length > 0
-        for o in data
-          @_add_data_object(o)
+    params = {}
+
+    if @pagination
+      params[@requestParams.page]    = @nextPage
+      params[@requestParams.perPage] = @objectsPerPage
+
+    if @searchable && @searchQuery.length > 0
+      params[@requestParams.search]  = @searchQuery
+
+    params = $.param(params)
+
+    @_ajax 'GET', null, params, ((data) =>
+      @_update_next_page(data)
+
+      if sync
+        @_sync_with_data_objects(data)
+      else
+        @_add_data_object(o) for o in data
 
       callbacks.onSuccess(data)
 
       $(this).trigger('objects_added', { objects: data })
-    ) callbacks.onError
+    ), -> chr.showError('Error while loading data, application error 500.')
+
+
+  # reset data and load again first page
+  reset: (@searchQuery='') ->
+    @lastPageLoaded = false
+    @nextPage       = 1
+    @load(true)
+
+
+  # load search results first page
+  search: (searchQuery) ->
+    @reset(searchQuery)
 
 
   # add new object
@@ -105,8 +197,15 @@ class @RestArrayStore extends ArrayStore
     obj = @_parse_form_object(serializedFormObject)
 
     @_ajax 'POST', null, obj, ((data) =>
-      @_add_data_object(data)
+      d = @_add_data_object(data)
+
+      if @_is_pagination_edge_case()
+        if d.position >= (@nextPage - 1) * @objectsPerPage
+          # if object added to the end of the list remove it
+          @_remove_data_object(d.object._id)
+
       callbacks.onSuccess(data)
+
     ), callbacks.onError
 
 
@@ -118,8 +217,17 @@ class @RestArrayStore extends ArrayStore
     obj = @_parse_form_object(serializedFormObject)
 
     @_ajax 'PUT', id, obj, ((data) =>
-      @_update_data_object(id, data)
-      callbacks.onSuccess(data)
+      d = @_update_data_object(id, data)
+
+      if @_is_pagination_edge_case() && d.positionHasChanged
+        if d.position >= (@nextPage - 1) * @objectsPerPage - 1
+          # if object added to the end of the list reload page to
+          # sync last item on the page
+          @_reload_current_page(callbacks)
+
+      else
+        callbacks.onSuccess(data)
+
     ), callbacks.onError
 
 
@@ -130,16 +238,16 @@ class @RestArrayStore extends ArrayStore
 
     @_ajax 'DELETE', id, {}, ( =>
       @_remove_data_object(id)
-      callbacks.onSuccess()
-    ), callbacks.onError
 
+      if @_is_pagination_edge_case()
+        # after item delete reload page to sync last item on the page
+        @_reload_current_page(callbacks)
+
+      else
+        callbacks.onSuccess()
+
+    ), callbacks.onError
 
-  # reset data and load it again
-  reset: ->
-    @_ajax 'GET', null, {}, ((data) =>
-      @_sync_with_data_objects(data)
-      $(this).trigger('objects_added', { objects: data })
-    ), -> chr.showError('Error while loading data.')
 
 
 

data/app/assets/javascripts/chr/store/rest-object-store.coffee

@@ -13,8 +13,12 @@ class @RestObjectStore extends ObjectStore
 
   # PRIVATE ===============================================
 
-  _initialize_database: ->
+  _initialize_store: ->
     @dataFetchLock = false
+    @_configure_store()
+
+
+  _configure_store: ->
     @ajaxConfig = {}
 
 

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "chr",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "homepage": "https://github.com/slate-studio/chr",
   "authors": [
     "Slate Studio (http://www.slatestudio.com)"

data/dist/chr.js

@@ -3097,34 +3097,30 @@ this.listConfig = {
 this.listPagination = {
   _bind_pagination: function() {
     this.lastScrollTop = 0;
-    this.$items.scroll((function(_this) {
+    return this.$items.scroll((function(_this) {
       return function(e) {
+        var listItemsHeight, listViewHeight;
         if (_this.lastScrollTop < e.target.scrollTop) {
-          _this.lastScrollTop = e.target.scrollTop;
           if (!_this.config.arrayStore.dataFetchLock) {
-            if (_this.listItemsHeight < (_this.listViewHeight + e.target.scrollTop + 100)) {
-              _this._show_spinner();
-              return _this.config.arrayStore.load({
-                onSuccess: function() {
-                  return _this._update_height_params();
-                },
-                onError: function() {
-                  return chr.showAlert("Can't load next page, server error 500.");
-                }
-              });
+            listViewHeight = _this.$el.height();
+            listItemsHeight = 0;
+            _this.$items.children().each(function() {
+              return listItemsHeight += $(this).height();
+            });
+            if (listItemsHeight < (listViewHeight + e.target.scrollTop + 100)) {
+              if (!_this.config.arrayStore.lastPageLoaded) {
+                _this._show_spinner();
+                _this.config.arrayStore.load(false, {
+                  onSuccess: function() {},
+                  onError: function() {
+                    return chr.showAlert("Can't load next page, server error 500.");
+                  }
+                });
+              }
             }
           }
         }
-      };
-    })(this));
-    return this._update_height_params();
-  },
-  _update_height_params: function() {
-    this.listViewHeight = this.$el.height();
-    this.listItemsHeight = 0;
-    return this.$items.children().each((function(_this) {
-      return function(i, el) {
-        return _this.listItemsHeight += $(el).height();
+        return _this.lastScrollTop = e.target.scrollTop;
       };
     })(this));
   }
@@ -3238,7 +3234,7 @@ this.listSearch = {
     this.$el.removeClass('list-search');
     this.$searchInput.val('');
     this._show_spinner();
-    return this.config.arrayStore.reset(false);
+    return this.config.arrayStore.reset();
   }
 };
 
@@ -4968,7 +4964,7 @@ this.ArrayStore = (function() {
     this.sortReverse = (ref1 = this.config.sortReverse) != null ? ref1 : false;
     this.reorderable = (ref2 = this.config.reorderable) != null ? ref2 : false;
     this._initialize_reorderable();
-    this._initialize_database();
+    this._initialize_store();
   }
 
   ArrayStore.prototype._initialize_reorderable = function() {
@@ -4984,7 +4980,7 @@ this.ArrayStore = (function() {
     }
   };
 
-  ArrayStore.prototype._initialize_database = function() {};
+  ArrayStore.prototype._initialize_store = function() {};
 
   ArrayStore.prototype._sort_data = function() {
     var direction, fieldName, sortByMethod;
@@ -5028,43 +5024,51 @@ this.ArrayStore = (function() {
   };
 
   ArrayStore.prototype._add_data_object = function(object) {
-    var position;
+    var data, position;
     object = this._normalize_object_id(object);
     if (!this._map[object._id]) {
       this._map[object._id] = object;
       this._data.push(object);
       this._sort_data();
       position = this._get_data_object_position(object._id);
-      return $(this).trigger('object_added', {
+      data = {
         object: object,
         position: position
-      });
+      };
+      $(this).trigger('object_added', data);
+      return data;
     } else {
       return this._update_data_object(object.id, object);
     }
   };
 
   ArrayStore.prototype._update_data_object = function(id, value) {
-    var object, position;
+    var data, object, old_position, position;
     object = $.extend(this.get(id), value);
+    old_position = this._get_data_object_position(id);
     this._sort_data();
     position = this._get_data_object_position(id);
-    return $(this).trigger('object_changed', {
+    data = {
       object: object,
-      position: position
-    });
+      position: position,
+      positionHasChanged: old_position !== position
+    };
+    $(this).trigger('object_changed', data);
+    return data;
   };
 
   ArrayStore.prototype._remove_data_object = function(id) {
-    var position;
+    var data, position;
     position = this._get_data_object_position(id);
     if (position >= 0) {
       this._data.splice(position, 1);
     }
     delete this._map[id];
-    return $(this).trigger('object_removed', {
+    data = {
       object_id: id
-    });
+    };
+    $(this).trigger('object_removed', data);
+    return data;
   };
 
   ArrayStore.prototype._reset_data = function() {
@@ -5164,10 +5168,10 @@ this.ArrayStore = (function() {
 this.ObjectStore = (function() {
   function ObjectStore(config) {
     this.config = config != null ? config : {};
-    this._initialize_database();
+    this._initialize_store();
   }
 
-  ObjectStore.prototype._initialize_database = function() {
+  ObjectStore.prototype._initialize_store = function() {
     return this._data = this.config.data;
   };
 
@@ -5194,8 +5198,26 @@ this.RestArrayStore = (function(superClass) {
     return RestArrayStore.__super__.constructor.apply(this, arguments);
   }
 
-  RestArrayStore.prototype._initialize_database = function() {
+  RestArrayStore.prototype._initialize_store = function() {
+    var ref, ref1, ref2;
     this.dataFetchLock = false;
+    this.lastPageLoaded = false;
+    this.searchable = (ref = this.config.searchable) != null ? ref : false;
+    this.searchQuery = '';
+    this.pagination = (ref1 = this.config.pagination) != null ? ref1 : true;
+    this.nextPage = 1;
+    this.objectsPerPage = (ref2 = chr.itemsPerPageRequest) != null ? ref2 : 20;
+    if (this.requestParams == null) {
+      this.requestParams = {
+        page: 'page',
+        perPage: 'perPage',
+        search: 'search'
+      };
+    }
+    return this._configure_store();
+  };
+
+  RestArrayStore.prototype._configure_store = function() {
     return this.ajaxConfig = {};
   };
 
@@ -5205,10 +5227,20 @@ this.RestArrayStore = (function(superClass) {
     return "" + this.config.path + objectPath;
   };
 
+  RestArrayStore.prototype._request_url = function(type, id) {
+    var extraParamsString, url;
+    url = this._resource_url(type, id);
+    if (this.config.urlParams) {
+      extraParamsString = $.param(this.config.urlParams);
+      url = url + "?" + extraParamsString;
+    }
+    return url;
+  };
+
   RestArrayStore.prototype._ajax = function(type, id, data, success, error) {
     var options;
     options = $.extend(this.ajaxConfig, {
-      url: this._resource_url(type, id),
+      url: this._request_url(type, id),
       type: type,
       data: data,
       success: (function(_this) {
@@ -5218,7 +5250,7 @@ this.RestArrayStore = (function(superClass) {
           }
           return setTimeout((function() {
             return _this.dataFetchLock = false;
-          }), 350);
+          }), 50);
         };
       })(this),
       error: (function(_this) {
@@ -5281,6 +5313,29 @@ this.RestArrayStore = (function(superClass) {
     return results;
   };
 
+  RestArrayStore.prototype._update_next_page = function(data) {
+    if (this.pagination) {
+      if (data.length > 0) {
+        this.lastPageLoaded = true;
+        if (data.length === this.objectsPerPage) {
+          this.nextPage += 1;
+          return this.lastPageLoaded = false;
+        }
+      } else {
+        return this.lastPageLoaded = true;
+      }
+    }
+  };
+
+  RestArrayStore.prototype._is_pagination_edge_case = function() {
+    return this.pagination && this.lastPageLoaded === false;
+  };
+
+  RestArrayStore.prototype._reload_current_page = function(callbacks) {
+    this.nextPage -= 1;
+    return this.load(true, callbacks);
+  };
+
   RestArrayStore.prototype.loadObject = function(id, callbacks) {
     if (callbacks == null) {
       callbacks = {};
@@ -5298,7 +5353,11 @@ this.RestArrayStore = (function(superClass) {
     })(this)), callbacks.onError);
   };
 
-  RestArrayStore.prototype.load = function(callbacks) {
+  RestArrayStore.prototype.load = function(sync, callbacks) {
+    var params;
+    if (sync == null) {
+      sync = false;
+    }
     if (callbacks == null) {
       callbacks = {};
     }
@@ -5308,10 +5367,22 @@ this.RestArrayStore = (function(superClass) {
     if (callbacks.onError == null) {
       callbacks.onError = $.noop;
     }
-    return this._ajax('GET', null, {}, ((function(_this) {
+    params = {};
+    if (this.pagination) {
+      params[this.requestParams.page] = this.nextPage;
+      params[this.requestParams.perPage] = this.objectsPerPage;
+    }
+    if (this.searchable && this.searchQuery.length > 0) {
+      params[this.requestParams.search] = this.searchQuery;
+    }
+    params = $.param(params);
+    return this._ajax('GET', null, params, ((function(_this) {
       return function(data) {
         var i, len, o;
-        if (data.length > 0) {
+        _this._update_next_page(data);
+        if (sync) {
+          _this._sync_with_data_objects(data);
+        } else {
           for (i = 0, len = data.length; i < len; i++) {
             o = data[i];
             _this._add_data_object(o);
@@ -5322,7 +5393,20 @@ this.RestArrayStore = (function(superClass) {
           objects: data
         });
       };
-    })(this))(callbacks.onError));
+    })(this)), function() {
+      return chr.showError('Error while loading data, application error 500.');
+    });
+  };
+
+  RestArrayStore.prototype.reset = function(searchQuery1) {
+    this.searchQuery = searchQuery1 != null ? searchQuery1 : '';
+    this.lastPageLoaded = false;
+    this.nextPage = 1;
+    return this.load(true);
+  };
+
+  RestArrayStore.prototype.search = function(searchQuery) {
+    return this.reset(searchQuery);
   };
 
   RestArrayStore.prototype.push = function(serializedFormObject, callbacks) {
@@ -5339,7 +5423,13 @@ this.RestArrayStore = (function(superClass) {
     obj = this._parse_form_object(serializedFormObject);
     return this._ajax('POST', null, obj, ((function(_this) {
       return function(data) {
-        _this._add_data_object(data);
+        var d;
+        d = _this._add_data_object(data);
+        if (_this._is_pagination_edge_case()) {
+          if (d.position >= (_this.nextPage - 1) * _this.objectsPerPage) {
+            _this._remove_data_object(d.object._id);
+          }
+        }
         return callbacks.onSuccess(data);
       };
     })(this)), callbacks.onError);
@@ -5359,8 +5449,15 @@ this.RestArrayStore = (function(superClass) {
     obj = this._parse_form_object(serializedFormObject);
     return this._ajax('PUT', id, obj, ((function(_this) {
       return function(data) {
-        _this._update_data_object(id, data);
-        return callbacks.onSuccess(data);
+        var d;
+        d = _this._update_data_object(id, data);
+        if (_this._is_pagination_edge_case() && d.positionHasChanged) {
+          if (d.position >= (_this.nextPage - 1) * _this.objectsPerPage - 1) {
+            return _this._reload_current_page(callbacks);
+          }
+        } else {
+          return callbacks.onSuccess(data);
+        }
       };
     })(this)), callbacks.onError);
   };
@@ -5378,24 +5475,15 @@ this.RestArrayStore = (function(superClass) {
     return this._ajax('DELETE', id, {}, ((function(_this) {
       return function() {
         _this._remove_data_object(id);
-        return callbacks.onSuccess();
+        if (_this._is_pagination_edge_case()) {
+          return _this._reload_current_page(callbacks);
+        } else {
+          return callbacks.onSuccess();
+        }
       };
     })(this)), callbacks.onError);
   };
 
-  RestArrayStore.prototype.reset = function() {
-    return this._ajax('GET', null, {}, ((function(_this) {
-      return function(data) {
-        _this._sync_with_data_objects(data);
-        return $(_this).trigger('objects_added', {
-          objects: data
-        });
-      };
-    })(this)), function() {
-      return chr.showError('Error while loading data.');
-    });
-  };
-
   return RestArrayStore;
 
 })(ArrayStore);
@@ -5410,8 +5498,12 @@ this.RestObjectStore = (function(superClass) {
     return RestObjectStore.__super__.constructor.apply(this, arguments);
   }
 
-  RestObjectStore.prototype._initialize_database = function() {
+  RestObjectStore.prototype._initialize_store = function() {
     this.dataFetchLock = false;
+    return this._configure_store();
+  };
+
+  RestObjectStore.prototype._configure_store = function() {
     return this.ajaxConfig = {};
   };
 
@@ -5508,89 +5600,17 @@ this.MongosteenArrayStore = (function(superClass) {
     return MongosteenArrayStore.__super__.constructor.apply(this, arguments);
   }
 
-  MongosteenArrayStore.prototype._initialize_database = function() {
-    var ref, ref1, ref2;
-    this.dataFetchLock = false;
-    this.ajaxConfig = {
+  MongosteenArrayStore.prototype._configure_store = function() {
+    return this.ajaxConfig = {
       processData: false,
       contentType: false
     };
-    this.searchable = (ref = this.config.searchable) != null ? ref : false;
-    this.searchQuery = '';
-    this.pagination = (ref1 = this.config.pagination) != null ? ref1 : true;
-    this.nextPage = 1;
-    this.objectsPerPage = (ref2 = chr.itemsPerPageRequest) != null ? ref2 : 20;
-    if (this.pagination) {
-      this.lastPageLoaded = false;
-      return this._bind_pagination_sync();
-    }
-  };
-
-  MongosteenArrayStore.prototype._bind_pagination_sync = function() {
-    $(this).on('object_added', (function(_this) {
-      return function(e, data) {
-        var new_object, new_object_position;
-        if (!_this.lastPageLoaded) {
-          new_object = data.object;
-          new_object_position = data.position;
-          if (new_object_position >= _this.objectsNumberForLoadedPages) {
-            e.stopImmediatePropagation();
-            return _this._remove_data_object(new_object._id);
-          }
-        }
-      };
-    })(this));
-    $(this).on('object_changed', (function(_this) {
-      return function(e, data) {
-        var new_object, new_object_position;
-        if (!_this.lastPageLoaded) {
-          new_object = data.object;
-          new_object_position = data.position;
-          if (new_object_position >= _this.objectsNumberForLoadedPages - 1) {
-            e.stopImmediatePropagation();
-            return _this._remove_data_object(new_object._id);
-          }
-        }
-      };
-    })(this));
-    return $(this).on('object_removed', (function(_this) {
-      return function(e, data) {
-        if (!_this.lastPageLoaded) {
-          return _this._reload_current_page();
-        }
-      };
-    })(this));
-  };
-
-  MongosteenArrayStore.prototype._reload_current_page = function() {
-    this.nextPage -= 1;
-    return this.load();
-  };
-
-  MongosteenArrayStore.prototype._update_next_page = function(data) {
-    if (this.pagination) {
-      if (data.length > 0) {
-        this.lastPageLoaded = true;
-        if (data.length === this.objectsPerPage) {
-          this.nextPage += 1;
-          this.lastPageLoaded = false;
-        }
-      } else {
-        this.lastPageLoaded = true;
-      }
-    }
-    return this.objectsNumberForLoadedPages = (this.nextPage - 1) * this.objectsPerPage;
   };
 
   MongosteenArrayStore.prototype._resource_url = function(type, id) {
-    var extraParamsString, objectPath, url;
+    var objectPath;
     objectPath = id ? "/" + id : '';
-    url = "" + this.config.path + objectPath + ".json";
-    if (this.config.urlParams) {
-      extraParamsString = $.param(this.config.urlParams);
-      url = url + "?" + extraParamsString;
-    }
-    return url;
+    return "" + this.config.path + objectPath + ".json";
   };
 
   MongosteenArrayStore.prototype._parse_form_object = function(serializedFormObject) {
@@ -5615,81 +5635,6 @@ this.MongosteenArrayStore = (function(superClass) {
     return formDataObject;
   };
 
-  MongosteenArrayStore.prototype.search = function(searchQuery) {
-    this.searchQuery = searchQuery;
-    this.nextPage = 1;
-    this.lastPageLoaded = true;
-    this._reset_data();
-    return this.load();
-  };
-
-  MongosteenArrayStore.prototype.load = function(callbacks) {
-    var params;
-    if (callbacks == null) {
-      callbacks = {};
-    }
-    if (callbacks.onSuccess == null) {
-      callbacks.onSuccess = $.noop;
-    }
-    if (callbacks.onError == null) {
-      callbacks.onError = $.noop;
-    }
-    params = {};
-    if (this.pagination) {
-      params.page = this.nextPage;
-      params.perPage = this.objectsPerPage;
-    }
-    if (this.searchable && this.searchQuery.length > 0) {
-      params.search = this.searchQuery;
-    }
-    params = $.param(params);
-    return this._ajax('GET', null, params, ((function(_this) {
-      return function(data) {
-        var i, len, o;
-        _this._update_next_page(data);
-        for (i = 0, len = data.length; i < len; i++) {
-          o = data[i];
-          _this._add_data_object(o);
-        }
-        callbacks.onSuccess(data);
-        return $(_this).trigger('objects_added', {
-          objects: data
-        });
-      };
-    })(this)), callbacks.onError);
-  };
-
-  MongosteenArrayStore.prototype.reset = function(sync_with_existing_objects) {
-    var params;
-    if (sync_with_existing_objects == null) {
-      sync_with_existing_objects = true;
-    }
-    this.searchQuery = '';
-    this.nextPage = 1;
-    params = {};
-    if (!sync_with_existing_objects) {
-      this.lastPageLoaded = true;
-      this._reset_data();
-    }
-    if (this.pagination) {
-      this.lastPageLoaded = false;
-      params.page = this.nextPage;
-      params.perPage = this.objectsPerPage;
-    }
-    params = $.param(params);
-    return this._ajax('GET', null, params, ((function(_this) {
-      return function(data) {
-        _this._update_next_page(data);
-        _this._sync_with_data_objects(data);
-        return $(_this).trigger('objects_added', {
-          objects: data
-        });
-      };
-    })(this)), function() {
-      return chr.showError('Error while loading data.');
-    });
-  };
-
   return MongosteenArrayStore;
 
 })(RestArrayStore);
@@ -5704,8 +5649,7 @@ this.MongosteenObjectStore = (function(superClass) {
     return MongosteenObjectStore.__super__.constructor.apply(this, arguments);
   }
 
-  MongosteenObjectStore.prototype._initialize_database = function() {
-    this.dataFetchLock = false;
+  MongosteenObjectStore.prototype._configure_store = function() {
     return this.ajaxConfig = {
       processData: false,
       contentType: false

data/lib/chr/version.rb

@@ -1,3 +1,3 @@
 module Chr
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chr",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-clean":  "^0.6.0",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chr
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Alexander Kravets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon