Changeset 37550

Timestamp:

2023-03-20T14:49:28+13:00 (13 months ago)

Author:

kjdon

Message:

work in progress: tidying up and simplifying favourites. docList and berrylist now just hold ids = collection:nodeID, rather than structure. all display handled by the xsl so don't need the other bits here.

Location:

main/trunk/greenstone3/web/interfaces/default/js/favouritebasket

Files:

• favouritebasket.js (modified) (8 diffs)
• favouritecheckout.js (modified) (9 diffs)

main/trunk/greenstone3/web/interfaces/default/js/favouritebasket/favouritebasket.js

@@ -1 @@
-//used to stored the current items in basket, including collection name, document id and dodument title
-//in the format of collection:id:[title], it is updated when the page is loaded (reloaded) or the user adds
-// new items in the basket (see ygDDplayer.js). It is used to show the contents of the basket.
+//used to stored the current items in basket, including collection name and document id
+//in the format of collection:id. it is updated when the page is loaded (reloaded) or the user adds
+// new items in the basket. 
 
 // note we only support favourites now, not the old drag and drop berry baskets
@@ -9 +9 @@
 
 
-var countFavourites = function(callback) {
+var countFavouritesUNUSED = function(callback) {
         var request_type = "GET";
     var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=GetNumFavourites&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&c=";
@@ -46 +46 @@
         for (var i=0;i < items.length ; i++ ){
 
-            var itemID = items[i].getAttribute('collection')+":"+items[i].getAttribute('name');
+            var itemID = items[i].getAttribute('collection')+":"+items[i].getAttribute('nodeID');
             var item = YAHOO.util.Dom.get(itemID);
 
@@ -53 +53 @@
                     item.setAttribute("data-is-favourite","true");
             }
-            berryList[berryList.length] = items[i];
+            berryList[berryList.length] = itemID;//items[i];
         }
 
@@ -78 +78 @@
             if (berry.className && berry.className == 'pick'){
                 berry.style.visibility = "visible";
-                // new ygDDPlayer(berry.id,'basket',berryList); // **** can go 
             }
         }
@@ -85 +84 @@
 
     var responseFailure = function(o){
-        console.error("Berry Basket GetItems AJAX call failed:" + url);
+        console.error("GetNumFavourites AJAX call failed:" + url);
     }
 
@@ -121 +120 @@
 
         if (items.length > 0){
-                // assumes that there is only 1 item to add
-            var item = items[0];
-            berryList[berryList.length]= item;
+            // assumes that there is only 1 item to add
+            var item = items[0];
+                    var itemID = item.getAttribute('collection')+":"+item.getAttribute('nodeID');
+            berryList[berryList.length]= itemID;
 
-                    updateFavouritesCount();
+                updateFavouritesCount();
         }
 
@@ -151 +151 @@
                         var berry = berryList[i];
                 console.log(berry);
-                        var id = berry.getAttribute('collection')+":"+berry.getAttribute('name');
+                        //var id = berry.getAttribute('collection')+":"+berry.getAttribute('nodeID');
 
-                        if (id == el.id){
+                        if (berry == el.id){
                                 berryList.splice(i,1);
 

main/trunk/greenstone3/web/interfaces/default/js/favouritebasket/favouritecheckout.js

@@ -31 +31 @@
 
     for(var i = 0; i < docList.length; i++) {
-    var doc = docList[i];
-    var doc_id = doc['collection']+":"+ doc['name'];
-
+    //var doc = docList[i];
+    //var doc_id = doc['collection']+":"+ doc['name'];
+        var doc_id = docList[i];
     if((i+1) == docList.length) { // if it's the last id to process, don't append separator
         delurl += doc_id;
@@ -72 +72 @@
         var searchForNextSelectedIdFromIndex = idsToDelete.length-1;
         for (var i = docList.length - 1; i >= 0; i--) {
-        var berry = docList[i];
-        var berry_id = berry['collection'] + ":" + berry['name'];
-                
+        //var berry = docList[i];
+        //var berry_id = berry['collection'] + ":" + berry['name'];
+        var berry_id = docList[i];      
         for(var j = searchForNextSelectedIdFromIndex; j >= 0; j--) {
             if(idsToDelete[j] == berry_id) {
@@ -247 +247 @@
 function showFullViewFavourites(){
 
-    var content =  YAHOO.util.Dom.get('berryBasketContentXX');
-    var fullview =  YAHOO.util.Dom.get('fullview');
+    //var content =  YAHOO.util.Dom.get('berryBasketContentXX');
+    //var fullview =  YAHOO.util.Dom.get('fullview');
     //berryCheckoutPageClear();
 
         var berryBasketDelOptions = YAHOO.util.Dom.get('delOptions');
     if (docList.length == 0){
-        content.appendChild(emptyBasketText());
+        content//.appendChild(emptyBasketText());
         if (berryBasketDelOptions != null) {
         berryBasketDelOptions.setAttribute("style","display:none;");
@@ -264 +264 @@
     }
 
-    var share_anchor = YAHOO.util.Dom.get('shareBasket');
+    var share_anchor = YAHOO.util.Dom.get('shareAnchor');
     var plain_text = "";
     var dlist = document.createElement('div');
-    content.appendChild(dlist);
+    //content.appendChild(dlist);
     var ul = document.createElement('ul');
     dlist.appendChild(ul);
@@ -275 +275 @@
 
     for (var i in docList){
-        var doc = docList[i];
+        //var doc = docList[i];
         var li = document.createElement('li');
             var img = document.createElement('img');
         var text ="";
 
-        var doc_id = doc['collection']+":"+ doc['name'];        
+        //var doc_id = doc['collection']+":"+ doc['name'];
+        var doc_id = docList[i];
         
         img.setAttribute("src", gs.variables.selected_favourite_icon_url); 
@@ -290 +291 @@
         li.appendChild(img);
 
-        generateDocDisplay(li, doc, doc_id);
+        //generateDocDisplay(li, doc, doc_id);
             plain_text += generateMailEntry(doc, doc_id)+"%0D%0A%0D%0A";
         li.className = 'berrydoc';
@@ -513 +514 @@
 }
 
-function getDefaultLinkType(collection) {
+function getDefaultLinkTypeUNUSED(collection) {
     var link_type; 
     if (document_link_collections.includes(collection)) {
@@ -529 +530 @@
 }
    
-function generateURL(doc) {
+function generateURLUNUSED(doc) {
 
     var url;
@@ -557 +558 @@
 }
 
-function populateUrlsAndMetadata(parea){
+function populateUrlsAndMetadataUNUSED(parea){
 
     var fulltext="";