From 7ee2c059558e60b611d651c7f370d5e8b9a066a5 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 27 Aug 2013 10:46:42 +0000
Subject: [PATCH] remove extra app prefixes from method names in app.js, for
 both infolog and timesheet applications

---
 infolog/inc/class.infolog_ui.inc.php     |  6 +++---
 infolog/js/app.js                        | 14 +++++++-------
 infolog/templates/default/edit.xet       | 10 +++++-----
 timesheet/inc/class.timesheet_ui.inc.php |  2 +-
 timesheet/js/app.js                      |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 0bf3548332..da9c77cfdd 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -809,10 +809,10 @@ class infolog_ui
 		if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['show_links'];
 
 		//apply infolog_filter_change javascript method (hide/show of date filter form) over onchange filter
-		$values['nm']['filter_onchange'] = "app.infolog.infolog_filter_change();";
+		$values['nm']['filter_onchange'] = "app.infolog.filter_change();";
 
 		//apply infolog_filter2_change javascript method (show/hide details each rows) over onchange filter2
-		$values['nm']['filter2_onchange'] = "app.infolog.infolog_filter2_change();";
+		$values['nm']['filter2_onchange'] = "app.infolog.filter2_change();";
 
 		// disable columns for main entry as set in the pref for details or no details
 		if ($action == 'sp')
@@ -1127,7 +1127,7 @@ class infolog_ui
 			'caption' => 'Delete',
 			'group' => ++$group,
 			'disableClass' => 'rowNoDelete',
-			'onExecute' => 'app.infolog.infolog_confirm_delete',
+			'onExecute' => 'app.infolog.confirm_delete',
 		);
 		if ($query['col_filter']['info_status'] == 'deleted')
 		{
diff --git a/infolog/js/app.js b/infolog/js/app.js
index 5a7b472000..cceab19c27 100644
--- a/infolog/js/app.js
+++ b/infolog/js/app.js
@@ -67,7 +67,7 @@ app.infolog = AppJS.extend(
 	/**
 	 *
 	 */
-	infolog_filter_change: function()
+	filter_change: function()
 	{
 
 		var filter = this.et2.getWidgetById('filter');
@@ -86,7 +86,7 @@ app.infolog = AppJS.extend(
 	 * either 'all' for details or 'no_description' for no details
 	 *
 	 */
-	infolog_filter2_change: function()
+	filter2_change: function()
 	{
 		var nm = this.et2.getWidgetById('nm');
 		var filter2 = this.et2.getWidgetById('filter2');
@@ -133,7 +133,7 @@ app.infolog = AppJS.extend(
 	 *@param _action
 	 *@param _senders
 	 */
-	infolog_confirm_delete: function(_action, _senders)
+	confirm_delete: function(_action, _senders)
 	{
 		var children = false;
 		var child_button = jQuery('#delete_sub').get(0) || jQuery('[id*="delete_sub"]').get(0);
@@ -158,7 +158,7 @@ app.infolog = AppJS.extend(
 	 * @param ab_id
 	 * @param info_cc
 	 */
-	infolog_add_email_from_ab: function(ab_id,info_cc)
+	add_email_from_ab: function(ab_id,info_cc)
 	{
 		var ab = document.getElementById(ab_id);
 
@@ -191,7 +191,7 @@ app.infolog = AppJS.extend(
 	* @param string percent_id
 	* @param string datecompleted_id
 	*/
-	infolog_status_changed: function(changed_id, status_id, percent_id, datecompleted_id)
+	status_changed: function(changed_id, status_id, percent_id, datecompleted_id)
 	{
 		var status = document.getElementById(status_id);
 		var percent = document.getElementById(percent_id);
@@ -248,9 +248,9 @@ app.infolog = AppJS.extend(
 	/**
 	 * handle "print" action from "Actions" selectbox in edit infolog window.
 	 * check if the template is dirty then submit the template otherwise just open new window as print.
-	 * 
+	 *
 	 */
-	infolog_edit_actions: function()
+	edit_actions: function()
 	{
 		var widget = this.et2.getWidgetById('action');
 		var template = this.et2._inst;
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 2585df04c8..963f1774dc 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -71,7 +71,7 @@
 						<rows>
 							<row>
 								<textbox id="info_cc" maxlength="254" class="inputFullWidth"/>
-								<buttononly label="Add from Addressbook" onclick="return app.infolog.infolog_add_email_from_ab(form::name('ab[id]'),form::name('info_cc'));" options="users"/>
+								<buttononly label="Add from Addressbook" onclick="return app.infolog.add_email_from_ab(form::name('ab[id]'),form::name('info_cc'));" options="users"/>
 							</row>
 							<row class="hiddenRow">
 								<link-entry blur="Search" id="ab" options="addressbook-email" span="all"/>
@@ -242,18 +242,18 @@
 				<row class="row">
 					<description value="Status" for="info_status"/>
 					<menulist>
-						<menupopup statustext="@status_help" id="info_status" onchange="app.infolog.infolog_status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
+						<menupopup statustext="@status_help" id="info_status" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
 					</menulist>
 					<description/>
 					<description/>
 					<description value="Completed" for="info_percent"/>
 					<menulist>
-						<menupopup type="select-percent" statustext="Percent completed" id="info_percent" onchange="app.infolog.infolog_status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
+						<menupopup type="select-percent" statustext="Percent completed" id="info_percent" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
 					</menulist>
 				</row>
 				<row class="row">
 					<description value="Date completed" for="info_datecompleted"/>
-					<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" onchange="app.infolog.infolog_status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
+					<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
 					<description/>
 					<description/>
 					<description value="Private" for="info_access"/>
@@ -283,7 +283,7 @@
 						<button statustext="Apply the changes" label="Apply" id="button[apply]"/>
 						<button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();"/>
 						<menulist>
-							<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.infolog.infolog_edit_actions()" options="Actions..."/>
+							<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.infolog.edit_actions()" options="Actions..."/>
 						</menulist>
 					</hbox>
 					<description/>
diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 0ad47e41df..134da4034d 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -867,7 +867,7 @@ class timesheet_ui extends timesheet_bo
 				'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
 				'header_left'    => 'timesheet.index.dates',
 				'header_right'   => 'timesheet.index.add',
-				'filter_onchange' => "app.timesheet.timesheet_filter_change();",
+				'filter_onchange' => "app.timesheet.filter_change();",
 				'filter2'        => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],
 				'row_id'         => 'ts_id',
 				//'actions'        => $this->get_actions(),
diff --git a/timesheet/js/app.js b/timesheet/js/app.js
index 8ec0defbb8..8c621a1728 100644
--- a/timesheet/js/app.js
+++ b/timesheet/js/app.js
@@ -60,14 +60,14 @@ app.timesheet = AppJS.extend(
 
 		if (typeof et2.templates['timesheet.index'] != "undefined")
 		{
-			this.timesheet_filter_change();
+			this.filter_change();
 		}
 	},
 
 	/**
 	 *
 	 */
-	timesheet_filter_change: function()
+	filter_change: function()
 	{
 		var filter = this.et2.getWidgetById('filter');
 		var dates = this.et2.getWidgetById('timesheet.index.dates');