[Fmsystem-commits] [6604] property: update yui handler

[Sigurd Nes]

Revision: 6604
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6604
Author:   sigurdne
Date:     2010-11-16 21:19:19 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
property: update yui handler

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.yui.inc.php

Modified: trunk/phpgwapi/inc/class.yui.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.yui.inc.php        2010-11-16 21:18:12 UTC (rev 
6603)
+++ trunk/phpgwapi/inc/class.yui.inc.php        2010-11-16 21:19:19 UTC (rev 
6604)
@@ -173,10 +173,16 @@
                        }
 
                        $ok = true;
-                       $GLOBALS['phpgw']->js->validate_file('yahoo', 
'yahoo-dom-event');
+                       $GLOBALS['phpgw']->js->validate_file('yahoo', 
'yahoo-dom-event/yahoo-dom-event');
                        foreach ( $load as $script )
                        {
-                               $test = 
$GLOBALS['phpgw']->js->validate_file('yahoo', "{$script}");
+                               $script_part = explode('-',$script);
+                               $test = 
$GLOBALS['phpgw']->js->validate_file('yahoo', "{$script_part[0]}/{$script}");
+                               if ( !$test )
+                               {
+                                       $script_part = explode('_',$script);
+                                       $test = 
$GLOBALS['phpgw']->js->validate_file('yahoo', "{$script_part[0]}/{$script}");
+                               }
                                if ( !$test || !$ok )
                                {
                                        $err = "Unable to load YUI script '%1' 
when attempting to load widget: '%2'";