From 2ad3bb7d134bdc7d87d04df18afa26aec39ca659 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 17 Dec 2013 14:42:16 -0800
Subject: [PATCH] CRM-13997 - Fix unsupported 'selected' param to ui.tabs

---
 templates/CRM/Admin/Page/Extensions.tpl       | 8 +-------
 templates/CRM/Admin/Page/MessageTemplates.tpl | 2 +-
 templates/CRM/Campaign/Page/DashBoard.tpl     | 2 +-
 templates/CRM/Campaign/Page/Vote.tpl          | 2 +-
 templates/CRM/Contact/Page/View/Summary.tpl   | 2 +-
 templates/CRM/UF/Page/Group.tpl               | 2 +-
 templates/CRM/common/TabHeader.tpl            | 2 +-
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/templates/CRM/Admin/Page/Extensions.tpl b/templates/CRM/Admin/Page/Extensions.tpl
index 4a33abbab4..6bc3e1ef21 100644
--- a/templates/CRM/Admin/Page/Extensions.tpl
+++ b/templates/CRM/Admin/Page/Extensions.tpl
@@ -103,19 +103,13 @@
     {* Tab management *}
     <script type="text/javascript">
     var selectedTab  = 'summary';
-    var spinnerImage = '<img src="{$config->resourceBase}i/loading.gif" style="width:10px;height:10px"/>';
     {if $selectedChild}selectedTab = "{$selectedChild}";{/if}
 
     {literal}
 
-    //explicitly stop spinner
-    function stopSpinner( ) {
-      cj('li.crm-tab-button').each(function(){ cj(this).find('span').text(' ');})
-    }
-
     cj( function() {
       var tabIndex = cj('#tab_' + selectedTab).prevAll().length;
-      cj("#mainTabContainer").tabs({ selected: tabIndex, spinner: spinnerImage, cache: true, load: stopSpinner});
+      cj("#mainTabContainer").tabs({ active: tabIndex, cache: true});
       cj(".crm-tab-button").addClass("ui-corner-bottom");
     });
     {/literal}
diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index 3299a83fa1..d2e6b5a74e 100644
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -159,7 +159,7 @@
     {literal}
       cj( function() {
         var tabIndex = cj('#tab_' + selectedTab).prevAll().length
-        cj("#mainTabContainer").tabs( {selected: tabIndex} );
+        cj("#mainTabContainer").tabs( {active: tabIndex} );
       });
     {/literal}
   </script>
diff --git a/templates/CRM/Campaign/Page/DashBoard.tpl b/templates/CRM/Campaign/Page/DashBoard.tpl
index 543bdd7185..f09d44c854 100644
--- a/templates/CRM/Campaign/Page/DashBoard.tpl
+++ b/templates/CRM/Campaign/Page/DashBoard.tpl
@@ -75,7 +75,7 @@ cj(document).ready( function( ) {
 
      var selectedTabIndex = {/literal}{$selectedTabIndex}{literal};
      cj("#mainTabContainer").tabs( {
-                                    selected: selectedTabIndex,
+                                    active: selectedTabIndex,
                                     spinner: spinnerImage,
             cache: true,
             load: stopSpinner
diff --git a/templates/CRM/Campaign/Page/Vote.tpl b/templates/CRM/Campaign/Page/Vote.tpl
index 50cae325f3..77035b08f9 100644
--- a/templates/CRM/Campaign/Page/Vote.tpl
+++ b/templates/CRM/Campaign/Page/Vote.tpl
@@ -58,7 +58,7 @@ cj(document).ready( function( ) {
 
      var selectedTabIndex = {/literal}{$selectedTabIndex}{literal};
      cj("#mainTabContainer").tabs( {
-                             selected: selectedTabIndex,
+                             active: selectedTabIndex,
                              spinner: spinnerImage,
                  cache: false,
                  load: stopSpinner
diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl
index 88cb16f8a2..48cc955d07 100644
--- a/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/templates/CRM/Contact/Page/View/Summary.tpl
@@ -341,7 +341,7 @@
       var tabIndex = $('#tab_' + selectedTab).prevAll().length;
       var spinnerImage = '<img src="{$config->resourceBase}i/loading.gif" style="width:10px;height:10px"/>';
       {literal}
-      $("#mainTabContainer").tabs({ selected: tabIndex, spinner: spinnerImage, cache: true, load: stopSpinner});
+      $("#mainTabContainer").tabs({ active: tabIndex, spinner: spinnerImage, cache: true, load: stopSpinner});
       $(".crm-tab-button").addClass("ui-corner-bottom");
       $().crmAccordions();
 
diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index 0c3e2aea9b..faca606d79 100644
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -159,7 +159,7 @@
     {literal}
       cj( function() {
         var tabIndex = cj('#tab_' + selectedTab).prevAll().length
-        cj("#mainTabContainer").tabs( {selected: tabIndex} );
+        cj("#mainTabContainer").tabs( {active: tabIndex} );
       });
     {/literal}
   </script>
diff --git a/templates/CRM/common/TabHeader.tpl b/templates/CRM/common/TabHeader.tpl
index d025b5fc87..edb0305682 100644
--- a/templates/CRM/common/TabHeader.tpl
+++ b/templates/CRM/common/TabHeader.tpl
@@ -56,7 +56,7 @@
 cj( function() {
     var tabIndex = cj('#tab_' + selectedTab).prevAll().length
     cj("#mainTabContainer").tabs( {
-        selected: tabIndex,
+        active: tabIndex,
         spinner: spinnerImage,
         select: function(event, ui) {
             // we need to change the action of parent form, so that form submits to correct page
-- 
2.25.1