You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@deltacloud.apache.org by lu...@apache.org on 2010/07/09 01:46:53 UTC

svn commit: r962332 - /incubator/deltacloud/trunk/server/lib/sinatra/respond_to.rb

Author: lutter
Date: Thu Jul  8 23:46:53 2010
New Revision: 962332

URL: http://svn.apache.org/viewvc?rev=962332&view=rev
Log:
Fixed wrong handling of XHR requests in respond_to

Modified:
    incubator/deltacloud/trunk/server/lib/sinatra/respond_to.rb

Modified: incubator/deltacloud/trunk/server/lib/sinatra/respond_to.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/sinatra/respond_to.rb?rev=962332&r1=962331&r2=962332&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/sinatra/respond_to.rb (original)
+++ incubator/deltacloud/trunk/server/lib/sinatra/respond_to.rb Thu Jul  8 23:46:53 2010
@@ -52,9 +52,7 @@ module Sinatra
             request.path_info=rpi
             ext = nil
 
-            if request.xhr? && options.assume_xhr_is_js?
-              ext = :js
-            elsif ! $1.nil?
+            if ! $1.nil?
               ext = $1
             elsif env['HTTP_ACCEPT'].nil? || env['HTTP_ACCEPT'].empty?
               ext = options.default_content