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

Merge pull request #1797 from BigManWalter/master

Browse Source 
Set entry animation to 'fadeIn' and provide an easy switch for 'slideDown'
This commit is contained in:
mdipierro
2017-11-10 18:10:13 -06:00
committed by GitHub
parent 934042fc04 2aa8fd22a2
commit 57522ddeb1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/welcome/static/js/web2py.js
+5 -3
View File
@@ -13,6 +13,8 @@
} }
var FORMDATA_IS_SUPPORTED = typeof(FormData) !== 'undefined'; var FORMDATA_IS_SUPPORTED = typeof(FormData) !== 'undefined';
var animateIn = 'fadeIn';
// var animateIn = 'slideDown';
String.prototype.reverse = function () { String.prototype.reverse = function () {
return this.split('').reverse().join(''); return this.split('').reverse().join('');
@@ -180,7 +182,7 @@
}, },
/* manage errors in forms */ /* manage errors in forms */
manage_errors: function (target) { manage_errors: function (target) {
$('div.error', target).hide().slideDown('slow'); $('div.error', target).hide()[animateIn]('slow');
}, },
after_ajax: function (xhr) { after_ajax: function (xhr) {
/* called whenever an ajax request completes */ /* called whenever an ajax request completes */
@@ -616,7 +618,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.append('<span id="closeflash"> &times; </span>').slideDown(); if (flash.html()) flash.append('<span id="closeflash"> &times; </span>')[animateIn]();
}, },
hide_flash: function () { hide_flash: function () {
$('.w2p_flash').fadeOut(0).html(''); $('.w2p_flash').fadeOut(0).html('');
@@ -630,7 +632,7 @@
for (var k = 0; k < triggers[id].length; k++) { for (var k = 0; k < triggers[id].length; k++) {
var dep = $('#' + triggers[id][k], target); var dep = $('#' + triggers[id][k], target);
var tr = $('#' + triggers[id][k] + '__row', target); var tr = $('#' + triggers[id][k] + '__row', target);
if (t.is(dep.attr('data-show-if'))) tr.slideDown(); if (t.is(dep.attr('data-show-if'))) tr[animateIn]();
else tr.hide(); else tr.hide();
} }
}; };