[jan] Remember currently open tab when switching between contact view…

…ing and editing (Request #12609).
horde · Oct 16, 2013 · 9f28496 · 9f28496
1 parent 9713ed6
commit 9f28496
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 19 deletions.
diff --git a/turba/contact.php b/turba/contact.php
@@ -80,20 +80,20 @@
               array('tabname' => 'Contact',
                     'id' => 'tabContact',
                     'class' => 'horde-icon',
-                    'onclick' => 'return ShowTab(\'Contact\');'));
+                    'onclick' => 'return TurbaTabs.showTab(\'Contact\');'));
 if ($contact->hasPermission(Horde_Perms::EDIT)) {
     $tabs->addTab(_("_Edit"), $url,
                   array('tabname' => 'EditContact',
                         'id' => 'tabEditContact',
                         'class' => 'horde-icon',
-                        'onclick' => 'return ShowTab(\'EditContact\');'));
+                        'onclick' => 'return TurbaTabs.showTab(\'EditContact\');'));
 }
 if ($contact->hasPermission(Horde_Perms::DELETE)) {
     $tabs->addTab(_("De_lete"), $url,
                   array('tabname' => 'DeleteContact',
                         'id' => 'tabDeleteContact',
                         'class' => 'horde-icon',
-                        'onclick' => 'return ShowTab(\'DeleteContact\');'));
+                        'onclick' => 'return TurbaTabs.showTab(\'DeleteContact\');'));
 }
 
 @list($own_source, $own_id) = explode(';', $prefs->getValue('own_contact'));

diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
@@ -2,6 +2,8 @@
 v4.2.0-git
 ----------
 
+[jan] Remember currently open tab when switching between contact viewing and
+      editing (Request #12609).
 [jan] Replace categories with tags (Request #9544).
 
 

diff --git a/turba/js/contact_tabs.js b/turba/js/contact_tabs.js
@@ -1,19 +1,37 @@
-var contactTabs = null;
-function ShowTab(tab)
-{
-    if (contactTabs == null) {
-        contactTabs = $('page').select('.horde-buttonbar')[0].down();
-    }
+var TurbaTabs = {
+    // Properties: current, tabs
+
+    showTab: function(tab)
+    {
+        var next, id;
+
+        this.tabs.each(function(item) {
+            id = item.id.substring(3);
+            if (id == tab) {
+                item.addClassName('horde-active');
+                $(id).show();
+                next = id;
+            } else {
+                item.removeClassName('horde-active');
+                if ($(id).visible() &&
+                    !Object.isUndefined(window['sections_Turba_View_' + id])) {
+                    this.current = window['sections_Turba_View_' + id]._get();
+                }
+                $(id).hide();
+            }
+        }, this);
 
-    contactTabs.select('li').each(function(item) {
-        if (item.id == 'tab' + tab) {
-            item.addClassName('horde-active');
-            $(item.id.substring(3)).show();
-        } else {
-            item.removeClassName('horde-active');
-            $(item.id.substring(3)).hide();
+        if (this.current &&
+            !Object.isUndefined(window['sections_Turba_View_' + next])) {
+            window['sections_Turba_View_' + next].toggle(this.current);
         }
-    });
 
-    return false;
-}
+        return false;
+    },
+
+    onDomLoad: function() {
+        this.tabs = $('page').select('.horde-buttonbar')[0].down().select('li');
+    }
+};
+
+document.observe('dom:loaded', TurbaTabs.onDomLoad.bind(TurbaTabs));
diff --git a/turba/package.xml b/turba/package.xml
@@ -40,6 +40,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/asl">ASL</license>
  <notes>
+* [jan] Remember currently open tab when switching between contact viewing and editing (Request #12609).
 * [jan] Replace categories with tags (Request #9544).
  </notes>
  <contents>
@@ -1734,6 +1735,7 @@
    <date>2013-08-15</date>
    <license uri="http://www.horde.org/licenses/asl">ASL</license>
    <notes>
+* [jan] Remember currently open tab when switching between contact viewing and editing (Request #12609).
 * [jan] Replace categories with tags (Request #9544).
    </notes>
   </release>