Fix redirect to external link.

Author: meric

Diff for: setup.py

@@ -7,7 +7,7 @@
 setup(name = "django-ajax-tile",
       author = "Eric Man",
       url = "http://github.com/GradConnection/django-ajax-tile",
-      version = "0.12",
+      version = "0.13",
       packages = find_packages('src'),
       package_dir = {'tile': 'src/tile'},
       package_data={'tile': ['static/tile/*', 'templates/tile/*']},

Diff for: src/tile/decorators.py

@@ -1,11 +1,12 @@
 import json
+from django.template.response import TemplateResponse
 
-def tile(template, selector, context_data=[], title=None):
+def tile(template=None, selector=None, context_data=[], title=None):
   def _decorator(view):
-    if not isinstance(selector, basestring):
+    if not isinstance(selector, basestring) and selector is not None:
       raise TypeError("selector must be a string")
 
-    if not isinstance(template, basestring):
+    if not isinstance(template, basestring) and template is not None:
       raise TypeError("template must be a string")
 
     if not isinstance(context_data, list):
@@ -29,8 +30,9 @@ def _wrapped(request, *args, **kwargs):
         if context_data:
           data = [(key, response.context_data[key]) for key in context_data]
           response['X-Tile-Context-Data'] = json.dumps(dict(data))
-        response.template_name = "tile/template.html"
-        response.context_data['tile_template_name'] = template
+        if isinstance(response, TemplateResponse):
+          response.template_name = "tile/template.html"
+          response.context_data['tile_template_name'] = template
       return response
     return _wrapped
   return _decorator

Diff for: src/tile/middleware.py

@@ -7,11 +7,19 @@
 from django import http
 
 class TileMiddleware(object):
-  def process_template_response(self, request, response):
+  def process_response(self, request, response):
     protocol = "https://" if request.is_secure() else "http://"
     host = request.get_host()
     path = request.path
-    if response.get('X-Tile-Partial'):
+    
+    if isinstance(response, http.HttpResponseRedirect):
+      response['X-Tile-From-Location'] = response['location']
+      if response.get('X-Tile-Partial'):
+        new_response = http.HttpResponse("")
+        new_response['X-Tile-Partial'] = True
+        new_response['X-Tile-From-Location'] = response['location']
+        return new_response
+    else:
       response['X-Tile-From-Location'] = protocol + host + path
+    
     return response
-

Diff for: src/tile/static/tile/tile.js

@@ -104,6 +104,9 @@
       data: data,
       success: makeSuccess(url, title, data, callback),
       error:function(jqXHR, textStatus, errorThrown){
+        console.log(jqXHR);
+        console.log(textStatus);
+        console.log(errorThrown);
         window.location = url;
       },
       async:false
@@ -224,15 +227,16 @@
 
   function makeSuccess(url, title, data, callback){
     function success(htmlData, textStatus, jqXHR){
+      // Removes the problem of 301 redirected urls not in URL bar.
+      if (jqXHR.getResponseHeader("X-Tile-From-Location")) {
+        url = jqXHR.getResponseHeader("X-Tile-From-Location");
+      }
       var isPartial = jqXHR.getResponseHeader("X-Tile-Partial");
       if (!isPartial) {
         // Load the entire page.
         window.location = url;
       }
       else {
-        // Removes the problem of 301 redirected urls not in URL bar.
-        url = jqXHR.getResponseHeader("X-Tile-From-Location");
-
         // Where downloaded HTML will go.
         var selector = jqXHR.getResponseHeader("X-Tile-Selector");
 
@@ -242,9 +246,14 @@
         // Title to set window to.
         title = title || jqXHR.getResponseHeader("X-Tile-Title");
 
-        pushstate(url, title, data, htmlData, selector, callback, 
-          JSON.parse(metaData));
-
+        try {
+          pushstate(url, title, data, htmlData, selector, callback, 
+          JSON.parse(metaData));  
+        }
+        catch(err) {
+          window.location = url;
+        }
+        
         // Google analytics
         if ( typeof window.pageTracker !== 'undefined' ) {
             window.pageTracker._trackPageview(relativeUrl);