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

fixed undefined var in web2py.js

Browse Source
This commit is contained in:
mdipierro
2016-09-27 16:49:20 -05:00
parent cee7c87859
commit 4026357689
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/static/js/web2py.js
+2 -2
View File
@@ -617,8 +617,8 @@
} }
if (confirm_message) { if (confirm_message) {
if (confirm_message == 'default') { if (confirm_message == 'default') {
confirm_message = w2p_ajax_confirm_message || confirm_message = !web2py.isUndefined(w2p_ajax_confirm_message) ?
'Are you sure you want to delete this object?'; w2p_ajax_confirm_message : 'Are you sure you want to delete this object?';
} }
if (!web2py.confirm(confirm_message)) { if (!web2py.confirm(confirm_message)) {
web2py.stopEverything(e); web2py.stopEverything(e);
applications/examples/static/js/web2py.js
+3 -3
View File
@@ -562,7 +562,7 @@
var flash = $('.w2p_flash'); var flash = $('.w2p_flash');
web2py.hide_flash(); web2py.hide_flash();
flash.html(message).addClass(status); flash.html(message).addClass(status);
if (flash.html()) flash.slideDown(); if (flash.html()) flash.append('<span id="closeflash"> &times; </span>').slideDown();
}, },
hide_flash: function () { hide_flash: function () {
$('.w2p_flash').fadeOut(0).html(''); $('.w2p_flash').fadeOut(0).html('');
@@ -617,8 +617,8 @@
} }
if (confirm_message) { if (confirm_message) {
if (confirm_message == 'default') { if (confirm_message == 'default') {
confirm_message = w2p_ajax_confirm_message || confirm_message = !web2py.isUndefined(w2p_ajax_confirm_message) ?
'Are you sure you want to delete this object?'; w2p_ajax_confirm_message : 'Are you sure you want to delete this object?';
} }
if (!web2py.confirm(confirm_message)) { if (!web2py.confirm(confirm_message)) {
web2py.stopEverything(e); web2py.stopEverything(e);
applications/welcome/static/js/web2py.js
+5 -5
View File
@@ -201,7 +201,7 @@
showsTime: true, showsTime: true,
timeFormat: '24' timeFormat: '24'
}); });
$(this).prop('autocomplete', 'off'); $(this).attr('autocomplete', 'off');
$(this).data('w2p_datetime', 1); $(this).data('w2p_datetime', 1);
$(this).trigger('click'); $(this).trigger('click');
} }
@@ -218,7 +218,7 @@
showsTime: false showsTime: false
}); });
$(this).data('w2p_date', 1); $(this).data('w2p_date', 1);
$(this).prop('autocomplete', 'off'); $(this).attr('autocomplete', 'off');
$(this).trigger('click'); $(this).trigger('click');
} }
}); });
@@ -227,7 +227,7 @@
if (web2py.isUndefined(active)) { if (web2py.isUndefined(active)) {
$(this).timeEntry({ $(this).timeEntry({
spinnerImage: '' spinnerImage: ''
}).prop('autocomplete', 'off'); }).attr('autocomplete', 'off');
$(this).data('w2p_time', 1); $(this).data('w2p_time', 1);
} }
}); });
@@ -617,8 +617,8 @@
} }
if (confirm_message) { if (confirm_message) {
if (confirm_message == 'default') { if (confirm_message == 'default') {
confirm_message = w2p_ajax_confirm_message || confirm_message = !web2py.isUndefined(w2p_ajax_confirm_message) ?
'Are you sure you want to delete this object?'; w2p_ajax_confirm_message : 'Are you sure you want to delete this object?';
} }
if (!web2py.confirm(confirm_message)) { if (!web2py.confirm(confirm_message)) {
web2py.stopEverything(e); web2py.stopEverything(e);