social_stream-linkser 2.0.0.beta2 → 2.0.0.beta3

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1548c0f36650905866abf240fb1d56883e856418
4
- data.tar.gz: f089084ecc6ed58386b4879b5aa78d4b7ba54aff
3
+ metadata.gz: c0c6e100db723ba2cf2e42d0f709682d6ade782f
4
+ data.tar.gz: cbc74aec2c30c59a2c96535c9091eceaa77a65f7
5
5
  SHA512:
6
- metadata.gz: 7c492e86909a93611ade7aeb6117922c1499e1f73882f00c7322f80e9efadee8655481f30aa6dd4ac37d78bc310550f794c650f8f1593625c6650d546b345b00
7
- data.tar.gz: 4b5e178ec29ecd30ba7e43ce755755cf5771e255347cd7844ecb3d419ff1ff96835d8cab65646ce52b1eabf9025029b7bed589e69e417e09076728b4b1249a3f
6
+ metadata.gz: 3a4ee998ea57d47c5941b2c2bfb2b2cc7eb0a4da0e7f933dd377e6582ffe7065c5966eebd6f9f783323c1750ac3caca415b4f6b6def68a3d924a5c488dbc9c99
7
+ data.tar.gz: c199ce9b4088170235baafd56bd150b00c61f1da678ba96f6cf9d641b7d6ea2440aa6360b40664049eef7a608ac3bca5a688bbd2c7c0360993634cd0f34f4300
@@ -11,9 +11,12 @@ SocialStream.Linkser.Wall = (function(SS, $) {
11
11
  }
12
12
 
13
13
  if (regexp.test($("#post_text").val())) {
14
+ $('#post_text').data('link', true);
15
+
14
16
  $("#link_url").val($("#post_text").val());
15
17
  $("#link_loaded").val(false);
16
18
  SS.Wall.changeAction($('#link_preview_loading').attr('data-link_path'));
19
+ SS.Wall.changeOwner('link');
17
20
  SS.Wall.changeRelationSelect('link');
18
21
 
19
22
  if(this.currentValue != this.lastValue) {
@@ -43,15 +46,18 @@ SocialStream.Linkser.Wall = (function(SS, $) {
43
46
 
44
47
  $("#link_preview").show();
45
48
  } else {
46
- resetWallInput({ postText: false });
49
+ if ($('#post_text').data('link')) {
50
+ $('#post_text').data('link', false);
51
+ resetWallInput({ postText: false });
52
+ }
47
53
  }
48
- }
54
+ };
49
55
 
50
56
  var resetWallInput = function(options) {
51
- $("#new_post").attr("action", "/posts");
52
57
  $("#link_preview").hide().html('');
53
58
  $("#link_url").val("");
54
59
  SS.Wall.changeAction();
60
+ SS.Wall.changeOwner('post');
55
61
  SS.Wall.changeRelationSelect('post');
56
62
 
57
63
  if (options.postText) {
@@ -61,7 +67,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
61
67
 
62
68
  var showLoading = function() {
63
69
  $('#link_preview').html($('#link_preview_loading').html());
64
- }
70
+ };
65
71
 
66
72
  var init = function(){
67
73
  $('#link_preview_loading').hide();
@@ -75,7 +81,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
75
81
  }).css('display', 'none')
76
82
  );
77
83
  }
78
- }
84
+ };
79
85
 
80
86
 
81
87
  var create = function() {
@@ -86,6 +92,6 @@ SocialStream.Linkser.Wall = (function(SS, $) {
86
92
 
87
93
  return {
88
94
  create: create
89
- }
95
+ };
90
96
 
91
97
  })(SocialStream, jQuery);
@@ -25,3 +25,4 @@
25
25
  @include ellipsis
26
26
  a
27
27
  @include ellipsis
28
+ font-size: 14px
@@ -35,9 +35,12 @@
35
35
  margin-left: 19px
36
36
  width: 100%
37
37
  .thumb
38
- @include makeColumnoMargin(2, 0)
38
+ width: 170px
39
39
  display: inline
40
40
  margin-right: 16px
41
+ float: left
42
+ img
43
+ float: left
41
44
  .text
42
45
  width: 54%
43
46
  display: inline-block
@@ -45,6 +48,8 @@
45
48
  p
46
49
  a
47
50
  display: block
51
+ iframe
52
+ width: 100%
48
53
  .actions
49
54
  width: 100%
50
55
  display: inline-block
@@ -1,4 +1,3 @@
1
- <%= hidden_field_tag 'link[owner_id]', Actor.normalize_id(receiver) %>
2
1
  <%= hidden_field_tag 'link[url]' %>
3
2
  <%= hidden_field_tag 'link[loaded]', false %>
4
3
  <div id="link_preview_loading" data-link_path="<%= links_path %>">
@@ -1,6 +1,6 @@
1
1
  <%= div_for link do %>
2
2
  <% if link.image %>
3
- <div class="thumb">
3
+ <div class="thumb <%= 'thumb-play' if link.callback_url %>">
4
4
  <% if link.callback_url %>
5
5
  <%= image_tag(link.image) %>
6
6
  <div class="play_over" data-url="<%= link.improved_callback_url %>" data-width="<%= link.width %>" data-height="<%= link.height %>"></div>
@@ -1,16 +1,17 @@
1
+ ---
1
2
  en:
2
3
  linkser:
3
- title: "Linkser"
4
+ title: Linkser
4
5
  link:
5
- by: "by %{author}"
6
- confirm_delete: "Delete link?"
6
+ by: by %{author}
7
+ confirm_delete: Delete link?
7
8
  errors:
8
- loading: "Error loading"
9
- only_webs: "Only webpages are supported"
9
+ loading: Error loading
10
+ only_webs: Only webpages are supported
10
11
  form:
11
- title: "Link"
12
- input: "Write the web address"
13
- name: "link"
14
- one: "a link"
15
- other: "links"
16
- title: "Links"
12
+ title: Link
13
+ input: Write the web address
14
+ name: link
15
+ one: a link
16
+ other: links
17
+ title: Links
@@ -1,16 +1,17 @@
1
+ ---
1
2
  es:
2
3
  linkser:
3
- title: "Linkser"
4
+ title: Linkser
4
5
  link:
5
- by: "por %{author}"
6
- confirm_delete: "¿Borrar enlace?"
6
+ by: por %{author}
7
+ confirm_delete: ¿Borrar enlace?
7
8
  errors:
8
- loading: "Error cargando"
9
- only_webs: "Solo puedes compartir págnas web"
9
+ loading: Error cargando
10
+ only_webs: Solo puedes compartir págnas web
10
11
  form:
11
- title: "Enlace"
12
- input: "Escribe una dirección"
13
- name: "enlace"
14
- one: "un enlace"
15
- other: "enlaces"
16
- title: "Enlaces"
12
+ title: Enlace
13
+ input: Escribe una dirección
14
+ name: enlace
15
+ one: un enlace
16
+ other: enlaces
17
+ title: Enlaces
@@ -0,0 +1,17 @@
1
+ ---
2
+ zh:
3
+ linkser:
4
+ title: Linkser
5
+ link:
6
+ by: by %{author}
7
+ confirm_delete: Delete link?
8
+ errors:
9
+ loading: Error loading
10
+ only_webs: Only webpages are supported
11
+ form:
12
+ title: Link
13
+ input: Write the web address
14
+ name: link
15
+ one: a link
16
+ other: links
17
+ title: Links
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Linkser
3
- VERSION = "2.0.0.beta2".freeze
3
+ VERSION = "2.0.0.beta3".freeze
4
4
  end
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta2')
15
+ s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
16
16
  s.add_runtime_dependency('linkser', '~> 0.0.12')
17
17
  # Development Gem dependencies
18
18
  s.add_development_dependency('sqlite3-ruby')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-linkser
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.beta2
4
+ version: 2.0.0.beta3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eduardo Casanova Cuesta
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-04-18 00:00:00.000000000 Z
12
+ date: 2013-04-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
17
17
  requirements:
18
18
  - - ~>
19
19
  - !ruby/object:Gem::Version
20
- version: 2.0.0.beta2
20
+ version: 2.0.0.beta3
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - ~>
26
26
  - !ruby/object:Gem::Version
27
- version: 2.0.0.beta2
27
+ version: 2.0.0.beta3
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: linkser
30
30
  requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
151
151
  - app/views/links/show.html.erb
152
152
  - config/locales/en.yml
153
153
  - config/locales/es.yml
154
+ - config/locales/zh.yml
154
155
  - config/routes.rb
155
156
  - db/migrate/20120208143739_create_social_stream_linkser.rb
156
157
  - lib/generators/social_stream/linkser/install_generator.rb
@@ -168,8 +169,11 @@ files:
168
169
  - spec/support/devise.rb
169
170
  - spec/support/mock.rb
170
171
  - vendor/assets/javascripts/jquery.jplayer.js
172
+ - vendor/assets/jplayer.blue.monday.video.play.hover.png
173
+ - vendor/assets/jplayer.blue.monday.video.play.png
171
174
  - vendor/assets/stylesheets/jplayer.blue.monday.css
172
175
  - vendor/assets/stylesheets/jplayer.blue.monday.jpg
176
+ - vendor/assets/stylesheets/jplayer.blue.monday.png
173
177
  - vendor/assets/stylesheets/jplayer.blue.monday.video.play.hover.png
174
178
  - vendor/assets/stylesheets/jplayer.blue.monday.video.play.png
175
179
  - vendor/assets/stylesheets/jquery.lightbox.css