Commit 56d644ef authored by Troy A. Griffitts's avatar Troy A. Griffitts

Added search and history clicks to history

parent 1e6a78a1
......@@ -707,25 +707,25 @@ console.log('setting default app theme: ' + app.defaultTheme);
var installBundledResources = function(callback) {
app.copyBundledResources('', '', function() {
// since we currently just nuke any top-level bundled resource folder, we can do this for mods.d/
// and modules/ or else other installed modules would be killed. We've added an exception for these
// folders at the root level (kindof a hack but works), but now...
// we really need some way to determine if we have a bundledResource older than something already
// installed and, if so, skip the install, so we don't overwrite an updated module with an older.
// for now replace anything from bundledResources in mods.d and these 2 module paths if exist
app.copyBundledResources('mods.d/', 'mods.d/', function() {
app.copyBundledResources('modules/texts/ztext/', 'modules/texts/ztext/', function() {
app.copyBundledResources('modules/', 'modules/', function() {
app.copyBundledResources('modules/lexdict/', 'modules/lexdict/', function() {
app.copyBundledResources('modules/lexdict/zld/', 'modules/lexdict/zld/', function() {
if (callback) return callback();
});
app.copyBundledResources('', '', function() {
// since we currently just nuke any top-level bundled resource folder, we can do this for mods.d/
// and modules/ or else other installed modules would be killed. We've added an exception for these
// folders at the root level (kindof a hack but works), but now...
// we really need some way to determine if we have a bundledResource older than something already
// installed and, if so, skip the install, so we don't overwrite an updated module with an older.
// for now replace anything from bundledResources in mods.d and these 2 module paths if exist
app.copyBundledResources('mods.d/', 'mods.d/', function() {
app.copyBundledResources('modules/texts/ztext/', 'modules/texts/ztext/', function() {
app.copyBundledResources('modules/', 'modules/', function() {
app.copyBundledResources('modules/lexdict/', 'modules/lexdict/', function() {
app.copyBundledResources('modules/lexdict/zld/', 'modules/lexdict/zld/', function() {
if (callback) return callback();
});
});
});
});
});
});
};
app.getLastAppVersion(function(lastVersion) {
......@@ -1519,8 +1519,12 @@ console.log('updateMainViewSetting: ' + viewType);
$('.searchHit').click(function () {
app.closeMenu();
var key = $(this).text();
app.setCurrentKey(key, function() {
app.displayCurrentChapter();
app.historyAdd(app.getCurrentVerseKey().shortText, function() {
app.setCurrentKey(key, function() {
app.historyAdd(app.getCurrentVerseKey().shortText, function() {
app.displayCurrentChapter();
});
});
});
});
},
......@@ -1562,7 +1566,7 @@ console.log('updateMainViewSetting: ' + viewType);
},
openSettings: function() {
if ($('.settingsPanel').hasClass('tohide')) return;
$(".settingsPanel").animate({height: "38em"});
$(".settingsPanel").animate({height: "40em"});
$('.settingsPanel').removeClass('toshow').addClass('tohide');
},
closeSettings: function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment