Jelajahi Sumber

Bug fix on magnifing glass

Alessia 1 tahun lalu
induk
melakukan
fcbb4248e2
5 mengubah file dengan 19 tambahan dan 20 penghapusan
  1. 1 1
      OA.html
  2. 4 1
      css/OA.css
  3. 7 11
      js/OA.js
  4. 2 2
      js/query/managerQuery.js
  5. 5 5
      js/utilities.js

+ 1 - 1
OA.html

@@ -319,7 +319,7 @@
 										</div>
 
 										<div id="images_container" class="row border-grey center">
-											<div class="col-3" id="image_min">
+											<div class="col-2" id="image_min">
 												<div class="row">
 													<div id="image_artwork_min" class="col">
 

+ 4 - 1
css/OA.css

@@ -50,4 +50,7 @@
     width: 200px;
     height: 200px;
   }
-  
+  
+  .minImage {
+      padding: 10px;
+  }

+ 7 - 11
js/OA.js

@@ -174,7 +174,7 @@ function handle_Picture(json) {
 
         src_picture = value['picture']['value'];
         picture += '<div class="row"> \
-                           <img class="viewImage" src="img/mpp_img/' + src_picture + '" onclick="expandImg(this);" /> \
+                           <img class="minImage viewImage" src="img/mpp_img/' + src_picture + '" onclick="expandImg(this);" /> \
                     </div>';
 
         
@@ -318,7 +318,7 @@ function handle_Bibliography(json) {
                 var marchini = cat[i].replace(".jpg", " (1).jpg");
                 img_cat = "img/MPP_marchini_stampa/" + marchini;
                 catImg += '<div class="row"> \
-                              <img class="viewImage" src="img/MPP_marchini_stampa/' + marchini + '" onclick="expandImg(this);" /> \
+                              <img class="minImage viewImage" src="img/MPP_marchini_stampa/' + marchini + '" onclick="expandImg(this);" /> \
                           </div>';
             }
           }
@@ -357,10 +357,10 @@ function handle_Iconclass(json) {
   $.each(
       json['results']['bindings'],
       function (index, value) {
-        var uri_icon = value['scheda']['value'];
-        var sigla_icon = scheda.replace(".jpg", "");
+        var uri_icon = value['uri_iconclass']['value'];
+        var sigla_icon = value['iconclass']['value'];
         
-        Icon += '<a href="' + uri_icon + '">' + sigla_icon + '</a>';
+        Icon += '<a href="' + uri_icon + '">' + sigla_icon + '</a><br />';
         
       });
   
@@ -369,9 +369,7 @@ function handle_Iconclass(json) {
 
   if (Icon != "") {
     $("#ICON").css("display", "flex");
-  } else {
-    $("#ICON").css("display", "none");
-  }
+  } 
 }
 
 function handle_SchedeStoriche(json) {
@@ -422,7 +420,7 @@ function createScheda(image) {
     if (exists) {
       console.log(image);
       var ImageScheda = '<div class="row"> \
-      <img class="viewImage" src="' + image + '" onclick="expandImg(this);"> \
+      <img class="minImage viewImage" src="' + image + '" onclick="expandImg(this);"> \
       </div>';
       console.log(ImageScheda);
       $('#image_scheda_min').append(ImageScheda);
@@ -538,5 +536,3 @@ function magnify(imgID, zoom) {
     return {x : x, y : y};
   }
 }
-
-magnify("expandedImg", 3);

+ 2 - 2
js/query/managerQuery.js

@@ -914,9 +914,9 @@ var queryManager = {
             ?uri_objInscr crm:P3_has_note ?iscrizione . } \
             }",
 
-            queryIconclass = " SELECT DISTINCT uri_iconclass ?iconclass \
+            queryIconclass : " SELECT DISTINCT ?uri_iconclass ?iconclass \
             WHERE { \
-            VALUES ?uri {<URI>} \
+            VALUES ?uri {<{URI}>} \
             ?uri crm:P62_depicts ?uri_iconclass . \
             ?uri_iconclass rdfs:label ?iconclass ; \
             crm:P2_has_type 'Sigla Iconclass' . \

+ 5 - 5
js/utilities.js

@@ -101,13 +101,13 @@ function changeStyle() {
 }
 
 $(document).on("click", ".zoomImg", function (ev) {
-  magnify("expandedImg", 3);
-  var x = document.getElementById("glass");
-  if (x.style.display === "none") {
-    x.style.display = "block";
+  if (!!document.getElementById("glass")) {
+    const element = document.getElementById('glass');
+    element.remove();
   } else {
-    x.style.display = "none";
+    magnify("expandedImg", 3);
   }
+  
 });