plataforma_social 0.0.25 → 0.0.26

data/lib/plataforma_social/facebook.rb

@@ -29,7 +29,7 @@ module PlataformaSocial
           end
         end
       end
-
+      
       render :text => %|<script type="text/javascript">window.top.location.href="#{@oauth.url_for_oauth_code(:permissions => PlataformaSocial.configuration.facebook_scope)}";</script>| if redirect
     end
     

data/lib/plataforma_social/helpers.rb

@@ -94,28 +94,30 @@ module PlataformaSocial
       params.present? && params[:controller].present? && params[:controller].index(PlataformaSocial.admin_controller_name) == 0
     end
     
-    def link_to_facebook *args, &block
-      if block_given?
-        href = capture(&block)
-        
-        args.unshift(href)
-        
-        link_to_facebook *args
+    def link_to *args, &block
+      args[2] ||= {}
+      
+      if args[2][:normal] === true
+        super
       else
-        args[2] ||= {}
-        
-        server_domain = request.env['HTTP_HOST']
-        url           = 'apps.facebook.com/' + PlataformaSocial.facebook_app_namespace 
-        
-        if args[1].include? server_domain
-          args[1].gsub! server_domain, url
-        else
-          args[1] = request.protocol + url + args[1]
+        unless block_given?
+          if from_facebook? && !from_admin?
+            server_domain = request.env['HTTP_HOST']
+            url           = 'apps.facebook.com/' + PlataformaSocial.facebook_app_namespace 
+            
+            if args[1].include? server_domain
+              args[1].gsub! server_domain, url
+            else
+              args[1] = request.protocol + url + args[1]
+            end
+          
+            args[2][:target] = '_top'
+          else
+            super
+          end
         end
-      
-        args[2][:target] = '_top'
         
-        return link_to *args
+        super
       end
     end
   end

data/lib/plataforma_social/version.rb

@@ -1,3 +1,3 @@
 module PlataformaSocial
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plataforma_social
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors: