eventifier 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d52731cd16ffb326dcbbe039e149bc442971937
-  data.tar.gz: e7ebe723f92488ea85e6e56035df3e6587024d7b
+  metadata.gz: 41a67bb13760a2f1a78c49d6d9d636f2b096c23f
+  data.tar.gz: 2144b9aa120796684514725552d0b45d2dcd3205
 SHA512:
-  metadata.gz: 66f36403d9168dd4f495999c4f2a33ac37f02b27016328413164617c88544fdfc3cf9c938022c8e8b1e12dfb12ce1588baf1b5b5bcc8b5b04dc51c37010fd6f2
-  data.tar.gz: 5c7bdc1a45b559b0fdb1b2784f9327f24232c3273d7648fc856f741e5f05de11c90a2dbe3ca7946b6b27cbf1a3e7fc24ce5ff465e8e558ccf399ae22ba5a1247
+  metadata.gz: 187b9888e74d11719d69ee8fc92aa493e14faef16fa91d90620037a59d6475c8b3c925ba9632d2b21bd621d39153740447b24bf01c43d7a6418201590b3a1590
+  data.tar.gz: 64418fd35804cc999a9bb79663ba40c831cbe04337bae498b55cb6906a5575f6a149de007829bdd62f7b53b9abeb8d871655cf44daea0a706fe9f0e6163f8f05

data/app/assets/javascripts/eventifier/notifications.coffee

@@ -58,17 +58,25 @@ class window.NotificationDropdown
     $.each @notifications, (index, notification)=>
       unless $.inArray(notification.id, @renderedNotifications) >= 0
         if new Date(notification.created_at) > @lastReadAt
-          @el
-            .find('ol')
-            .prepend $("<li />")
-            .addClass('unread')
-            .html(notification.html)
+          console.log @lastInserted
+          if @lastInserted?
+            @lastInserted.after @lastInserted = $("<li />")
+              .addClass('unread')
+              .html(notification.html)
+          else
+            @el
+              .find('ol')
+              .prepend @lastInserted = $("<li />")
+                .addClass('unread')
+                .html(notification.html)
         else
           @el
           .find('ol')
           .append($("<li />").html(notification.html))
         @renderedNotifications.push notification.id
 
+    @lastInserted = null
+
   isActive: =>
     @el.hasClass('notifications_active')
 

data/app/controllers/eventifier/notifications_controller.rb

@@ -12,19 +12,13 @@ class Eventifier::NotificationsController < Eventifier::ApplicationController
   private
 
   def notifications
-    scope = current_user.notifications.limit(per_page)
+    scope = current_user.notifications.order("notifications.created_at DESC").limit(per_page)
     scope = scope.where("notifications.created_at < ?", after) if params[:after]
     scope = scope.where("notifications.created_at > ?", since) if params[:since]
     scope = scope.where(
       "notifications.created_at > ?", current_user.notifications_last_read_at
     ) if params[:recent]
 
-    if params[:since]
-      scope = scope.order("notifications.created_at ASC")
-    else
-      scope = scope.order("notifications.created_at DESC")
-    end
-
     scope
   end
 

data/eventifier.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "eventifier"
-  s.version     = '0.0.11'
+  s.version     = '0.0.12'
   s.authors     = ["Nathan Sampimon", "Peter Murray", "Pat Allan"]
   s.email       = ["nathan@inspire9.com"]
   s.homepage    = "http://github.com/inspire9/eventifier"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventifier
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Nathan Sampimon