From c5f0342ad87ba91d43e8b99bfc82039cdbf998a2 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Fri, 29 Apr 2011 23:38:08 +0200
Subject: Don't check url (by HEAD request) before navigateTo

Removed angular.scenario.Application.checkUrlStatus_ method and these tests:
* should call error handler if status check fails
* should perform a HEAD request to verify file existence
* should call error handler if status code is less than 200
* should call error handler if status code is greater than 299
* should call error handler if status code is greater than 299
---
 src/scenario/Application.js | 52 ++++++++-------------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

(limited to 'src/scenario/Application.js')

diff --git a/src/scenario/Application.js b/src/scenario/Application.js
index 988dae90..b2c372de 100644
--- a/src/scenario/Application.js
+++ b/src/scenario/Application.js
@@ -37,35 +37,6 @@ angular.scenario.Application.prototype.getWindow_ = function() {
   return contentWindow;
 };
 
-/**
- * Checks that a URL would return a 2xx success status code. Callback is called
- * with no arguments on success, or with an error on failure.
- *
- * Warning: This requires the server to be able to respond to HEAD requests
- * and not modify the state of your application.
- *
- * @param {string} url Url to check
- * @param {Function} callback function(error) that is called with result.
- */
-angular.scenario.Application.prototype.checkUrlStatus_ = function(url, callback) {
-  var self = this;
-  _jQuery.ajax({
-    url: url.replace(/#.*/, ''), //IE encodes and sends the url fragment, so we must strip it
-    type: 'HEAD',
-    complete: function(request) {
-      if (request.status < 200 || request.status >= 300) {
-        if (!request.status) {
-          callback.call(self, 'Sandbox Error: Cannot access ' + url);
-        } else {
-          callback.call(self, request.status + ' ' + request.statusText);
-        }
-      } else {
-        callback.call(self);
-      }
-    }
-  });
-};
-
 /**
  * Changes the location of the frame.
  *
@@ -87,21 +58,16 @@ angular.scenario.Application.prototype.navigateTo = function(url, loadFn, errorF
     this.executeAction(loadFn);
   } else {
     frame.css('display', 'none').attr('src', 'about:blank');
-    this.checkUrlStatus_(url, function(error) {
-      if (error) {
-        return errorFn(error);
+    this.context.find('#test-frames').append('<iframe>');
+    frame = this.getFrame_();
+    frame.load(function() {
+      frame.unbind();
+      try {
+        self.executeAction(loadFn);
+      } catch (e) {
+        errorFn(e);
       }
-      self.context.find('#test-frames').append('<iframe>');
-      frame = this.getFrame_();
-      frame.load(function() {
-        frame.unbind();
-        try {
-          self.executeAction(loadFn);
-        } catch (e) {
-          errorFn(e);
-        }
-      }).attr('src', url);
-    });
+    }).attr('src', url);
   }
   this.context.find('> h2 a').attr('href', url).text(url);
 };
-- 
cgit v1.2.3