From 0e6bdb66dbfc2e7880a9796f8a33cd8e58db6033 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 18 Aug 2009 02:35:09 -0600 Subject: [PATCH] Better naming of the prefs javascript code --- imp/js/{accountsmanagement.js => accountsprefs.js} | 5 ++--- imp/js/{addressbooksmanagement.js => addressbooksprefs.js} | 4 ++-- imp/js/{flagmanagement.js => flagprefs.js} | 8 ++++---- imp/js/{foldermanagement.js => folderprefs.js} | 8 ++++---- imp/lib/Application.php | 10 +++++----- 5 files changed, 17 insertions(+), 18 deletions(-) rename imp/js/{accountsmanagement.js => accountsprefs.js} (90%) rename imp/js/{addressbooksmanagement.js => addressbooksprefs.js} (96%) rename imp/js/{flagmanagement.js => flagprefs.js} (91%) rename imp/js/{foldermanagement.js => folderprefs.js} (87%) diff --git a/imp/js/accountsmanagement.js b/imp/js/accountsprefs.js similarity index 90% rename from imp/js/accountsmanagement.js rename to imp/js/accountsprefs.js index 84c77f745..ffdb542e1 100644 --- a/imp/js/accountsmanagement.js +++ b/imp/js/accountsprefs.js @@ -5,7 +5,7 @@ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. */ -var ImpAccountsmanagement = { +var ImpAccountsPrefs = { // Variables set by other code: confirm_delete _sendData: function(a, d) @@ -53,6 +53,5 @@ var ImpAccountsmanagement = { }; document.observe('dom:loaded', function() { - var am = ImpAccountsmanagement; - document.observe('click', am.clickHandler.bindAsEventListener(am)); + document.observe('click', ImpAccountsPrefs.clickHandler.bindAsEventListener(ImpAccountsPrefs)); }); diff --git a/imp/js/addressbooksmanagement.js b/imp/js/addressbooksprefs.js similarity index 96% rename from imp/js/addressbooksmanagement.js rename to imp/js/addressbooksprefs.js index e3237f1b4..53238ad01 100644 --- a/imp/js/addressbooksmanagement.js +++ b/imp/js/addressbooksprefs.js @@ -5,7 +5,7 @@ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. */ -var ImpAddressbooksmanagement = { +var ImpAddressbooksPrefs = { // Variables set by other code: fields deselectHeaders: function() @@ -163,4 +163,4 @@ var ImpAddressbooksmanagement = { }; -document.observe('dom:loaded', ImpAddressbooksmanagement.onDomLoad.bind(ImpAddressbooksmanagement)); +document.observe('dom:loaded', ImpAddressbooksPrefs.onDomLoad.bind(ImpAddressbooksPrefs)); diff --git a/imp/js/flagmanagement.js b/imp/js/flagprefs.js similarity index 91% rename from imp/js/flagmanagement.js rename to imp/js/flagprefs.js index 4acce0b44..466d32ab4 100644 --- a/imp/js/flagmanagement.js +++ b/imp/js/flagprefs.js @@ -5,7 +5,7 @@ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. */ -var ImpFlagmanagement = { +var ImpFlagPrefs = { // Variables set by other code: confirm_delete, new_prompt addFlag: function() @@ -74,7 +74,7 @@ var ImpFlagmanagement = { }; document.observe('dom:loaded', function() { - var fm = ImpFlagmanagement; - document.observe('click', fm.clickHandler.bindAsEventListener(fm)); - $('prefs').observe('reset', function() { fm.resetHandler.defer(); }); + var fp = ImpFlagPrefs; + document.observe('click', fp.clickHandler.bindAsEventListener(fp)); + $('prefs').observe('reset', function() { fp.resetHandler.defer(); }); }); diff --git a/imp/js/foldermanagement.js b/imp/js/folderprefs.js similarity index 87% rename from imp/js/foldermanagement.js rename to imp/js/folderprefs.js index 0c59a8654..a02f1f3c2 100644 --- a/imp/js/foldermanagement.js +++ b/imp/js/folderprefs.js @@ -5,7 +5,7 @@ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. */ -var ImpFoldermanagement = { +var ImpFolderPrefs = { // Variables defined by other code: folders newFolderName: function(f, fn, p1, p2) @@ -25,9 +25,9 @@ var ImpFoldermanagement = { }; document.observe('dom:loaded', function() { - var fm = ImpFoldermanagement; - fm.folders.each(function(f) { - $(f[0]).observe('change', fm.newFolderName.bind(fm, f[0], f[1], f[2], f[3])); + var fp = ImpFolderPrefs; + fp.folders.each(function(f) { + $(f[0]).observe('change', fp.newFolderName.bind(fp, f[0], f[1], f[2], f[3])); }); }); diff --git a/imp/lib/Application.php b/imp/lib/Application.php index 3491d38ea..94c93fe90 100644 --- a/imp/lib/Application.php +++ b/imp/lib/Application.php @@ -418,7 +418,7 @@ class IMP_Application extends Horde_Registry_Application * document HEAD). */ switch ($group) { case 'accounts': - Horde::addScriptFile('accountsmanagement.js', 'imp', true); + Horde::addScriptFile('accountsprefs.js', 'imp', true); Horde::addInlineScript(array( 'ImpAccountsmanagement.confirm_delete = ' . Horde_Serialize::serialize(_("Are you sure you want to delete this account?"), Horde_Serialize::JSON, Horde_Nls::getCharset()) @@ -431,7 +431,7 @@ class IMP_Application extends Horde_Registry_Application case 'flags': Horde::addScriptFile('colorpicker.js', 'horde', true); - Horde::addScriptFile('flagmanagement.js', 'imp', true); + Horde::addScriptFile('flagprefs.js', 'imp', true); Horde::addInlineScript(array( 'ImpFlagmanagement.new_prompt = ' . Horde_Serialize::serialize(_("Please enter the label for the new flag:"), Horde_Serialize::JSON, Horde_Nls::getCharset()), @@ -441,7 +441,7 @@ class IMP_Application extends Horde_Registry_Application case 'identities': if (!$GLOBALS['prefs']->isLocked('sent_mail_folder')) { - Horde::addScriptFile('foldermanagement.js', 'imp', true); + Horde::addScriptFile('folderprefs.js', 'imp', true); Horde::addInlineScript(array( 'ImpFoldermanagement.folders = ' . Horde_Serialize::serialize(array('sent_mail_folder', 'sent_mail_new', _("Enter the name for your new sent-mail folder"), _("Create a new sent-mail folder")), Horde_Serialize::JSON, Horde_Nls::getCharset()) )); @@ -465,7 +465,7 @@ class IMP_Application extends Horde_Registry_Application } if (!empty($code)) { - Horde::addScriptFile('foldermanagement.js', 'imp', true); + Horde::addScriptFile('folderprefs.js', 'imp', true); Horde::addInlineScript(array( 'ImpFoldermanagement.folders = ' . Horde_Serialize::serialize($code, Horde_Serialize::JSON, Horde_Nls::getCharset()) )); @@ -891,7 +891,7 @@ class IMP_Application extends Horde_Registry_Application ++$source_count; } - Horde::addScriptFile('addressbooksmanagement.js', 'imp', true); + Horde::addScriptFile('addressbooksprefs.js', 'imp', true); Horde::addInlineScript(array( 'ImpAddressbooksmanagement.fields = ' . Horde_Serialize::serialize($search_fields, Horde_Serialize::JSON, Horde_Nls::getCharset()) )); -- 2.11.0