Index: openacs-4/packages/xowiki/tcl/yui-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-init.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xowiki/tcl/yui-init.tcl	18 May 2018 09:28:49 -0000	1.2
+++ openacs-4/packages/xowiki/tcl/yui-init.tcl	3 Sep 2024 15:37:55 -0000	1.3
@@ -3,39 +3,40 @@
 #
 
 set YUI_CSS_PATHS {
-    assets/skins/sam/skin
-    base/base
-    button/assets/skins/sam/button
-    container/assets/container
-    datatable/assets/skins/sam/datatable
-    fonts/fonts-min
-    grids/grids
-    menu/assets/skins/sam/menu
-    reset/reset
-    reset-fonts-grids/reset-fonts-grids
-    treeview/assets/skins/sam/treeview
+  assets/skins/sam/skin
+  base/base
+  button/assets/skins/sam/button
+  container/assets/container
+  datatable/assets/skins/sam/datatable
+  fonts/fonts-min
+  grids/grids
+  menu/assets/skins/sam/menu
+  reset/reset
+  reset-fonts-grids/reset-fonts-grids
+  treeview/assets/skins/sam/treeview
 }
 
 #
 # Not all yui 2 files are available minified, so we have to specify
 # manually, where we can get it
 #
 set YUI_JS_PATHS {
-    animation/animation-min
-    autocomplete/autocomplete-min
-    button/button-min
-    connection/connection-min
-    container/container-min
-    datasource/datasource-min
-    datatable/datatable-min
-    menu/menu-min
-    selector/selector-min
-    treeview/treeview-min
-    utilities/utilities
-    yahoo-dom-event/yahoo-dom-event
+  animation/animation-min
+  autocomplete/autocomplete-min
+  button/button-min
+  connection/connection-min
+  container/container-min
+  datasource/datasource-min
+  datatable/datatable-min
+  event/event-min
+  menu/menu-min
+  selector/selector-min
+  treeview/treeview-min
+  utilities/utilities
+  yahoo-dom-event/yahoo-dom-event
+  yahoo/yahoo-min
 }
 
-
 #
 # The following asset files is up to my knowledge not available via CDN
 #
@@ -49,33 +50,43 @@
     -urn      urn:ad:css:yui2:treeview/assets/menu/tree \
     -resource /resources/ajaxhelper/yui/treeview/assets/menu/tree.css
 
-if {[file isdirectory $::acs::rootdir/packages/ajaxhelper/www/resources]} {
+if {[ad_file isdirectory $::acs::rootdir/packages/ajaxhelper/www/resources]} {
 
-    foreach path $YUI_CSS_PATHS {
-        template::register_urn \
-            -urn      urn:ad:css:yui2:$path \
-            -resource /resources/ajaxhelper/yui/$path.css
-    }
+  #
+  # In case, we have yui-2.9.0 then use it, otherwise stick to the old
+  # version.
+  #
+  if {[ad_file isdirectory $::acs::rootdir/packages/ajaxhelper/www/resources/yui-2.9.0]} {
+    set version yui-2.9.0
+  } else {
+    set version yui
+  }
 
-    foreach path $YUI_JS_PATHS {
-        template::register_urn \
-            -urn      urn:ad:js:yui2:$path \
-            -resource /resources/ajaxhelper/yui/$path.js
-    }
+  foreach path $YUI_CSS_PATHS {
+    template::register_urn \
+        -urn      urn:ad:css:yui2:$path \
+        -resource /resources/ajaxhelper/$version/$path.css
+  }
 
+  foreach path $YUI_JS_PATHS {
+    template::register_urn \
+        -urn      urn:ad:js:yui2:$path \
+        -resource /resources/ajaxhelper/$version/$path.js
+  }
+
 } else {
-    set version 2.7.0
-    foreach path $YUI_CSS_PATHS {
-        template::register_urn \
-            -urn      urn:ad:css:yui2:$path \
-            -resource //yui.yahooapis.com/$version/build/$path.css
-    }
+  set version 2.9.0
+  foreach path $YUI_CSS_PATHS {
+    template::register_urn \
+        -urn      urn:ad:css:yui2:$path \
+        -resource //cdnjs.com/libraries/yui/$version/$path.css
+  }
 
-    foreach path $YUI_JS_PATHS {
-        template::register_urn \
-            -urn      urn:ad:js:yui2:$path \
-            -resource //yui.yahooapis.com/$version/build/$path.js
-    }
+  foreach path $YUI_JS_PATHS {
+    template::register_urn \
+        -urn      urn:ad:js:yui2:$path \
+        -resource //cdnjs.com/libraries/yui/$version/$path.js
+  }
 }
 
 #