Changeset edfe9173 in github

Timestamp:

Jun 30, 2010 3:37:48 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

3940ba6

Parents:

98570f6

Message:

• Improved command() to call simple command functions directly

File:

• program/js/app.js (modified) (15 diffs)

program/js/app.js

@@ -485 +485 @@
         break;
 
-      // misc list commands
       case 'list':
         if (this.task=='mail') {
@@ -505 +504 @@
         break;
 
-
-      case 'listgroup':
-        this.list_contacts(props.source, props.id);
-        break;
-
-
       case 'load-headers':
         this.load_headers(obj);
         break;
-
 
       case 'sort':
@@ -557 +549 @@
           this.purge_mailbox(this.env.mailbox);
         break;
-
 
       // common commands used in multiple tasks
@@ -598 +589 @@
         break;
 
-      case 'save-identity':
       case 'save':
         if (this.gui_objects.editform) {
@@ -880 +870 @@
         break;
 
-      case 'remove-attachment':
-        this.remove_attachment(props);
-        break;
-
       case 'insert-sig':
         this.change_identity($("[name='_from']")[0], true);
@@ -928 +914 @@
         break;
 
-      case 'add-contact':
-        this.add_contact(props);
-        break;
-
       // quicksearch
       case 'search':
@@ -952 +934 @@
         break;
 
-      case 'group-create':
-        this.add_contact_group(props)
-        break;
-
-      case 'group-rename':
-        this.rename_contact_group();
-        break;
-
-      case 'group-delete':
-        this.delete_contact_group();
+      case 'listgroup':
+        this.list_contacts(props.source, props.id);
         break;
 
@@ -989 +963 @@
         break;
 
-      // collapse/expand folder
-      case 'collapse-folder':
-        if (props)
-          this.collapse_folder(props);
-        break;
-
       // user settings commands
       case 'preferences':
@@ -1004 +972 @@
         break;
 
-      case 'delete-identity':
-        this.delete_identity();
-
       case 'folders':
         this.goto_url('folders');
         break;
 
-      case 'subscribe':
-        this.subscribe_folder(props);
-        break;
-
-      case 'unsubscribe':
-        this.unsubscribe_folder(props);
-        break;
-
-      case 'enable-threading':
-        this.enable_threading(props);
-        break;
-
-      case 'disable-threading':
-        this.disable_threading(props);
-        break;
-
-      case 'create-folder':
-        this.create_folder(props);
-        break;
-
-      case 'rename-folder':
-        this.rename_folder(props);
-        break;
-
-      case 'delete-folder':
-        this.delete_folder(props);
-        break;
-
+      // unified command call (command name == function name)
+      default:
+        var func = command.replace('-', '_');
+        alert(func);
+        if (this[func] && typeof this[func] == 'function')
+          this[func](props);
+        break;
     }
 
@@ -3737 +3681 @@
 
 
-  this.add_contact_group = function()
+  this.group_create = function()
   {
     if (!this.gui_objects.folderlist || !this.env.address_sources[this.env.source].groups)
@@ -3754 +3698 @@
   };
 
-  this.rename_contact_group = function()
+  this.group_rename = function()
   {
     if (!this.env.group || !this.gui_objects.folderlist)
@@ -3774 +3718 @@
   };
 
-  this.delete_contact_group = function()
+  this.group_delete = function()
   {
     if (this.env.group)
@@ -3889 +3833 @@
       var anchors = row.obj.getElementsByTagName('a');
       if (anchors[0])
-        anchors[0].onclick = function() { p.rename_folder(row.id); return false; };
+        anchors[0].onclick = function() { p.command('rename-folder', row.id); return false; };
       if (anchors[1])
-        anchors[1].onclick = function() { p.delete_folder(row.id); return false; };
+        anchors[1].onclick = function() { p.command('delete-folder', row.id); return false; };
       row.obj.onmouseover = function() { p.focus_subscription(row.id); };
       row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
@@ -4258 +4202 @@
   };
 
-  this.subscribe_folder = function(folder)
+  this.subscribe = function(folder)
   {
     if (folder)
@@ -4264 +4208 @@
   };
 
-  this.unsubscribe_folder = function(folder)
+  this.unsubscribe = function(folder)
   {
     if (folder)