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

fixes issue 1753, web2py.js doesn't set the disabled state for inputs with name

Browse Source
This commit is contained in:
niphlod committed 2013-10-31 21:10:37 +01:00
1 parent 8bdc5f20e7
commit a6223cc319
3 files changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/admin/static/js/web2py.js
+4 -4
View File
@@ -295,7 +295,7 @@
}, },
'complete': function (xhr, status) { 'complete': function (xhr, status) {
web2py.fire(element, 'ajax:complete', [xhr, status], target); web2py.fire(element, 'ajax:complete', [xhr, status], target);
web2py.updatePage(xhr, target); /* Parse and load the html received */ web2py.updatePage(xhr, target); /* Parse and load the html received */
web2py.trap_form(action, target); web2py.trap_form(action, target);
web2py.ajax_init('#' + target); web2py.ajax_init('#' + target);
web2py.after_ajax(xhr); web2py.after_ajax(xhr);
@@ -445,8 +445,8 @@
} else return false; /* not supported */ } else return false; /* not supported */
}, },
/* new from here */ /* new from here */
/* Form input elements bound by jquery-uj */ /* Form input elements bound by web2py.js */
formInputClickSelector: 'input[type=submit], input[type=image], button[type=submit], button:not([type])', formInputClickSelector: 'input[type=submit]:not([name]), input[type=image]:not([name]), button[type=submit]:not([name]), button:not([type]):not([name])',
/* Form input elements disabled during form submission */ /* Form input elements disabled during form submission */
disableSelector: 'input, button, textarea, select', disableSelector: 'input, button, textarea, select',
/* Form input elements re-enabled after form submission */ /* Form input elements re-enabled after form submission */
@@ -513,7 +513,7 @@
if(flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown(); if(flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
}, },
hide_flash: function () { hide_flash: function () {
$('.flash').hide().html(''); $('.flash').fadeOut(0).html('');
}, },
show_if_handler: function (target) { show_if_handler: function (target) {
var triggers = {}; var triggers = {};
applications/examples/static/js/web2py.js
+4 -4
View File
@@ -295,7 +295,7 @@
}, },
'complete': function (xhr, status) { 'complete': function (xhr, status) {
web2py.fire(element, 'ajax:complete', [xhr, status], target); web2py.fire(element, 'ajax:complete', [xhr, status], target);
web2py.updatePage(xhr, target); /* Parse and load the html received */ web2py.updatePage(xhr, target); /* Parse and load the html received */
web2py.trap_form(action, target); web2py.trap_form(action, target);
web2py.ajax_init('#' + target); web2py.ajax_init('#' + target);
web2py.after_ajax(xhr); web2py.after_ajax(xhr);
@@ -445,8 +445,8 @@
} else return false; /* not supported */ } else return false; /* not supported */
}, },
/* new from here */ /* new from here */
/* Form input elements bound by jquery-uj */ /* Form input elements bound by web2py.js */
formInputClickSelector: 'input[type=submit], input[type=image], button[type=submit], button:not([type])', formInputClickSelector: 'input[type=submit]:not([name]), input[type=image]:not([name]), button[type=submit]:not([name]), button:not([type]):not([name])',
/* Form input elements disabled during form submission */ /* Form input elements disabled during form submission */
disableSelector: 'input, button, textarea, select', disableSelector: 'input, button, textarea, select',
/* Form input elements re-enabled after form submission */ /* Form input elements re-enabled after form submission */
@@ -513,7 +513,7 @@
if(flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown(); if(flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
}, },
hide_flash: function () { hide_flash: function () {
$('.flash').hide().html(''); $('.flash').fadeOut(0).html('');
}, },
show_if_handler: function (target) { show_if_handler: function (target) {
var triggers = {}; var triggers = {};
applications/welcome/static/js/web2py.js
+4 -4
View File
@@ -295,7 +295,7 @@
}, },
'complete': function (xhr, status) { 'complete': function (xhr, status) {
web2py.fire(element, 'ajax:complete', [xhr, status], target); web2py.fire(element, 'ajax:complete', [xhr, status], target);
web2py.updatePage(xhr, target); /* Parse and load the html received */ web2py.updatePage(xhr, target); /* Parse and load the html received */
web2py.trap_form(action, target); web2py.trap_form(action, target);
web2py.ajax_init('#' + target); web2py.ajax_init('#' + target);
web2py.after_ajax(xhr); web2py.after_ajax(xhr);
@@ -445,8 +445,8 @@
} else return false; /* not supported */ } else return false; /* not supported */
}, },
/* new from here */ /* new from here */
/* Form input elements bound by jquery-uj */ /* Form input elements bound by web2py.js */
formInputClickSelector: 'input[type=submit], input[type=image], button[type=submit], button:not([type])', formInputClickSelector: 'input[type=submit]:not([name]), input[type=image]:not([name]), button[type=submit]:not([name]), button:not([type]):not([name])',
/* Form input elements disabled during form submission */ /* Form input elements disabled during form submission */
disableSelector: 'input, button, textarea, select', disableSelector: 'input, button, textarea, select',
/* Form input elements re-enabled after form submission */ /* Form input elements re-enabled after form submission */
@@ -513,7 +513,7 @@
if(flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown(); if(flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
}, },
hide_flash: function () { hide_flash: function () {
$('.flash').fadeOut(0).html(''); $('.flash').fadeOut(0).html('');
}, },
show_if_handler: function (target) { show_if_handler: function (target) {
var triggers = {}; var triggers = {};