raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Removed animations due to rendering issues on some browsers.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/plugins/remotes/html/index.html
View File

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

12
openlp/plugins/remotes/html/openlp.js
View File

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