Merge branch '1.0.x' into testing

This commit is contained in:
Evan Prodromou 2011-06-09 10:33:36 -04:00
commit fdee419051

View File

@ -348,12 +348,21 @@ class MobileProfilePlugin extends WAP20Plugin
$("#navtoggle").text( $("#navtoggle").text(
text == "Show Navigation" ? "Hide Navigation" : "Show Navigation"); text == "Show Navigation" ? "Hide Navigation" : "Show Navigation");
}); });
});'
);
if ($this->serveMobile) {
$action->inlineScript('
$(function() {
$(".checkbox-wrapper").unbind("click"); $(".checkbox-wrapper").unbind("click");
});' });'
); );
} }
}
function onEndShowInsideFooter($action) function onEndShowInsideFooter($action)
{ {
if ($this->serveMobile) { if ($this->serveMobile) {