From 3df56b412689c8ffe0ec6830bbc11295fe4d86f0 Mon Sep 17 00:00:00 2001 From: Paul Dille Date: Sat, 31 Aug 2019 15:44:29 -0400 Subject: [PATCH] - Allow for custom thumbnail server/headless client hosts --- js/org/gigapan/timelapse/timelapse.js | 4 +++- libs/change-detect | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/org/gigapan/timelapse/timelapse.js b/js/org/gigapan/timelapse/timelapse.js index 6535e259..b3cf5065 100644 --- a/js/org/gigapan/timelapse/timelapse.js +++ b/js/org/gigapan/timelapse/timelapse.js @@ -154,6 +154,8 @@ if (!window['$']) { // TODO: This is probably not working as intended or even fully necessary now var useTouchFriendlyUI = ( typeof (settings["useTouchFriendlyUI"]) == "undefined") ? false : settings["useTouchFriendlyUI"]; var useThumbnailServer = ( typeof (settings["useThumbnailServer"]) == "undefined") ? true : settings["useThumbnailServer"]; + var thumbnailServerHost = settings["thumbnailServerHost"]; + var headlessClientHost = settings["headlessClientHost"]; var showSizePicker = settings["showSizePicker"] || false; var visualizerGeometry = { width: 250, @@ -3583,7 +3585,7 @@ if (!window['$']) { if (annotatorEnabled) annotator = new org.gigapan.timelapse.Annotator(thisObj); if (useThumbnailServer) { - var thumbnailToolOptions = {}; + var thumbnailToolOptions = {thumbnailServerHost: thumbnailServerHost, headlessClientHost: headlessClientHost}; thumbnailTool = new ThumbnailTool(thisObj, thumbnailToolOptions); } if (changeDetectionEnabled) { diff --git a/libs/change-detect b/libs/change-detect index cbfa764f..72414e09 160000 --- a/libs/change-detect +++ b/libs/change-detect @@ -1 +1 @@ -Subproject commit cbfa764f74c3ef6a1b72a3f5458a7d4438d39204 +Subproject commit 72414e09d9307b18ccca4918b76bf8c31f9d2707