social_stream-base 0.17.0 → 0.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/app/assets/javascripts/social_stream.activity.js +16 -0
  2. data/app/assets/stylesheets/activities.css.scss +1 -1
  3. data/app/views/objects/_show.html.erb +0 -2
  4. data/app/views/posts/show.html.erb +1 -7
  5. data/lib/social_stream/base/version.rb +1 -1
  6. metadata +66 -65
data/app/assets/javascripts/social_stream.activity.js ADDED
@@ -0,0 +1,16 @@
1
+ //= require social_stream.objects
2
+
3
+ SocialStream.Activity = (function(SS, $, undefined){
4
+ var scrollToActivity = function(){
5
+ var activity_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
6
+ if (activity_hash && activity_hash > 0){
7
+ $.scrollTo('#activity_' + activity_hash[1] ,1500,{axis:'y'});
8
+ }
9
+
10
+ }
11
+
12
+ SS.Objects.addInitCallback(scrollToActivity);
13
+
14
+ return {
15
+ }
16
+ })(SocialStream, jQuery);
data/app/assets/stylesheets/activities.css.scss CHANGED
@@ -20,7 +20,7 @@
20
20
  #wrapper_activities_header { padding-top: 5px; padding-bottom: 5px; background-color: $secondary-color;}
21
21
  #activities_title { vertical-align: top; margin-left: 10px; font-weight: bold;}
22
22
  #activities_header { width: 100%; margin-bottom: 5px; text-align: center; padding-top: 5px;min-height: 35px;}
23
- #activities_header input[type="text"] { color: $main-color; padding: 5px 5px 5px 5px; width:95%;
23
+ #activities_header input[type="text"], #activities_header textarea { color: $main-color; padding: 5px; width:95%;
24
24
  border:1px solid $input-border-color;}
25
25
  #activities_share_btn { text-align: right; padding: 5px 16px 0px 10px; vertical-align: middle;}
26
26
  #securities{ display:inline-block; text-align:left; float: left; padding-left:5px;}
data/app/views/objects/_show.html.erb CHANGED
@@ -1,7 +1,5 @@
1
1
  <% toolbar :profile => object.owner_subject %>
2
2
 
3
- <%= render object.post_activity %>
4
-
5
3
  <%= javascript_tag do %>
6
4
  $(function() {
7
5
  SocialStream.Objects.init();
data/app/views/posts/show.html.erb CHANGED
@@ -1,10 +1,4 @@
1
- <% content_for :javascript do %>
2
- var message_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
3
- if (message_hash && message_hash > 0){
4
- $.scrollTo('#activity_' + message_hash[1] ,1500,{axis:'y'});
5
- }
6
- <% end %>
7
-
8
1
  <%= render :partial => 'objects/show',
9
2
  :locals => { :object => @post } %>
10
3
 
4
+ <%= render @post.post_activity %>
data/lib/social_stream/base/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Base
3
- VERSION = "0.17.0".freeze
3
+ VERSION = "0.17.1".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-base
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.17.0
4
+ version: 0.17.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2012-03-07 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &74428340 !ruby/object:Gem::Requirement
17
+ requirement: &76571270 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 3.1.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *74428340
25
+ version_requirements: *76571270
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ancestry
28
- requirement: &74428090 !ruby/object:Gem::Requirement
28
+ requirement: &76568600 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 1.2.3
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *74428090
36
+ version_requirements: *76568600
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: foreigner
39
- requirement: &74427750 !ruby/object:Gem::Requirement
39
+ requirement: &76567430 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 1.1.1
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *74427750
47
+ version_requirements: *76567430
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: devise
50
- requirement: &74427340 !ruby/object:Gem::Requirement
50
+ requirement: &76566640 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 1.5.3
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *74427340
58
+ version_requirements: *76566640
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: inherited_resources
61
- requirement: &74426640 !ruby/object:Gem::Requirement
61
+ requirement: &76565790 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 1.3.0
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *74426640
69
+ version_requirements: *76565790
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: stringex
72
- requirement: &74426260 !ruby/object:Gem::Requirement
72
+ requirement: &76564780 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: 1.3.0
78
78
  type: :runtime
79
79
  prerelease: false
80
- version_requirements: *74426260
80
+ version_requirements: *76564780
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: avatars_for_rails
83
- requirement: &74425800 !ruby/object:Gem::Requirement
83
+ requirement: &76564050 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: 0.2.2
89
89
  type: :runtime
90
90
  prerelease: false
91
- version_requirements: *74425800
91
+ version_requirements: *76564050
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: jquery-rails
94
- requirement: &74425350 !ruby/object:Gem::Requirement
94
+ requirement: &76562900 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: 1.0.9
100
100
  type: :runtime
101
101
  prerelease: false
102
- version_requirements: *74425350
102
+ version_requirements: *76562900
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: cancan
105
- requirement: &74424660 !ruby/object:Gem::Requirement
105
+ requirement: &76562250 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: 1.6.4
111
111
  type: :runtime
112
112
  prerelease: false
113
- version_requirements: *74424660
113
+ version_requirements: *76562250
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
- requirement: &74424380 !ruby/object:Gem::Requirement
116
+ requirement: &76561610 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: 0.13.0
122
122
  type: :runtime
123
123
  prerelease: false
124
- version_requirements: *74424380
124
+ version_requirements: *76561610
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth
127
- requirement: &74424150 !ruby/object:Gem::Requirement
127
+ requirement: &76561160 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ~>
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: 1.0.2
133
133
  type: :runtime
134
134
  prerelease: false
135
- version_requirements: *74424150
135
+ version_requirements: *76561160
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: omniauth-facebook
138
- requirement: &74423780 !ruby/object:Gem::Requirement
138
+ requirement: &76560710 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ~>
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: 1.2.0
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *74423780
146
+ version_requirements: *76560710
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: omniauth-linkedin
149
- requirement: &74423440 !ruby/object:Gem::Requirement
149
+ requirement: &76559970 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ~>
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: 0.0.6
155
155
  type: :runtime
156
156
  prerelease: false
157
- version_requirements: *74423440
157
+ version_requirements: *76559970
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: mailboxer
160
- requirement: &74423070 !ruby/object:Gem::Requirement
160
+ requirement: &76559650 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ~>
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: 0.6.0
166
166
  type: :runtime
167
167
  prerelease: false
168
- version_requirements: *74423070
168
+ version_requirements: *76559650
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: acts-as-taggable-on
171
- requirement: &74422790 !ruby/object:Gem::Requirement
171
+ requirement: &76558950 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ~>
@@ -176,10 +176,10 @@ dependencies:
176
176
  version: 2.2.2
177
177
  type: :runtime
178
178
  prerelease: false
179
- version_requirements: *74422790
179
+ version_requirements: *76558950
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: formtastic
182
- requirement: &74422540 !ruby/object:Gem::Requirement
182
+ requirement: &76558000 !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
185
185
  - - ~>
@@ -187,10 +187,10 @@ dependencies:
187
187
  version: 1.2.3
188
188
  type: :runtime
189
189
  prerelease: false
190
- version_requirements: *74422540
190
+ version_requirements: *76558000
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: simple-navigation
193
- requirement: &74409950 !ruby/object:Gem::Requirement
193
+ requirement: &76557140 !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
196
  - - ~>
@@ -198,10 +198,10 @@ dependencies:
198
198
  version: 3.5.1
199
199
  type: :runtime
200
200
  prerelease: false
201
- version_requirements: *74409950
201
+ version_requirements: *76557140
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: resque
204
- requirement: &74409710 !ruby/object:Gem::Requirement
204
+ requirement: &76556750 !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
207
207
  - - ~>
@@ -209,10 +209,10 @@ dependencies:
209
209
  version: 1.19.0
210
210
  type: :runtime
211
211
  prerelease: false
212
- version_requirements: *74409710
212
+ version_requirements: *76556750
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: modernizr-rails
215
- requirement: &74409470 !ruby/object:Gem::Requirement
215
+ requirement: &76556100 !ruby/object:Gem::Requirement
216
216
  none: false
217
217
  requirements:
218
218
  - - ~>
@@ -220,10 +220,10 @@ dependencies:
220
220
  version: 2.0.6
221
221
  type: :runtime
222
222
  prerelease: false
223
- version_requirements: *74409470
223
+ version_requirements: *76556100
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: thinking-sphinx
226
- requirement: &74409240 !ruby/object:Gem::Requirement
226
+ requirement: &76554490 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
229
  - - ~>
@@ -231,10 +231,10 @@ dependencies:
231
231
  version: 2.0.8
232
232
  type: :runtime
233
233
  prerelease: false
234
- version_requirements: *74409240
234
+ version_requirements: *76554490
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: sass-rails
237
- requirement: &74409010 !ruby/object:Gem::Requirement
237
+ requirement: &76551540 !ruby/object:Gem::Requirement
238
238
  none: false
239
239
  requirements:
240
240
  - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
242
242
  version: 3.1.0
243
243
  type: :runtime
244
244
  prerelease: false
245
- version_requirements: *74409010
245
+ version_requirements: *76551540
246
246
  - !ruby/object:Gem::Dependency
247
247
  name: rails_autolink
248
- requirement: &74408770 !ruby/object:Gem::Requirement
248
+ requirement: &76550070 !ruby/object:Gem::Requirement
249
249
  none: false
250
250
  requirements:
251
251
  - - ~>
@@ -253,10 +253,10 @@ dependencies:
253
253
  version: 1.0.4
254
254
  type: :runtime
255
255
  prerelease: false
256
- version_requirements: *74408770
256
+ version_requirements: *76550070
257
257
  - !ruby/object:Gem::Dependency
258
258
  name: social_cheesecake
259
- requirement: &74408430 !ruby/object:Gem::Requirement
259
+ requirement: &76547020 !ruby/object:Gem::Requirement
260
260
  none: false
261
261
  requirements:
262
262
  - - ~>
@@ -264,10 +264,10 @@ dependencies:
264
264
  version: 0.4.0
265
265
  type: :runtime
266
266
  prerelease: false
267
- version_requirements: *74408430
267
+ version_requirements: *76547020
268
268
  - !ruby/object:Gem::Dependency
269
269
  name: i18n-js
270
- requirement: &74408090 !ruby/object:Gem::Requirement
270
+ requirement: &76544820 !ruby/object:Gem::Requirement
271
271
  none: false
272
272
  requirements:
273
273
  - - ~>
@@ -275,10 +275,10 @@ dependencies:
275
275
  version: 2.1.2
276
276
  type: :runtime
277
277
  prerelease: false
278
- version_requirements: *74408090
278
+ version_requirements: *76544820
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: capybara
281
- requirement: &74407640 !ruby/object:Gem::Requirement
281
+ requirement: &76542470 !ruby/object:Gem::Requirement
282
282
  none: false
283
283
  requirements:
284
284
  - - ~>
@@ -286,10 +286,10 @@ dependencies:
286
286
  version: 0.3.9
287
287
  type: :development
288
288
  prerelease: false
289
- version_requirements: *74407640
289
+ version_requirements: *76542470
290
290
  - !ruby/object:Gem::Dependency
291
291
  name: sqlite3-ruby
292
- requirement: &74407370 !ruby/object:Gem::Requirement
292
+ requirement: &76540830 !ruby/object:Gem::Requirement
293
293
  none: false
294
294
  requirements:
295
295
  - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
297
297
  version: '0'
298
298
  type: :development
299
299
  prerelease: false
300
- version_requirements: *74407370
300
+ version_requirements: *76540830
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: ruby-debug19
303
- requirement: &74406550 !ruby/object:Gem::Requirement
303
+ requirement: &76538610 !ruby/object:Gem::Requirement
304
304
  none: false
305
305
  requirements:
306
306
  - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
308
308
  version: '0'
309
309
  type: :development
310
310
  prerelease: false
311
- version_requirements: *74406550
311
+ version_requirements: *76538610
312
312
  - !ruby/object:Gem::Dependency
313
313
  name: rspec-rails
314
- requirement: &74405980 !ruby/object:Gem::Requirement
314
+ requirement: &76537000 !ruby/object:Gem::Requirement
315
315
  none: false
316
316
  requirements:
317
317
  - - ~>
@@ -319,10 +319,10 @@ dependencies:
319
319
  version: 2.6.1
320
320
  type: :development
321
321
  prerelease: false
322
- version_requirements: *74405980
322
+ version_requirements: *76537000
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: factory_girl
325
- requirement: &74405540 !ruby/object:Gem::Requirement
325
+ requirement: &76528490 !ruby/object:Gem::Requirement
326
326
  none: false
327
327
  requirements:
328
328
  - - ~>
@@ -330,10 +330,10 @@ dependencies:
330
330
  version: 1.3.2
331
331
  type: :development
332
332
  prerelease: false
333
- version_requirements: *74405540
333
+ version_requirements: *76528490
334
334
  - !ruby/object:Gem::Dependency
335
335
  name: forgery
336
- requirement: &74404890 !ruby/object:Gem::Requirement
336
+ requirement: &76527450 !ruby/object:Gem::Requirement
337
337
  none: false
338
338
  requirements:
339
339
  - - ~>
@@ -341,10 +341,10 @@ dependencies:
341
341
  version: 0.4.2
342
342
  type: :development
343
343
  prerelease: false
344
- version_requirements: *74404890
344
+ version_requirements: *76527450
345
345
  - !ruby/object:Gem::Dependency
346
346
  name: ci_reporter
347
- requirement: &74404410 !ruby/object:Gem::Requirement
347
+ requirement: &76526190 !ruby/object:Gem::Requirement
348
348
  none: false
349
349
  requirements:
350
350
  - - ~>
@@ -352,10 +352,10 @@ dependencies:
352
352
  version: 1.6.4
353
353
  type: :development
354
354
  prerelease: false
355
- version_requirements: *74404410
355
+ version_requirements: *76526190
356
356
  - !ruby/object:Gem::Dependency
357
357
  name: nifty-generators
358
- requirement: &74404050 !ruby/object:Gem::Requirement
358
+ requirement: &76525210 !ruby/object:Gem::Requirement
359
359
  none: false
360
360
  requirements:
361
361
  - - ~>
@@ -363,7 +363,7 @@ dependencies:
363
363
  version: 0.4.5
364
364
  type: :development
365
365
  prerelease: false
366
- version_requirements: *74404050
366
+ version_requirements: *76525210
367
367
  description: ! 'Social Stream is a Ruby on Rails engine providing your application
368
368
  with social networking features and activity streams.
369
369
 
@@ -555,6 +555,7 @@ files:
555
555
  - app/assets/javascripts/search.js.erb
556
556
  - app/assets/javascripts/settings.js
557
557
  - app/assets/javascripts/social_stream-base.js
558
+ - app/assets/javascripts/social_stream.activity.js
558
559
  - app/assets/javascripts/social_stream.comments.js
559
560
  - app/assets/javascripts/social_stream.objects.js
560
561
  - app/assets/javascripts/social_stream.search.js.erb