From 06fa46fafe2ad909887d1138f9c91cefe60d2a6e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 29 Jan 2015 18:09:11 +0530 Subject: [PATCH] [fix] onshow > on_page_show --- .../page/accounts_browser/accounts_browser.js | 12 +++--------- .../page/financial_analytics/financial_analytics.js | 2 +- erpnext/accounts/page/pos/pos.js | 2 +- .../page/purchase_analytics/purchase_analytics.js | 2 +- erpnext/hr/doctype/salary_manager/salary_manager.js | 6 +++--- .../selling/page/sales_analytics/sales_analytics.js | 2 +- erpnext/selling/page/sales_browser/sales_browser.js | 4 ++-- erpnext/selling/page/sales_funnel/sales_funnel.js | 2 +- erpnext/setup/page/setup_wizard/setup_wizard.js | 4 ++-- .../stock/page/stock_analytics/stock_analytics.js | 2 +- erpnext/stock/page/stock_ledger/stock_ledger.js | 2 +- erpnext/stock/page/stock_level/stock_level.js | 2 +- .../page/support_analytics/support_analytics.js | 2 +- 13 files changed, 19 insertions(+), 25 deletions(-) diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 98fc58e73b..6aa4c0f117 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -7,7 +7,7 @@ // edit node // see ledger -pscript['onload_Accounts Browser'] = function(wrapper){ +frappe.pages["Accounts Browser"].on_page_load = function(wrapper){ frappe.ui.make_app_page({ parent: wrapper, single_column: true @@ -58,7 +58,6 @@ pscript['onload_Accounts Browser'] = function(wrapper){ var ctype = frappe.get_route()[1] || 'Account'; erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(), chart_area.get(0)); - pscript.set_title(wrapper, ctype, $(this).val()); }) // load up companies @@ -74,18 +73,13 @@ pscript['onload_Accounts Browser'] = function(wrapper){ }); } -pscript.set_title = function(wrapper, ctype, val) { -} - -pscript['onshow_Accounts Browser'] = function(wrapper){ +frappe.pages["Accounts Browser"].on_page_show = function(wrapper){ // set route var ctype = frappe.get_route()[1] || 'Account'; if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) { wrapper.$company_select.change(); } - - pscript.set_title(wrapper, ctype); } erpnext.AccountsChart = Class.extend({ @@ -260,7 +254,7 @@ erpnext.AccountsChart = Class.extend({ }); // show - d.onshow = function() { + d.on_page_show = function() { $(fd.group_or_ledger.input).change(); $(fd.account_type.input).change(); } diff --git a/erpnext/accounts/page/financial_analytics/financial_analytics.js b/erpnext/accounts/page/financial_analytics/financial_analytics.js index aa08c920bc..631af159bc 100644 --- a/erpnext/accounts/page/financial_analytics/financial_analytics.js +++ b/erpnext/accounts/page/financial_analytics/financial_analytics.js @@ -3,7 +3,7 @@ frappe.require("assets/erpnext/js/account_tree_grid.js"); -frappe.pages['financial-analytics'].onload = function(wrapper) { +frappe.pages['financial-analytics'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Financial Analytics'), diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 7dceb641cd..c3b3c03c22 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -1,4 +1,4 @@ -frappe.pages['pos'].onload = function(wrapper) { +frappe.pages['pos'].on_page_load = function(wrapper) { var page = frappe.ui.make_app_page({ parent: wrapper, title: __('Start POS'), diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js index dea6a86a98..5ac7593bf5 100644 --- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js +++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.pages['purchase-analytics'].onload = function(wrapper) { +frappe.pages['purchase-analytics'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Purchase Analytics'), diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.js b/erpnext/hr/doctype/salary_manager/salary_manager.js index 6e20bff98c..65667c9d77 100644 --- a/erpnext/hr/doctype/salary_manager/salary_manager.js +++ b/erpnext/hr/doctype/salary_manager/salary_manager.js @@ -2,9 +2,9 @@ // License: GNU General Public License v3. See license.txt var display_activity_log = function(msg) { - if(!pscript.ss_html) - pscript.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div'); - pscript.ss_html.innerHTML = + if(!cur_frm.ss_html) + cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div'); + cur_frm.ss_html.innerHTML = '
'+__("Activity Log:")+'
'+msg+'
'; } diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js index 9d775163a5..ad2102a877 100644 --- a/erpnext/selling/page/sales_analytics/sales_analytics.js +++ b/erpnext/selling/page/sales_analytics/sales_analytics.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.pages['sales-analytics'].onload = function(wrapper) { +frappe.pages['sales-analytics'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Sales Analytics'), diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js index 5ad60f1d5f..2dbe71c681 100644 --- a/erpnext/selling/page/sales_browser/sales_browser.js +++ b/erpnext/selling/page/sales_browser/sales_browser.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -pscript['onload_Sales Browser'] = function(wrapper){ +frappe.pages["Sales Browser"].on_page_load = function(wrapper){ var page = frappe.ui.make_app_page({ parent: wrapper, single_column: true, @@ -32,7 +32,7 @@ pscript['onload_Sales Browser'] = function(wrapper){ wrapper.make_tree(); } -pscript['onshow_Sales Browser'] = function(wrapper){ +frappe.pages['Sales Browser'].on_page_show = function(wrapper){ // set route var ctype = frappe.get_route()[1] || 'Territory'; diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js index 47b6a14e45..fbba71e59d 100644 --- a/erpnext/selling/page/sales_funnel/sales_funnel.js +++ b/erpnext/selling/page/sales_funnel/sales_funnel.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.pages['sales-funnel'].onload = function(wrapper) { +frappe.pages['sales-funnel'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Sales Funnel'), diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js index 2ba6dd4a22..c31fab4cdf 100644 --- a/erpnext/setup/page/setup_wizard/setup_wizard.js +++ b/erpnext/setup/page/setup_wizard/setup_wizard.js @@ -1,4 +1,4 @@ -frappe.pages['setup-wizard'].onload = function(wrapper) { +frappe.pages['setup-wizard'].on_page_load = function(wrapper) { if(sys_defaults.company) { frappe.set_route("desktop"); return; @@ -356,7 +356,7 @@ frappe.pages['setup-wizard'].onload = function(wrapper) { erpnext.wiz = new frappe.wiz.Wizard(wizard_settings) } -frappe.pages['setup-wizard'].onshow = function(wrapper) { +frappe.pages['setup-wizard'].on_page_show = function(wrapper) { if(frappe.get_route()[1]) erpnext.wiz.show(frappe.get_route()[1]); } diff --git a/erpnext/stock/page/stock_analytics/stock_analytics.js b/erpnext/stock/page/stock_analytics/stock_analytics.js index 8fd2d324f6..346750bcd7 100644 --- a/erpnext/stock/page/stock_analytics/stock_analytics.js +++ b/erpnext/stock/page/stock_analytics/stock_analytics.js @@ -2,7 +2,7 @@ // License: GNU General Public License v3. See license.txt -frappe.pages['stock-analytics'].onload = function(wrapper) { +frappe.pages['stock-analytics'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Stock Analytics'), diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.js b/erpnext/stock/page/stock_ledger/stock_ledger.js index d9e89b21c7..3f6a9e30bc 100644 --- a/erpnext/stock/page/stock_ledger/stock_ledger.js +++ b/erpnext/stock/page/stock_ledger/stock_ledger.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.pages['stock-ledger'].onload = function(wrapper) { +frappe.pages['stock-ledger'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Stock Ledger'), diff --git a/erpnext/stock/page/stock_level/stock_level.js b/erpnext/stock/page/stock_level/stock_level.js index 21d422015a..be4ebd0439 100644 --- a/erpnext/stock/page/stock_level/stock_level.js +++ b/erpnext/stock/page/stock_level/stock_level.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.pages['stock-level'].onload = function(wrapper) { +frappe.pages['stock-level'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Stock Level'), diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js index 835e68182d..8e0b10afd5 100644 --- a/erpnext/support/page/support_analytics/support_analytics.js +++ b/erpnext/support/page/support_analytics/support_analytics.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.pages['support-analytics'].onload = function(wrapper) { +frappe.pages['support-analytics'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ parent: wrapper, title: __('Support Analytics'),