Changeset 33049 for main/trunk

Timestamp:

2019-05-06T13:45:54+12:00 (5 years ago)

Author:

kjdon

Message:

moved the basket item display to its own function so it can easily be customised. also removed a debug thing which got left in by mistake

File:

• main/trunk/greenstone3/web/interfaces/default/js/berrybasket/berrybasket.js (modified) (3 diffs)

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

@@ -199 +199 @@
         var berryElement = document.createElement('li');
         list.appendChild(berryElement);
-        var title = berryItem.getAttribute('Title');
-        var root_title = berryItem.getAttribute('root_Title');
-        //var id = berryItem.getAttribute('collection')+":"+berryItem.getAttribute('name');
-
-        if (root_title != null){
-            title = root_title+":"+title;
-        }
-            title += " ("+berryItem.getAttribute('collection')+")";
-        if (title.length > 76){
-            title = title.substring(0,30)+" ... "+title.substr(title.length-45,45);
-        }
-        
+       
+                var title = berryTitle(berryItem);   
         berryElement.setAttribute("class","berryitem");
         berryElement.setAttribute("title",title);
-        berryElement.innerHTML = title;
+        berryElement.innerHTML = title; 
         height +=40;
     }
@@ -254 +244 @@
 }
 
+function berryTitle(berryItem) {
+
+    var title = berryItem.getAttribute('Title');                    
+    var root_title = berryItem.getAttribute('root_Title');          
+    //var id = berryItem.getAttribute('collection')+":"+berryItem.getAttribute('name');                                                            
+    
+    if (root_title != null){                                        
+        title = root_title+":"+title;                               
+    }                                                               
+    title += " ("+berryItem.getAttribute('collection')+")";         
+    if (title.length > 76){                                         
+        title = title.substring(0,30)+" ... "+title.substr(title.length-45,45);                                                                
+    }                                                               
+
+    return title;
+}
+
 function hideBasket() {
 //alert( arguments.callee );
@@ -291 +298 @@
 
 function addBerry(el){
-    var addurl = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=AddItem&c=&s1.id=2&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&poo=1&s1.item=" + el.id;
+    var addurl = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=AddItem&c=&s1.id=2&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&s1.item=" + el.id;
 
     var addSuccess = function(o){