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

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro
2014-10-16 16:07:54 -05:00
parent 4211c38ac5 1f3030c75a
commit 39dec30f52
3 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/static/js/web2py.js
+8 -6
View File
@@ -684,12 +684,8 @@
} }
}); });
$.web2py.component_handler(target); $.web2py.component_handler(target);
} },
} main_hook : function() {
/*end of functions */
/*main hook*/
$(function() {
var flash = $('.flash'); var flash = $('.flash');
flash.hide(); flash.hide();
if(flash.html()) web2py.flash(flash.html()); if(flash.html()) web2py.flash(flash.html());
@@ -697,6 +693,12 @@
web2py.event_handlers(); web2py.event_handlers();
web2py.a_handlers(); web2py.a_handlers();
web2py.form_handlers(); web2py.form_handlers();
}
}
/*end of functions */
/*main hook*/
$(function () {
web2py.main_hook();
}); });
})(jQuery); })(jQuery);
applications/examples/static/js/web2py.js
+8 -6
View File
@@ -684,12 +684,8 @@
} }
}); });
$.web2py.component_handler(target); $.web2py.component_handler(target);
} },
} main_hook : function() {
/*end of functions */
/*main hook*/
$(function() {
var flash = $('.flash'); var flash = $('.flash');
flash.hide(); flash.hide();
if(flash.html()) web2py.flash(flash.html()); if(flash.html()) web2py.flash(flash.html());
@@ -697,6 +693,12 @@
web2py.event_handlers(); web2py.event_handlers();
web2py.a_handlers(); web2py.a_handlers();
web2py.form_handlers(); web2py.form_handlers();
}
}
/*end of functions */
/*main hook*/
$(function () {
web2py.main_hook();
}); });
})(jQuery); })(jQuery);
applications/welcome/static/js/web2py.js
+8 -6
View File
@@ -684,12 +684,8 @@
} }
}); });
$.web2py.component_handler(target); $.web2py.component_handler(target);
} },
} main_hook : function() {
/*end of functions */
/*main hook*/
$(function() {
var flash = $('.flash'); var flash = $('.flash');
flash.hide(); flash.hide();
if(flash.html()) web2py.flash(flash.html()); if(flash.html()) web2py.flash(flash.html());
@@ -697,6 +693,12 @@
web2py.event_handlers(); web2py.event_handlers();
web2py.a_handlers(); web2py.a_handlers();
web2py.form_handlers(); web2py.form_handlers();
}
}
/*end of functions */
/*main hook*/
$(function () {
web2py.main_hook();
}); });
})(jQuery); })(jQuery);