mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix drop-downs in timeline (regression from 5.0.78)

Browse source 
Fixes #1773
This commit is contained in:
Dan Stillman 2020-02-24 13:16:31 -05:00
parent b7901ec8dc
commit 8822982199
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/skin/default/zotero/timeline/timeline.html
View file

@ -69,7 +69,7 @@
Timeline.loadXML("zotero://timeline/data/", function(xml, url) { eventSource.loadXML(xml, url); }); Timeline.loadXML("zotero://timeline/data/", function(xml, url) { eventSource.loadXML(xml, url); });
setupFilterHighlightControls(document.getElementById("my-timeline-controls"), tl, [0,1,2], theme); setupFilterHighlightControls(document.getElementById("my-timeline-controls"), tl, [0,1,2], theme);
setupOtherControls(document.getElementById("my-other-controls"), tl, document.location.search); setupOtherControls(document.getElementById("my-other-controls"), tl, getQueryString());
} }
function onResize() { function onResize() {

27
chrome/skin/default/zotero/timeline/timelineControls.js
View file

@ -154,7 +154,7 @@ function changeBand(queryString, band, intervals, selectedIndex) {
} }
} }
window.location.search = queryString + 'i=' + newIntervals; replaceQueryString(queryString + 'i=' + newIntervals);
} }
function createOption(t, selected) { function createOption(t, selected) {
@ -188,7 +188,7 @@ function getFull(a) {
} }
function createQueryString(theQueryValue, except, timeline) { function createQueryString(theQueryValue, except, timeline) {
var temp = ''; var temp = '?';
for(var i in theQueryValue) { for(var i in theQueryValue) {
if(except != i) { if(except != i) {
temp += i + '=' + theQueryValue[i] + '&'; temp += i + '=' + theQueryValue[i] + '&';
@ -316,7 +316,7 @@ function setupOtherControls(div, timeline, queryString) {
select4.appendChild(createOption(options[i],(values[i] == dateType))); select4.appendChild(createOption(options[i],(values[i] == dateType)));
} }
select4.onchange = function () { select4.onchange = function () {
window.location.search = createQueryString(theQueryValue, 't', timeline) + 't=' + values[table.rows[1].cells[4].firstChild.selectedIndex]; replaceQueryString(createQueryString(theQueryValue, 't', timeline) + 't=' + values[table.rows[1].cells[4].firstChild.selectedIndex]);
}; };
td.appendChild(select4); td.appendChild(select4);
@ -324,13 +324,32 @@ function setupOtherControls(div, timeline, queryString) {
var fitToScreen = document.createElement("button"); var fitToScreen = document.createElement("button");
fitToScreen.innerHTML = getString("general.fitToScreen"); fitToScreen.innerHTML = getString("general.fitToScreen");
Timeline.DOM.registerEvent(fitToScreen, "click", function () { Timeline.DOM.registerEvent(fitToScreen, "click", function () {
window.location.search = createQueryString(theQueryValue, false, timeline); replaceQueryString(createQueryString(theQueryValue, false, timeline));
}); });
td.appendChild(fitToScreen); td.appendChild(fitToScreen);
div.appendChild(table); div.appendChild(table);
} }
/**
* window.location.search no longer works in Fx60
*/
function getQueryString() {
return window.location.href.replace(/^[^?]+/, '');
}
/**
* Replacing window.location.search no longer works in Fx60, so replace href instead
*/
function replaceQueryString(queryString) {
// Get position of beginning of beginning of pathname, after scheme (e.g., 'zotero:')
var pos = window.location.href.indexOf(window.location.pathname);
window.location.href = window.location.href.substr(0, pos)
+ window.location.pathname
+ queryString;
Zotero.debug(window.location.href);
}
/* /*
Everything below is from http://simile.mit.edu/timeline/examples/examples.js unless noted otherwise Everything below is from http://simile.mit.edu/timeline/examples/examples.js unless noted otherwise
*/ */