social_stream-base 0.17.0 → 0.17.1

data/app/assets/javascripts/social_stream.activity.js

@@ -0,0 +1,16 @@
+//= require social_stream.objects
+
+SocialStream.Activity = (function(SS, $, undefined){
+	var scrollToActivity = function(){
+		var activity_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
+		if (activity_hash && activity_hash > 0){
+			$.scrollTo('#activity_' + activity_hash[1] ,1500,{axis:'y'});
+		}
+
+	}
+
+	SS.Objects.addInitCallback(scrollToActivity);
+
+	return {
+	}
+})(SocialStream, jQuery);

data/app/assets/stylesheets/activities.css.scss

@@ -20,7 +20,7 @@
 #wrapper_activities_header {	padding-top: 5px;  padding-bottom: 5px;	background-color: $secondary-color;}
 #activities_title {	vertical-align: top;	margin-left: 10px;	font-weight: bold;}
 #activities_header {	width: 100%;	margin-bottom: 5px;	text-align: center;	padding-top: 5px;min-height: 35px;}
-#activities_header input[type="text"] {	color: $main-color;	padding: 5px 5px 5px 5px; width:95%;
+#activities_header input[type="text"], #activities_header textarea {	color: $main-color;	padding: 5px; width:95%;
   border:1px solid $input-border-color;}
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
 #securities{  display:inline-block;  text-align:left; float: left; padding-left:5px;}

data/app/views/objects/_show.html.erb

@@ -1,7 +1,5 @@
 <% toolbar :profile => object.owner_subject %>
 
-<%= render object.post_activity %>
-
 <%= javascript_tag do %>
   $(function() {
     SocialStream.Objects.init();

data/app/views/posts/show.html.erb

@@ -1,10 +1,4 @@
-<% content_for :javascript do %>
-    var message_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
-    if (message_hash && message_hash > 0){
-      $.scrollTo('#activity_' + message_hash[1] ,1500,{axis:'y'});
-    }
-<% end %>
-
 <%= render :partial => 'objects/show',
            :locals  => { :object => @post } %>
 
+<%= render @post.post_activity %>

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.17.0".freeze
+    VERSION = "0.17.1".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &74428340 !ruby/object:Gem::Requirement
+  requirement: &76571270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *74428340
+  version_requirements: *76571270
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &74428090 !ruby/object:Gem::Requirement
+  requirement: &76568600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *74428090
+  version_requirements: *76568600
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &74427750 !ruby/object:Gem::Requirement
+  requirement: &76567430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *74427750
+  version_requirements: *76567430
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &74427340 !ruby/object:Gem::Requirement
+  requirement: &76566640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *74427340
+  version_requirements: *76566640
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &74426640 !ruby/object:Gem::Requirement
+  requirement: &76565790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *74426640
+  version_requirements: *76565790
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &74426260 !ruby/object:Gem::Requirement
+  requirement: &76564780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *74426260
+  version_requirements: *76564780
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &74425800 !ruby/object:Gem::Requirement
+  requirement: &76564050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *74425800
+  version_requirements: *76564050
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &74425350 !ruby/object:Gem::Requirement
+  requirement: &76562900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *74425350
+  version_requirements: *76562900
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &74424660 !ruby/object:Gem::Requirement
+  requirement: &76562250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *74424660
+  version_requirements: *76562250
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &74424380 !ruby/object:Gem::Requirement
+  requirement: &76561610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *74424380
+  version_requirements: *76561610
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &74424150 !ruby/object:Gem::Requirement
+  requirement: &76561160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74424150
+  version_requirements: *76561160
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &74423780 !ruby/object:Gem::Requirement
+  requirement: &76560710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *74423780
+  version_requirements: *76560710
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &74423440 !ruby/object:Gem::Requirement
+  requirement: &76559970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *74423440
+  version_requirements: *76559970
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &74423070 !ruby/object:Gem::Requirement
+  requirement: &76559650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *74423070
+  version_requirements: *76559650
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &74422790 !ruby/object:Gem::Requirement
+  requirement: &76558950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *74422790
+  version_requirements: *76558950
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &74422540 !ruby/object:Gem::Requirement
+  requirement: &76558000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *74422540
+  version_requirements: *76558000
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &74409950 !ruby/object:Gem::Requirement
+  requirement: &76557140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *74409950
+  version_requirements: *76557140
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &74409710 !ruby/object:Gem::Requirement
+  requirement: &76556750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *74409710
+  version_requirements: *76556750
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &74409470 !ruby/object:Gem::Requirement
+  requirement: &76556100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *74409470
+  version_requirements: *76556100
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &74409240 !ruby/object:Gem::Requirement
+  requirement: &76554490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *74409240
+  version_requirements: *76554490
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &74409010 !ruby/object:Gem::Requirement
+  requirement: &76551540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *74409010
+  version_requirements: *76551540
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &74408770 !ruby/object:Gem::Requirement
+  requirement: &76550070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *74408770
+  version_requirements: *76550070
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &74408430 !ruby/object:Gem::Requirement
+  requirement: &76547020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *74408430
+  version_requirements: *76547020
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &74408090 !ruby/object:Gem::Requirement
+  requirement: &76544820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *74408090
+  version_requirements: *76544820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &74407640 !ruby/object:Gem::Requirement
+  requirement: &76542470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *74407640
+  version_requirements: *76542470
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &74407370 !ruby/object:Gem::Requirement
+  requirement: &76540830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74407370
+  version_requirements: *76540830
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &74406550 !ruby/object:Gem::Requirement
+  requirement: &76538610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74406550
+  version_requirements: *76538610
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &74405980 !ruby/object:Gem::Requirement
+  requirement: &76537000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *74405980
+  version_requirements: *76537000
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &74405540 !ruby/object:Gem::Requirement
+  requirement: &76528490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *74405540
+  version_requirements: *76528490
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &74404890 !ruby/object:Gem::Requirement
+  requirement: &76527450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *74404890
+  version_requirements: *76527450
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &74404410 !ruby/object:Gem::Requirement
+  requirement: &76526190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *74404410
+  version_requirements: *76526190
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &74404050 !ruby/object:Gem::Requirement
+  requirement: &76525210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *74404050
+  version_requirements: *76525210
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -555,6 +555,7 @@ files:
 - app/assets/javascripts/search.js.erb
 - app/assets/javascripts/settings.js
 - app/assets/javascripts/social_stream-base.js
+- app/assets/javascripts/social_stream.activity.js
 - app/assets/javascripts/social_stream.comments.js
 - app/assets/javascripts/social_stream.objects.js
 - app/assets/javascripts/social_stream.search.js.erb