From d550abf97abdfb3b5fbfc0885992766087a84326 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 21 Sep 2020 13:56:51 +0000 Subject: [PATCH] wip #3901 @0.25 --- inc/ws/Util/html5/master/class.ws.html5.links.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php index 35231b8d6..7de817732 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.links.php +++ b/inc/ws/Util/html5/master/class.ws.html5.links.php @@ -1280,14 +1280,15 @@ class layerLink extends imageLink public function getCSS() { - zoomLink::generateImage($this->getZoomAttributes(), $this->compiler, 'layerlink', 'layer'); - return 'background-image:url(../links/layer_' . $this->id . '.jpg);background-size:100% 100%;background-repeat:no-repeat;'; + $attributes = $this->getZoomAttributes(); + zoomLink::generateImage($attributes, $this->compiler, 'layerlink', 'layer'); + return 'background-image:url(../links/layer_' . $attributes['id'] . '.jpg);background-size:100% 100%;background-repeat:no-repeat;'; } public function getZoomAttributes() { return [ - 'id' => $this->id, + 'id' => $this->uid, 'page' => $this->page, 'maxzoom' => $this->maxzoom_default, 'width' => round($this->width), @@ -1415,8 +1416,9 @@ class downloadPortionLink extends fileLink { public function getURL() { - zoomLink::generateImage($this->getZoomAttributes(), $this->compiler, 'downloadportion', 'downloadportion'); - return 'data/links/downloadportion_' . $this->id . '.jpg'; + $attributes = $this->getZoomAttributes(); + zoomLink::generateImage($attributes, $this->compiler, 'downloadportion', 'downloadportion'); + return 'data/links/downloadportion_' . $attributes['id'] . '.jpg'; } public function getZoomAttributes() @@ -2046,7 +2048,7 @@ class zoomLink extends normalLink public function getZoomAttributes() { return [ - 'id' => $this->id, + 'id' => $this->uid, 'page' => $this->page, 'maxzoom' => empty($this->to) ? $this->maxzoom_default : $this->to, 'group' => implode(',', $this->getGroups()), -- 2.39.5