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

This commit is contained in:
mdipierro
2014-10-16 16:07:54 -05:00
3 changed files with 33 additions and 27 deletions

View File

@@ -684,19 +684,21 @@
}
});
$.web2py.component_handler(target);
},
main_hook : function() {
var flash = $('.flash');
flash.hide();
if(flash.html()) web2py.flash(flash.html());
web2py.ajax_init(document);
web2py.event_handlers();
web2py.a_handlers();
web2py.form_handlers();
}
}
/*end of functions */
/*main hook*/
$(function() {
var flash = $('.flash');
flash.hide();
if(flash.html()) web2py.flash(flash.html());
web2py.ajax_init(document);
web2py.event_handlers();
web2py.a_handlers();
web2py.form_handlers();
$(function () {
web2py.main_hook();
});
})(jQuery);

View File

@@ -684,19 +684,21 @@
}
});
$.web2py.component_handler(target);
},
main_hook : function() {
var flash = $('.flash');
flash.hide();
if(flash.html()) web2py.flash(flash.html());
web2py.ajax_init(document);
web2py.event_handlers();
web2py.a_handlers();
web2py.form_handlers();
}
}
/*end of functions */
/*main hook*/
$(function() {
var flash = $('.flash');
flash.hide();
if(flash.html()) web2py.flash(flash.html());
web2py.ajax_init(document);
web2py.event_handlers();
web2py.a_handlers();
web2py.form_handlers();
$(function () {
web2py.main_hook();
});
})(jQuery);

View File

@@ -684,19 +684,21 @@
}
});
$.web2py.component_handler(target);
},
main_hook : function() {
var flash = $('.flash');
flash.hide();
if(flash.html()) web2py.flash(flash.html());
web2py.ajax_init(document);
web2py.event_handlers();
web2py.a_handlers();
web2py.form_handlers();
}
}
/*end of functions */
/*main hook*/
$(function() {
var flash = $('.flash');
flash.hide();
if(flash.html()) web2py.flash(flash.html());
web2py.ajax_init(document);
web2py.event_handlers();
web2py.a_handlers();
web2py.form_handlers();
$(function () {
web2py.main_hook();
});
})(jQuery);