From 93f26540e6a6b865efb08b201ef62932a07335bb Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 15 Feb 2013 17:33:55 -0600 Subject: [PATCH] allow component that do not reload, thanks Niphlod --- VERSION | 2 +- applications/admin/static/js/web2py.js | 2 +- applications/examples/static/js/web2py.js | 2 +- applications/welcome/static/js/web2py.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 9e9cbef3..1c2cb51b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.02.15.17.28.22 +Version 2.4.1-alpha.2+timestamp.2013.02.15.17.33.13 diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index e3076795..f9fce21d 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -134,7 +134,7 @@ function web2py_component(action, target, timeout, times){ web2py_ajax_page('get', action, null, target);} }; // reload // Method to check timing limit element.reload_check = function (){ - if (jelement.hasClass('w2p_component_stop')) {return false;} + if (jelement.hasClass('w2p_component_stop')) {clearInterval(this.timing);return false;} if (this.reload_counter == Infinity){return true;} else { if (!isNaN(this.reload_counter)){ diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js index e3076795..f9fce21d 100644 --- a/applications/examples/static/js/web2py.js +++ b/applications/examples/static/js/web2py.js @@ -134,7 +134,7 @@ function web2py_component(action, target, timeout, times){ web2py_ajax_page('get', action, null, target);} }; // reload // Method to check timing limit element.reload_check = function (){ - if (jelement.hasClass('w2p_component_stop')) {return false;} + if (jelement.hasClass('w2p_component_stop')) {clearInterval(this.timing);return false;} if (this.reload_counter == Infinity){return true;} else { if (!isNaN(this.reload_counter)){ diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index e3076795..f9fce21d 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -134,7 +134,7 @@ function web2py_component(action, target, timeout, times){ web2py_ajax_page('get', action, null, target);} }; // reload // Method to check timing limit element.reload_check = function (){ - if (jelement.hasClass('w2p_component_stop')) {return false;} + if (jelement.hasClass('w2p_component_stop')) {clearInterval(this.timing);return false;} if (this.reload_counter == Infinity){return true;} else { if (!isNaN(this.reload_counter)){