From 8e827b053d491a9edd1cbea3a44720c8a99796ad Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 21 Oct 2010 15:45:47 +1100
Subject: [PATCH] Simplify :displaypane argument names.

---
 melodactyl/NEWS                 | 27 +++++++++++----------------
 melodactyl/TODO                 |  2 +-
 melodactyl/content/config.js    |  9 ++++-----
 melodactyl/locale/en-US/gui.xml |  5 ++---
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/melodactyl/NEWS b/melodactyl/NEWS
index 058d3f06..a046e63a 100755
--- a/melodactyl/NEWS
+++ b/melodactyl/NEWS
@@ -1,22 +1,17 @@
-2009-XX-XX:
-    * version 0.2pre
+0.1a1pre:
+    * :displaypane arguments changed to "leftservice", "bottomservice",
+      "bottomcontent" or "rightsidebar"
     * asciidoc is no longer required to build Melodactyl
     * The help system is newly modularized
-    * add [c]:silent[c]
-    * add [j]$MY_MELODACTYLRC[j]
-    * add [m]'[m] and [m]"[m] local marks
-    * add [m]w[m] and [m]W[m] Normal mode mappings for symmetry with [m]o[m]/[m]O[m] and [m]t[m]/[m]T[m]
-    * add [c]:messclear[c]
+    * add :silent
+    * add $MY_MELODACTYLRC
+    * add ' and " local marks
+    * add w and W Normal mode mappings for symmetry with o/O and t/T
+    * add :messclear
     * add 'maxitems'
-    * [c]:dialog {subscribe|newsmartplaylist}[c]
-    * add [c]:displaypane[c] and [c]:dpclose[c]
-    * rename [c]:filter[c] to [c]:queue[c] and [c]:Filter[c] to [c]:filter[c]
+    * :dialog {subscribe|newsmartplaylist}
+    * add :displaypane and :dpclose
+    * rename :filter to :queue and :Filter to :filter
     * add 'repeat' and 'shuffle'
     * add 'jsdebugger' option - switch on/off javascript debugger service
     * add "addons", "downloads", "extoptions" and "help" to the 'activate' option.
-
-2009-03-28:
-    * version 0.1
-    * first public release
-
-// vim: set filetype=asciidoc:
diff --git a/melodactyl/TODO b/melodactyl/TODO
index 8394d6ec..af6f4ff3 100644
--- a/melodactyl/TODO
+++ b/melodactyl/TODO
@@ -7,9 +7,9 @@ BUGS:
   - :open songbird-internal-search searchString (broken because SB intercepts queries to this engine)
   - <C-^> only works between browser tabs not the media tab
   - numbered tabs
-  - command-line option handling is broken in Melodactyl only - it used to work.
 
 FEATURES:
+9 Clean up NEWS
 9 Bookmarks are now only supported in SB via an addon.
 9 '?' - Reusing '/'.
 8 Merge with SongBird's sanitizer implementation.
diff --git a/melodactyl/content/config.js b/melodactyl/content/config.js
index 976a2b18..2593ee02 100644
--- a/melodactyl/content/config.js
+++ b/melodactyl/content/config.js
@@ -194,16 +194,15 @@ const Config = Module("config", ConfigBase, {
             document.getElementById(id).hide();
     },
 
-    // FIXME: best way to format these args? Hyphenated? One word like :dialog?
     /**
      * @property {object} A map of display pane command argument strings to
      *     panel element IDs.
      */
     displayPanes: {
-        "service pane left": "servicepane",
-        "content pane bottom": "displaypane_contentpane_bottom",
-        "service pane bottom": "displaypane_servicepane_bottom",
-        "right sidebar": "displaypane_right_sidebar"
+        "leftservice"  : "servicepane",
+        "bottomcontent": "displaypane_contentpane_bottom",
+        "bottomservice": "displaypane_servicepane_bottom",
+        "rightsidebar" : "displaypane_right_sidebar"
     }
 }, {
     commands: function () {
diff --git a/melodactyl/locale/en-US/gui.xml b/melodactyl/locale/en-US/gui.xml
index 0bbff3cc..a2b27ede 100644
--- a/melodactyl/locale/en-US/gui.xml
+++ b/melodactyl/locale/en-US/gui.xml
@@ -44,9 +44,8 @@
     <spec>:displaypane <a>pane</a></spec>
     <description>
         <p>
-            Open the specified display pane. <a>pane</a> is any of "service
-            pane left", "service pane bottom", "content pane bottom" or "right
-            sidebar".
+            Open the specified display pane. <a>pane</a> is any of
+            "leftservice", "bottomservice", "bottomcontent" or "rightsidebar".
         </p>
     </description>
 </item>