Changeset 33286 for main/trunk/greenstone3

Timestamp:

2019-07-02T14:44:36+12:00 (5 years ago)

Author:

kjdon

Message:

standardising the basket names. berryBasket, favouriteBasket, documentBasket. variables etc will all follow this pattern. cgi params berrybasket, favouritebasket. etc

Location:

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

Files:

• berrybasket/berrybasket.js (modified) (1 diff)
• berrybasket/berrycheckout.js (modified) (1 diff)
• classifier_scripts.js (modified) (2 diffs)
• facet-scripts.js (modified) (1 diff)

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

@@ -585 +585 @@
 }
 else {
-    // assumption is that favouritesbasket is on 
+    // assumption is that favouritebasket is on 
     YAHOO.util.Event.addListener(window, 'load', favouritesCheckout);
 }

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

@@ -293 +293 @@
     }
     else {
-    // assumption is that favouritesbasket is on 
+    // assumption is that favouritebasket is on 
     showFullViewFavourites();
     }    

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

@@ -129 +129 @@
             url = url + "&berrybasket=on";
         } 
-        if(gs.cgiParams.favouritesbasket == "on")
+        if(gs.cgiParams.favouritebasket == "on")
         {
-            url = url + "&favouritesbasket=on";
+            url = url + "&favouritebasket=on";
         } 
 
@@ -154 +154 @@
                     berryCheckout();
             }
-            if(gs.cgiParams.favouritesbasket == "on")
+            if(gs.cgiParams.favouritebasket == "on")
             {
                 favouritesCheckout();

main/trunk/greenstone3/web/interfaces/default/js/facet-scripts.js

@@ -60 +60 @@
                     berryCheckout(); // called to add back in berries (if berrybasket active)
             }
-            if(gs.cgiParams.favouritesbasket == "on") {
-                    favouritesCheckout(); // called to add back in favourites icons (if favouritesbasket active)
+            if(gs.cgiParams.favouritebasket == "on") {
+                    favouritesCheckout(); // called to add back in favourites icons (if favouritebasket active)
             }
         });