mirror of
https://gitlab.com/walljm/dynamicbible.git
synced 2025-07-25 00:09:54 -04:00
BUGFIXES: Fixes a variety of the remaining issues
* css formatting issues * upgraded to latest jquery * removed requirejs because of incompatibility with jquery mobile * multiple bug fixes relating to above * search now opens automatically when performing a search
This commit is contained in:
jason.wall
parent
61753ba299
commit
f9dc9e5819
@ -1,5 +1,15 @@
|
||||
a
|
||||
{
|
||||
a.link
|
||||
{
|
||||
font-weight: normal;
|
||||
color: #000;
|
||||
text-decoration:none;
|
||||
border-bottom: 1px dotted darkgray;
|
||||
_border-bottom: 1px solid lightgray; /* IE */
|
||||
}
|
||||
|
||||
a.hiddenlink
|
||||
{
|
||||
font-weight: normal;
|
||||
color: #000;
|
||||
text-decoration:none;
|
||||
border-bottom: 1px dotted darkgray;
|
||||
@ -47,7 +57,6 @@ a:hover {
|
||||
{
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
#resultwrap {
|
||||
float: left;
|
||||
font: 18px georgia;
|
||||
|
||||
3
css/jquery.mobile-1.4.5.min.css
vendored
Normal file
3
css/jquery.mobile-1.4.5.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
32
index2.html
32
index2.html
@ -8,16 +8,23 @@
|
||||
<meta name="keywords" content="AJAX, KJV, King James Version, Strong's Dictionary, Strongs" />
|
||||
|
||||
<title>The Bible with Strong's Numbers and Cross References</title>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" href="css/jquery.mobile-1.3.2.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="css/jquery.mobile-1.4.5.min.css" />
|
||||
<link rel="stylesheet" href="css/themes/db.css" />
|
||||
|
||||
<style>@import "css/bible.css";</style>
|
||||
|
||||
<script src="js/jquery-1.9.1.min.js"></script>
|
||||
<script src="js/jquery.mobile-1.3.2.min.js"></script>
|
||||
|
||||
<script data-main="js/main" type="text/javascript" src="js/require-jquery.js"></script>
|
||||
<script src="js/jquery-1.11.1.min.js"></script>
|
||||
<script src="js/jquery.ui.js"></script>
|
||||
<script src="js/jquery.slidePanel.js"></script>
|
||||
<script src="js/jquery.mobile-1.4.5.js"></script>
|
||||
|
||||
<script src="js/reference.js"></script>
|
||||
<script src="js/common.js"></script>
|
||||
<script src="js/main.js"></script>
|
||||
|
||||
<style>
|
||||
.panel-content { padding:3px; }
|
||||
|
||||
@ -27,18 +34,9 @@
|
||||
|
||||
.ui-submit .ui-btn-inner .ui-btn-text { font-size: 1.2em;}
|
||||
.ui-submit {height:35px;}
|
||||
|
||||
/*
|
||||
.resultbody { max-width: 600px;}
|
||||
@media all and (min-width: 900px) {
|
||||
.resultbody {
|
||||
-webkit-columns: 2;
|
||||
-moz-columns: 2;
|
||||
columns: 2;
|
||||
}
|
||||
.ui-block-c div {
|
||||
margin-top: 9px;
|
||||
}
|
||||
*/
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
@ -60,7 +58,7 @@
|
||||
</div><!-- /content -->
|
||||
</div>
|
||||
|
||||
<div data-role="panel" id="searchpanel" data-theme="a" data-position="right">
|
||||
<div data-role="panel" id="searchpanel" data-theme="a" data-position="right" data-display="overlay">
|
||||
<div class="panel-content">
|
||||
<h3>Search Results: <span id="searchTotal"></span></h3>
|
||||
<div id="searchresults"></div>
|
||||
|
||||
2050
js/common.js
2050
js/common.js
File diff suppressed because it is too large
Load Diff
4
js/jquery-1.11.1.min.js
vendored
Normal file
4
js/jquery-1.11.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
5
js/jquery-1.9.1.min.js
vendored
5
js/jquery-1.9.1.min.js
vendored
File diff suppressed because one or more lines are too long
9
js/jquery.mobile-1.3.2.min.js
vendored
9
js/jquery.mobile-1.3.2.min.js
vendored
File diff suppressed because one or more lines are too long
15454
js/jquery.mobile-1.4.5.js
Normal file
15454
js/jquery.mobile-1.4.5.js
Normal file
File diff suppressed because it is too large
Load Diff
136
js/main.js
136
js/main.js
@ -1,76 +1,66 @@
|
||||
require(["jquery", "db", "common", "reference", "jquery.cookie", "jquery.ui", "jquery.slidePanel"],
|
||||
function($, db, common, ref) {
|
||||
$(document).ready(function()
|
||||
{
|
||||
$("#searchvalue").keypress(function(event) {
|
||||
if (event.which === 13) {
|
||||
common.Search($("#searchvalue").val());
|
||||
return false;
|
||||
}
|
||||
});
|
||||
$("#searchbtn").click(function()
|
||||
{
|
||||
common.Search($("#searchvalue").val());
|
||||
return false;
|
||||
});
|
||||
$("#growfont").click(function()
|
||||
{
|
||||
common.Settings.IncreaseResultFontSize();
|
||||
return false;
|
||||
});
|
||||
$("#shrinkfont").click(function()
|
||||
{
|
||||
common.Settings.DecreaseResultFontSize();
|
||||
return false;
|
||||
});
|
||||
$("#showhelp").click(function()
|
||||
{
|
||||
$("#help").dialog({
|
||||
draggable: true,
|
||||
width: 700,
|
||||
height: 650,
|
||||
resizable: true
|
||||
});
|
||||
});
|
||||
$("#changefont").change(function()
|
||||
{
|
||||
common.Settings.ChangeResultFont($("#changefont").val());
|
||||
return false;
|
||||
});
|
||||
|
||||
// load querystring
|
||||
var ref = decodeURIComponent(common.Util.GetUrlVars().r);
|
||||
if (ref !== "undefined") {
|
||||
// remember the settings, first, because if you have results, the load process would wipe out the passage you want to load.
|
||||
common.Settings.Load();
|
||||
|
||||
// now load the passage from the querystring.
|
||||
common.Search(ref);
|
||||
$("#searchvalue").val(ref);
|
||||
} else {
|
||||
common.Settings.Load();
|
||||
}
|
||||
|
||||
// you need to do this last, otherwise the settings load resets the window height.
|
||||
$(window).bind("resize", function()
|
||||
{
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-a").css("width", 55);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-b").css("width", window.innerWidth - 230);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-c").css("width", 100);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-d").css("width", 55);
|
||||
|
||||
$("#searchresults").css("height", window.innerHeight-100);
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-a").css("width", 55);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-b").css("width", window.innerWidth - 235);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-c").css("width", 100);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-d").css("width", 55);
|
||||
|
||||
$("#searchresults").css("height", window.innerHeight-100);
|
||||
});
|
||||
$(document).ready(function()
|
||||
{
|
||||
$("#searchvalue").keypress(function(event) {
|
||||
if (event.which === 13) {
|
||||
Search($("#searchvalue").val());
|
||||
return false;
|
||||
}
|
||||
});
|
||||
$("#searchbtn").click(function()
|
||||
{
|
||||
Search($("#searchvalue").val());
|
||||
return false;
|
||||
});
|
||||
$("#growfont").click(function()
|
||||
{
|
||||
Settings.IncreaseResultFontSize();
|
||||
return false;
|
||||
});
|
||||
$("#shrinkfont").click(function()
|
||||
{
|
||||
Settings.DecreaseResultFontSize();
|
||||
return false;
|
||||
});
|
||||
$("#showhelp").click(function()
|
||||
{
|
||||
$("#help").dialog({
|
||||
draggable: true,
|
||||
width: 700,
|
||||
height: 650,
|
||||
resizable: true
|
||||
});
|
||||
});
|
||||
$("#changefont").change(function()
|
||||
{
|
||||
Settings.ChangeResultFont($("#changefont").val());
|
||||
return false;
|
||||
});
|
||||
// load querystring
|
||||
var ref = decodeURIComponent(Util.GetUrlVars().r);
|
||||
if (ref !== "undefined") {
|
||||
// remember the settings, first, because if you have results, the load process would wipe out the passage you want to load.
|
||||
Settings.Load();
|
||||
// now load the passage from the querystring.
|
||||
Search(ref);
|
||||
$("#searchvalue").val(ref);
|
||||
} else {
|
||||
Settings.Load();
|
||||
}
|
||||
|
||||
// you need to do this last, otherwise the settings load resets the window height.
|
||||
$(window).bind("resize", function()
|
||||
{
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-a").css("width", 55);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-b").css("width", window.innerWidth - 230);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-c").css("width", 100);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-d").css("width", 55);
|
||||
$("#searchresults").css("height", window.innerHeight - 100);
|
||||
return false;
|
||||
});
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-a").css("width", 55);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-b").css("width", window.innerWidth - 235);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-c").css("width", 100);
|
||||
$(".my-breakpoint.ui-grid-c .ui-block-d").css("width", 55);
|
||||
$("#searchresults").css("height", window.innerHeight - 100);
|
||||
|
||||
});
|
||||
|
||||
1330
js/reference.js
1330
js/reference.js
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user