CRM-13997 - Fix unsupported 'selected' param to ui.tabs

diff --git a/templates/CRM/Admin/Page/Extensions.tpl b/templates/CRM/Admin/Page/Extensions.tpl
index 4a33abbab4eb72c92018bf691c45f2bac73dec7c..6bc3e1ef2171c6e51daa73e5d4c02f3c2007c46b 100644 (file)
--- 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 3299a83fa109fdf9f77d66fcd8fc71c5ca9d6bfa..d2e6b5a74eda35d2b32f1f767afbbad99a558ef9 100644 (file)
--- 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 543bdd7185d8dfa8c15e8aba10c51c07ae7dc5e3..f09d44c854da4e8deed897d54fdfb6794c08009b 100644 (file)
--- 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 50cae325f3d6d4a8bd1ff6a96d2f49bf87f92eb3..77035b08f991e875e316eee347afd9685f994a64 100644 (file)
--- 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 88cb16f8a2d093e2f7841d39ad8ec81f0a16186b..48cc955d0799950746bfdcdae6da07c49f2863df 100644 (file)
--- 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 0c3e2aea9be561d93fe3dbb5d0ea502d0059a3ab..faca606d792966242fadd1902e271066fd67042f 100644 (file)
--- 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 d025b5fc878fac8d2c5d3065c27705cfa80c3b4b..edb0305682852f07e344caa595145b84e827393c 100644 (file)
--- 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