Author: ehillenius
Date: Tue Aug  7 17:17:10 2007
New Revision: 563709

URL: http://svn.apache.org/viewvc?view=rev&rev=563709
Log:
WICKET-811

Added:
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar.js
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/dom/dom.js
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/event/event.js
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo.js
Removed:
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/calendar-min.js
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/dom/dom-min.js
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/event/event-min.js
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/yahoo/yahoo-min.js
Modified:
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js

Modified: 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java?view=diff&rev=563709&r1=563708&r2=563709
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
 Tue Aug  7 17:17:10 2007
@@ -41,7 +41,7 @@
        public static void load(IHeaderResponse response)
        {
                response.renderJavascriptReference(new 
JavascriptResourceReference(YuiLib.class,
-                               "yahoo/yahoo-min.js"));
+                               "yahoo/yahoo.js"));
                response.renderJavascriptReference(new 
JavascriptResourceReference(YuiLib.class,
                                "yuiloader-beta.js"));
        }

Modified: 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js?view=diff&rev=563709&r1=563708&r2=563709
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
 Tue Aug  7 17:17:10 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-loader = new YAHOO.util.YUILoader({base: "${basePath}"});
+ if (typeof wicketYuiLoader == 'undefined')    wicketYuiLoader = new 
YAHOO.util.YUILoader({base: "${basePath}", filter: "RAW"});
 
 function checkWicketDate(name, loaderCallback) {
-       if (typeof(Wicket) != 'undefined') {
+       if (typeof(Wicket) != 'undefined' && typeof(Wicket.DateTime) != 
'undefined') {
                loaderCallback();
        } else {
                setTimeout(function() {
@@ -26,21 +26,35 @@
        }
 };
 
-loader.addModule({
+wicketYuiLoader.addModule({
        name: "wicket-date",
        type: "js",
        fullpath: "${pathToWicketDate}",
        verifier: checkWicketDate,
        requires: ['calendar']
 });    
-loader.require("wicket-date"); 
-loader.insert(init${widgetId}DpJs);    
+
+
+function check${widgetId}Loader() {
+       if (!wicketYuiLoader.initializing) {
+               wicketYuiLoader.initializing = true;    
+               wicketYuiLoader.require("wicket-date");
+               wicketYuiLoader.insert(function() {
+                       wicketYuiLoader.initializing = false;
+                       init${widgetId}DpJs();
+               });
+       }  else {
+               setTimeout(check${widgetId}Loader, 50);
+       }
+ }
+
+check${widgetId}Loader();      
  
 function init${widgetId}DpJs() {
 
        YAHOO.namespace("wicket");
        YAHOO.wicket.${widgetId}DpJs = new 
YAHOO.widget.Calendar("${widgetId}DpJs","${widgetId}Dp", { ${calendarInit} });
-       YAHOO.wicket.${widgetId}DpJs.isVisible = function() { return 
YAHOO.wicket.${widgetId}DpJs.oDomContainer.style.display == 'block'; } 
+       YAHOO.wicket.${widgetId}DpJs.isVisible = function() { return 
YAHOO.wicket.${widgetId}DpJs.oDomContainer.style.display == 'block'; }
        
        function showCalendar() {
                Wicket.DateTime.showCalendar(YAHOO.wicket.${widgetId}DpJs, 
YAHOO.util.Dom.get("${componentId}").value, '${datePattern}');


Reply via email to