Removed animations due to rendering issues on some browsers.

Removed the "close dialog" call since it was being called after the "go to" in some browsers (instead of before).
This commit is contained in:
Raoul Snyman 2012-04-18 22:44:47 +02:00
parent aae1d3753b
commit 4810bce920
2 changed files with 10 additions and 6 deletions

View File

@ -80,7 +80,7 @@
<a href="#" id="service-blank" data-role="button" data-icon="blank">${blank}</a>
<a href="#" id="service-theme" data-role="button">${theme}</a>
<a href="#" id="service-desktop" data-role="button">${desktop}</a>
<a href="#" id="service-show" data-role="button" data-icon="unblank">${show}</a>
<a href="#" id="service-show" data-role="button" data-icon="unblank" data-iconpos="right">${show}</a>
</div>
<div data-role="controlgroup" data-type="horizontal" style="float: left;">
<a href="#" id="service-previous" data-role="button" data-icon="arrow-l">${prev}</a>
@ -111,7 +111,7 @@
<a href="#" id="controller-blank" data-role="button" data-icon="blank">${blank}</a>
<a href="#" id="controller-theme" data-role="button">${theme}</a>
<a href="#" id="controller-desktop" data-role="button">${desktop}</a>
<a href="#" id="controller-show" data-role="button" data-icon="unblank">${show}</a>
<a href="#" id="controller-show" data-role="button" data-icon="unblank" data-iconpos="right">${show}</a>
</div>
<div data-role="controlgroup" data-type="horizontal" style="float: left;">
<a href="#" id="controller-previous" data-role="button" data-icon="arrow-l">${prev}</a>

View File

@ -246,9 +246,8 @@ window.OpenLP = {
else {
$.each(data.results.items, function (idx, value) {
ul.append($("<li>").append($("<a>").attr("href", "#options")
.attr("data-rel", "dialog").attr("data-transition", "pop")
.attr("value", value[0]).click(OpenLP.showOptions)
.text(value[1])));
.attr("data-rel", "dialog").attr("value", value[0])
.click(OpenLP.showOptions).text(value[1])));
});
}
ul.listview("refresh");
@ -299,7 +298,7 @@ window.OpenLP = {
"/api/" + $("#search-plugin").val() + "/add",
{"data": text},
function () {
$("#options").dialog("close");
//$("#options").dialog("close");
$.mobile.changePage("#service-manager");
}
);
@ -308,6 +307,11 @@ window.OpenLP = {
return string.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")
}
}
// Initial jQueryMobile options
$(document).bind("mobileinit", function(){
$.mobile.defaultDialogTransition = "none";
$.mobile.defaultPageTransition = "none";
});
// Service Manager
$("#service-manager").live("pagebeforeshow", OpenLP.loadService);
$("#service-refresh").live("click", OpenLP.loadService);