social_stream-linkser 0.7.0 → 0.7.1

data/app/assets/javascripts/linkser.js.erb

@@ -1,25 +1,30 @@
-var SocialStream = SocialStream || {};
-SocialStream.Linkser = SocialStream.Linkser || {};
-SocialStream.Linkser.initiate = function() {
-  $.preloadImages("<%= asset_path('loading.gif') %>");
+//= require social_stream.wall
+
+SocialStream.Linkser.Wall = (function(SS, $) {
+  var regexp = /^(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&;:\/~+#-]*[\w@?^=%&;\/~+#-])?$/
+
   var urlDetect = function() {
     this.currentValue = $("#input_activities").val();
+
     if(this.lastValue == null)
       this.lastValue = "";
 
-    var regexp = /^(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&;:\/~+#-]*[\w@?^=%&;\/~+#-])?$/
     if(regexp.test($("#input_activities").val())) {
       $("#link_url").val($("#input_activities").val());
       $("#link_loaded").val(false);
       $("#new_post").attr("action", "/links");
+
       if(this.currentValue != this.lastValue) {
         $("#link_preview").html($('<img>').attr('src', '<%= asset_path('loading.gif') %>').addClass('loading'));
+
         this.lastValue = this.currentValue;
         var url = this.currentValue;
         var urlDetect = this;
+
         $.ajax({
           type : "GET",
           url : "/linkser_parse?url=" + url,
+          dataType: 'html',
           success : function(html) {
             if($("#input_activities").val() == url) {//Only show if input value is still the same
               $("#link_preview").html(html);
@@ -33,6 +38,7 @@ SocialStream.Linkser.initiate = function() {
           }
         });
       }
+
       $("#link_preview").show();
     } else {
       $("#new_post").attr("action", "/posts");
@@ -41,23 +47,36 @@ SocialStream.Linkser.initiate = function() {
       $("#link_url").val("");
     }
   }
-  if($("#new_post").length) {
-    $("#input_activities").change(urlDetect).keyup(urlDetect);
-    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[owner_id]').attr('id', 'link_owner_id').val($("#post_owner_id").val()));
-    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[url]').attr('id', 'link_url'));
-    $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[loaded]').attr('id', 'link_loaded').val(false));
-    $("#new_post").append($('<div>').attr('id', 'link_preview').css('display', 'none'));
+
+  var init = function(){
+    $.preloadImages("<%= asset_path('loading.gif') %>");
+
+    if($("#new_post").length) {
+      $("#input_activities").change(urlDetect).keyup(urlDetect);
+
+      $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[owner_id]').attr('id', 'link_owner_id').val($("#post_owner_id").val()));
+      $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[url]').attr('id', 'link_url'));
+      $("#new_post").append($('<input>').attr('type', 'hidden').attr('name', 'link[loaded]').attr('id', 'link_loaded').val(false));
+      $("#new_post").append($('<div>').attr('id', 'link_preview').css('display', 'none'));
+    }
   }
-}
 
-SocialStream.Linkser.openCallback = function(id,url,w,h){
+  var openCallback = function(id,url,w,h){
       var height='353';
+
       if(w>0 && h>0) {
           height=470*h/w;
       }
+
       $("#" + id).html($('<iframe>').attr('src',url).attr('width','470').attr('height',height));
-}
+  }
+
+  SocialStream.Wall.addInitCallback(init);
+
+  return {
+    openCallback: openCallback
+  }
+
+})(SocialStream, jQuery);
+
 
-$(function(){
-  SocialStream.Linkser.initiate();
-});

data/app/assets/javascripts/social_stream-linkser.js

@@ -1,2 +1,6 @@
+//= require social_stream-base
+//
+//= require_self
 //= require_tree .
 
+SocialStream.Linkser = SocialStream.Linkser || {};

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

@@ -47,7 +47,7 @@
 }
 .link .info{
   float: left;
-  width: 360px;
+  width: 350px;
   text-align: left;
 }
 .activity_objects .link .info{
@@ -61,7 +61,8 @@
   text-decoration: underline;
   margin-bottom: 5px;
 }
-.link .info .description{
+.link .info .description textarea {
+	height: 60px;
 }
 .link iframe{
   border: 0;

data/app/views/links/_link.html.erb

@@ -7,7 +7,7 @@
         <%= javascript_tag do %>
           $("#link_<%= link.id.to_s %> img").each(function(){
             $(this).click(function(){
-              SocialStream.Linkser.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>", "<%= link.width %>", "<%= link.height %>");
+              SocialStream.Linkser.Wall.openCallback("link_<%= link.id.to_s %>", "<%= link.callback_url %>", "<%= link.width %>", "<%= link.height %>");
             });
           });
           

data/app/views/links/_link_preview.html.erb

@@ -6,21 +6,14 @@
     </div>
   <% end %>
   <div class="info">
-    <% if link.title %>
-      <div class="title">
-        <%= link.title %>
-        <%= hidden_field_tag "link[title]", link.title %>
-      </div>
-    <% end %>
-    <div class="url">
-      <%= auto_link(link.url) %>
+    <div class="title">
+      <%= text_field_tag "link[title]", link.title %>
     </div>
-    <% if link.description %>
-      <div class="description">
-        <%= auto_link(link.description) %>
-        <%= hidden_field_tag "link[description]", link.description %>
-      </div>
-    <% end %>
+
+    <div class="description">
+      <%= text_area_tag "link[description]", link.description %>
+    </div>
+
     <% if link.callback_url %>
         <%= hidden_field_tag "link[callback_url]", link.callback_url %>
     <% end %>

data/app/views/links/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 => @link } %>
 
+<%= render @link.post_activity %>

data/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.7.0".freeze
+    VERSION = "0.7.1".freeze
   end
 end

data/social_stream-linkser.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.17.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.1')
   s.add_runtime_dependency('linkser', '~> 0.0.10')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-linkser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,18 +14,18 @@ date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &86006300 !ruby/object:Gem::Requirement
+  requirement: &76541690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.17.1
   type: :runtime
   prerelease: false
-  version_requirements: *86006300
+  version_requirements: *76541690
 - !ruby/object:Gem::Dependency
   name: linkser
-  requirement: &86005920 !ruby/object:Gem::Requirement
+  requirement: &76541250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *86005920
+  version_requirements: *76541250
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &86005720 !ruby/object:Gem::Requirement
+  requirement: &76540900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86005720
+  version_requirements: *76540900
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &86005410 !ruby/object:Gem::Requirement
+  requirement: &76540230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *86005410
+  version_requirements: *76540230
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &86005150 !ruby/object:Gem::Requirement
+  requirement: &76539430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *86005150
+  version_requirements: *76539430
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &86004900 !ruby/object:Gem::Requirement
+  requirement: &76538560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.6
   type: :development
   prerelease: false
-  version_requirements: *86004900
+  version_requirements: *76538560
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &86004660 !ruby/object:Gem::Requirement
+  requirement: &76536370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *86004660
+  version_requirements: *76536370
 description: Social Stream Linkser provides Linkser support in Social Stream, the
   core for building social network websites.
 email: ecasanovac@gmail.com