From f4af7a1e51ad3c93e67c1d3ecebd3d093fd379d9 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 19 Mar 2014 12:44:49 -0400
Subject: [PATCH] Update window.location assignment to use href property

---
 templates/CRM/Case/Audit/Audit.tpl                   | 2 +-
 templates/CRM/Case/Form/CaseView.js                  | 2 +-
 templates/CRM/Contact/Form/Edit/Lock.tpl             | 4 ++--
 templates/CRM/Contribute/Form/ContributionCharts.tpl | 4 ++--
 templates/CRM/Profile/Form/Dynamic.tpl               | 2 +-
 templates/CRM/Queue/Page/Runner.tpl                  | 4 ++--
 templates/CRM/SMS/Form/Provider.tpl                  | 2 +-
 templates/CRM/common/redirectJS.tpl                  | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/CRM/Case/Audit/Audit.tpl b/templates/CRM/Case/Audit/Audit.tpl
index 0dc42663aa..fa4d48b3fd 100644
--- a/templates/CRM/Case/Audit/Audit.tpl
+++ b/templates/CRM/Case/Audit/Audit.tpl
@@ -176,7 +176,7 @@ There's the potential for collisions (two different labels having the same short
           dataUrl     = dataUrl + '&cid={/literal}{$clientID}{literal}'+'&selectedChild=case';
        }
 
-       window.location =  dataUrl;
+       window.location.href =  dataUrl;
 }
 </script>
 {/literal}
diff --git a/templates/CRM/Case/Form/CaseView.js b/templates/CRM/Case/Form/CaseView.js
index 751e6ea7ee..d4cb479233 100644
--- a/templates/CRM/Case/Form/CaseView.js
+++ b/templates/CRM/Case/Form/CaseView.js
@@ -10,7 +10,7 @@
       CRM.loadForm(url).on('crmFormSuccess', refresh);
     }
     else {
-      window.location = url;
+      window.location.href = url;
     }
   }
 
diff --git a/templates/CRM/Contact/Form/Edit/Lock.tpl b/templates/CRM/Contact/Form/Edit/Lock.tpl
index ff9bb72221..a8807e50fa 100644
--- a/templates/CRM/Contact/Form/Edit/Lock.tpl
+++ b/templates/CRM/Contact/Form/Edit/Lock.tpl
@@ -20,7 +20,7 @@ cj(function() {
   cj('<button>')
     .text("{/literal}{ts}Reload Page{/ts}{literal}")
     .click(function() {
-      window.location = CRM.url('civicrm/contact/add', {
+      window.location.href = CRM.url('civicrm/contact/add', {
         reset: 1,
         action: 'update',
         cid: {/literal}{$contactId}{literal}
@@ -31,4 +31,4 @@ cj(function() {
     ;
 });
 </script>
-{/literal}
\ No newline at end of file
+{/literal}
diff --git a/templates/CRM/Contribute/Form/ContributionCharts.tpl b/templates/CRM/Contribute/Form/ContributionCharts.tpl
index fd122d4f8b..5a57775480 100644
--- a/templates/CRM/Contribute/Form/ContributionCharts.tpl
+++ b/templates/CRM/Contribute/Form/ContributionCharts.tpl
@@ -85,13 +85,13 @@
   function byMonthOnClick( barIndex ) {
      var allData = {/literal}{$openFlashChartData}{literal};
      var url     = eval( "allData.by_month.on_click_urls.url_" + barIndex );
-     if ( url ) window.location = url;
+     if ( url ) window.location.href = url;
   }
 
   function byYearOnClick( barIndex ) {
      var allData = {/literal}{$openFlashChartData}{literal};
      var url     = eval( "allData.by_year.on_click_urls.url_" + barIndex );
-     if ( url ) window.location = url;
+     if ( url ) window.location.href = url;
   }
 
  </script>
diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl
index 67fcf6e423..4128130207 100644
--- a/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/templates/CRM/Profile/Form/Dynamic.tpl
@@ -46,7 +46,7 @@ function checkResponse(responseText, statusText, xhr, $form) {
   //if there is any form error show the dialog
   //else redirect to post url
   if (!cj(responseText).find('.crm-error').html()) {
-    window.location = '{/literal}{$postUrl}{literal}';
+    window.location.href = '{/literal}{$postUrl}{literal}';
   }
 } 
 </script>
diff --git a/templates/CRM/Queue/Page/Runner.tpl b/templates/CRM/Queue/Page/Runner.tpl
index b0b14e35ed..edaa4758ca 100644
--- a/templates/CRM/Queue/Page/Runner.tpl
+++ b/templates/CRM/Queue/Page/Runner.tpl
@@ -23,7 +23,7 @@ cj(function() {
 
   var displayResponseData = function(data, textStatus, jqXHR) {
     if (data.redirect_url) {
-      window.location = data.redirect_url;
+      window.location.href = data.redirect_url;
       return;
     }
     
@@ -143,4 +143,4 @@ cj(function() {
 });
 
 </script>
-{/literal}
\ No newline at end of file
+{/literal}
diff --git a/templates/CRM/SMS/Form/Provider.tpl b/templates/CRM/SMS/Form/Provider.tpl
index b4437ed2a6..e48012d710 100644
--- a/templates/CRM/SMS/Form/Provider.tpl
+++ b/templates/CRM/SMS/Form/Provider.tpl
@@ -82,7 +82,7 @@
         var url = {/literal}"{$refreshURL}"{literal}
         var post = url + "&key=" + provider.value;
         if( refresh ) {
-            window.location = post; 
+            window.location.href = post;
         }
     }
 {/literal}
diff --git a/templates/CRM/common/redirectJS.tpl b/templates/CRM/common/redirectJS.tpl
index 350f81fa65..0dac59a7c8 100644
--- a/templates/CRM/common/redirectJS.tpl
+++ b/templates/CRM/common/redirectJS.tpl
@@ -1,7 +1,7 @@
 <html>
 <head>
 <script type="text/javascript">
-  window.location = "{$redirectURL}"
+  window.location.href = "{$redirectURL}"
 </script>
 <title>{$title}</title>
 </head>
@@ -11,4 +11,4 @@
 {$message}
 </p>
 </body>
-</html>
\ No newline at end of file
+</html>
-- 
2.25.1