dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #219 from niphlod/enhancement/ajax_page_notarget

Browse Source 
fixed issue when target is none. removed useless file in admin/static/js
This commit is contained in:
mdipierro
2013-09-19 14:44:03 -07:00
parent ac5fb303eb 4f44188997
commit 146ea115bf
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/static/js/jquery-1.10.0.min.map
-1
View File
File diff suppressed because one or more lines are too long
applications/admin/static/js/web2py.js
+5 -2
View File
@@ -277,6 +277,8 @@
ajax_page: function (method, action, data, target, element) {
/* element is a new parameter, but should be put be put in front */
if(element == undefined) element = $(document);
/* if target is not there, fill it with something that there isn't in the page*/
if(target == undefined || target == '') target = 'w2p_none';
if(web2py.fire(element, 'ajax:before', null, target )) { /*test a usecase, should stop here if returns false */
$.ajax({
'type': method,
@@ -578,9 +580,9 @@
}
if(target == undefined) {
if(method == 'GET') {
web2py.ajax_page('get', action, [], 'bogus', el); //fixme?
web2py.ajax_page('get', action, [], '', el);
} else if(method == 'POST') {
web2py.ajax_page('post', action, [], 'bogus', el); //fixme?
web2py.ajax_page('post', action, [], '', el);
}
} else {
if(method == 'GET') {
@@ -698,3 +700,4 @@ web2py_trap_link = jQuery.web2py.trap_link;
web2py_calc_entropy = jQuery.web2py.calc_entropy;
*/
/* compatibility code - end*/
applications/admin/static/js/web2py_bootstrap.js
-2
View File
@@ -30,6 +30,4 @@ jQuery(function(){
hoverMenu(); // first page load
jQuery(window).resize(hoverMenu); // on resize event
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
// make all buttons bootstrap buttons
jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn');
});
applications/examples/static/js/web2py.js
+5 -2
View File
@@ -277,6 +277,8 @@
ajax_page: function (method, action, data, target, element) {
/* element is a new parameter, but should be put be put in front */
if(element == undefined) element = $(document);
/* if target is not there, fill it with something that there isn't in the page*/
if(target == undefined || target == '') target = 'w2p_none';
if(web2py.fire(element, 'ajax:before', null, target )) { /*test a usecase, should stop here if returns false */
$.ajax({
'type': method,
@@ -578,9 +580,9 @@
}
if(target == undefined) {
if(method == 'GET') {
web2py.ajax_page('get', action, [], 'bogus', el); //fixme?
web2py.ajax_page('get', action, [], '', el);
} else if(method == 'POST') {
web2py.ajax_page('post', action, [], 'bogus', el); //fixme?
web2py.ajax_page('post', action, [], '', el);
}
} else {
if(method == 'GET') {
@@ -698,3 +700,4 @@ web2py_trap_link = jQuery.web2py.trap_link;
web2py_calc_entropy = jQuery.web2py.calc_entropy;
*/
/* compatibility code - end*/
applications/examples/static/js/web2py_bootstrap.js
-2
View File
@@ -30,6 +30,4 @@ jQuery(function(){
hoverMenu(); // first page load
jQuery(window).resize(hoverMenu); // on resize event
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
// make all buttons bootstrap buttons
jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn');
});
applications/welcome/static/js/web2py.js
+5 -2
View File
@@ -277,6 +277,8 @@
ajax_page: function (method, action, data, target, element) {
/* element is a new parameter, but should be put be put in front */
if(element == undefined) element = $(document);
/* if target is not there, fill it with something that there isn't in the page*/
if(target == undefined || target == '') target = 'w2p_none';
if(web2py.fire(element, 'ajax:before', null, target )) { /*test a usecase, should stop here if returns false */
$.ajax({
'type': method,
@@ -578,9 +580,9 @@
}
if(target == undefined) {
if(method == 'GET') {
web2py.ajax_page('get', action, [], 'bogus', el); //fixme?
web2py.ajax_page('get', action, [], '', el);
} else if(method == 'POST') {
web2py.ajax_page('post', action, [], 'bogus', el); //fixme?
web2py.ajax_page('post', action, [], '', el);
}
} else {
if(method == 'GET') {
@@ -698,3 +700,4 @@ web2py_trap_link = jQuery.web2py.trap_link;
web2py_calc_entropy = jQuery.web2py.calc_entropy;
*/
/* compatibility code - end*/
applications/welcome/static/js/web2py_bootstrap.js
-2
View File
@@ -30,6 +30,4 @@ jQuery(function(){
hoverMenu(); // first page load
jQuery(window).resize(hoverMenu); // on resize event
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
// make all buttons bootstrap buttons
jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn');
});