svn commit: r1432577 [1/13] - in /ofbiz/trunk: ./ framework/common/script/org/of
Locked
svn commit: r1432577 [1/13] - in /ofbiz/trunk: ./ framework/common/script/org/of
 
|
Author: jleroux
Date: Sun Jan 13 10:22:09 2013 New Revision: 1432577 URL: http://svn.apache.org/viewvc?rev=1432577&view=rev Log: I discovered while using trunk demo that getServerTimestampAsLong is not enough. Because Javascript always creates the dates without taking into account the TimeZone. I mean there are OOTB no ways to do otherwise and date.format.js does not help. This makes sense from a HTTP client perspective, but nowadays it's really aging with Ajax, etc. Fortunately there is a miraculous script which helps much: date.timezone.js. I have introduced it with a getServerTimeZone service. I tested locally by setting another timezone on another machine and it worked. I will now test it on trunk, I don't expect any issues I also cleaned the NOTICE for famfamfam Added: ofbiz/trunk/framework/images/webapp/images/date/ ofbiz/trunk/framework/images/webapp/images/date/date.format-1.2.3 - copied unchanged from r1432399, ofbiz/trunk/framework/images/webapp/images/date.format-1.2.3 ofbiz/trunk/framework/images/webapp/images/date/date.format-1.2.3-min.js - copied unchanged from r1432399, ofbiz/trunk/framework/images/webapp/images/date.format-1.2.3-min.js ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js (with props) ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js (with props) ofbiz/trunk/framework/images/webapp/images/date/timezones/ ofbiz/trunk/framework/images/webapp/images/date/timezones/Makefile (with props) ofbiz/trunk/framework/images/webapp/images/date/timezones/africa ofbiz/trunk/framework/images/webapp/images/date/timezones/antarctica ofbiz/trunk/framework/images/webapp/images/date/timezones/asia ofbiz/trunk/framework/images/webapp/images/date/timezones/australasia ofbiz/trunk/framework/images/webapp/images/date/timezones/backward ofbiz/trunk/framework/images/webapp/images/date/timezones/etcetera ofbiz/trunk/framework/images/webapp/images/date/timezones/europe ofbiz/trunk/framework/images/webapp/images/date/timezones/factory ofbiz/trunk/framework/images/webapp/images/date/timezones/iso3166.tab ofbiz/trunk/framework/images/webapp/images/date/timezones/leapseconds ofbiz/trunk/framework/images/webapp/images/date/timezones/min/ ofbiz/trunk/framework/images/webapp/images/date/timezones/min/Makefile (with props) ofbiz/trunk/framework/images/webapp/images/date/timezones/min/africa ofbiz/trunk/framework/images/webapp/images/date/timezones/min/antarctica ofbiz/trunk/framework/images/webapp/images/date/timezones/min/asia ofbiz/trunk/framework/images/webapp/images/date/timezones/min/australasia ofbiz/trunk/framework/images/webapp/images/date/timezones/min/backward ofbiz/trunk/framework/images/webapp/images/date/timezones/min/etcetera ofbiz/trunk/framework/images/webapp/images/date/timezones/min/europe ofbiz/trunk/framework/images/webapp/images/date/timezones/min/factory ofbiz/trunk/framework/images/webapp/images/date/timezones/min/iso3166.tab ofbiz/trunk/framework/images/webapp/images/date/timezones/min/leapseconds ofbiz/trunk/framework/images/webapp/images/date/timezones/min/northamerica ofbiz/trunk/framework/images/webapp/images/date/timezones/min/pacificnew ofbiz/trunk/framework/images/webapp/images/date/timezones/min/solar87 ofbiz/trunk/framework/images/webapp/images/date/timezones/min/solar88 ofbiz/trunk/framework/images/webapp/images/date/timezones/min/solar89 ofbiz/trunk/framework/images/webapp/images/date/timezones/min/southamerica ofbiz/trunk/framework/images/webapp/images/date/timezones/min/systemv ofbiz/trunk/framework/images/webapp/images/date/timezones/min/yearistype.sh (with props) ofbiz/trunk/framework/images/webapp/images/date/timezones/min/zone.tab ofbiz/trunk/framework/images/webapp/images/date/timezones/northamerica ofbiz/trunk/framework/images/webapp/images/date/timezones/pacificnew ofbiz/trunk/framework/images/webapp/images/date/timezones/solar87 ofbiz/trunk/framework/images/webapp/images/date/timezones/solar88 ofbiz/trunk/framework/images/webapp/images/date/timezones/solar89 ofbiz/trunk/framework/images/webapp/images/date/timezones/southamerica ofbiz/trunk/framework/images/webapp/images/date/timezones/strip_olson_comments.rb ofbiz/trunk/framework/images/webapp/images/date/timezones/strip_olson_comments_ofbiz.rb ofbiz/trunk/framework/images/webapp/images/date/timezones/systemv ofbiz/trunk/framework/images/webapp/images/date/timezones/yearistype.sh (with props) ofbiz/trunk/framework/images/webapp/images/date/timezones/zone.tab Removed: ofbiz/trunk/framework/images/webapp/images/date.format-1.2.3 ofbiz/trunk/framework/images/webapp/images/date.format-1.2.3-min.js Modified: ofbiz/trunk/LICENSE ofbiz/trunk/NOTICE ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml ofbiz/trunk/framework/common/servicedef/services.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/trunk/framework/common/webcommon/includes/ServerHour24HourFormatJs.ftl ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/images/webapp/images/miscAjaxFunctions.js Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1432577&r1=1432576&r2=1432577&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Sun Jan 13 10:22:09 2013 @@ -125,6 +125,7 @@ ofbiz/trunk/applications/product/lib/doz ofbiz/trunk/applications/product/lib/watermarker-0.0.4.jar ofbiz/trunk/applications/content/template/docbook/extensions/webhelpindexer.jar ofbiz/trunk/specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar +ofbiz/trunk/framework/images/webapp/images/date/timezones* ========================================================================= Apache License Version 2.0, January 2004 @@ -1235,7 +1236,7 @@ ofbiz/trunk/framework/images/webapp/imag ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js ofbiz/trunk/applications/content/template/docbook/webhelp/* -ofbiz/trunk/framework/images/webapp/images/date.format-1.2.3.js +ofbiz/trunk/framework/images/webapp/images/date/date.format-1.2.3*.js ========================================================================= The MIT License @@ -2802,10 +2803,9 @@ OF SUCH DAMAGES. Web-based Help from DocBook XML license David Cramer <dcramer AT motive DOT com><david AT thingbag DOT net> Kasun Gajasinghe <kasunbg AT gmail DOT com> -Copyright © 2008-2010 Kasun Gajasinghe, David Cramer Permission is hereby granted, free of charge, to any person obtaining a copy of this software -and associated documentation files (the Software), to deal in the Software without restriction, +and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: Modified: ofbiz/trunk/NOTICE URL: http://svn.apache.org/viewvc/ofbiz/trunk/NOTICE?rev=1432577&r1=1432576&r2=1432577&view=diff ============================================================================== --- ofbiz/trunk/NOTICE (original) +++ ofbiz/trunk/NOTICE Sun Jan 13 10:22:09 2013 @@ -350,8 +350,8 @@ Extreme! Lab (http://www.extreme.indiana == jline Notice == ========================================================================= -This product includes software developed by Marc Prud'hommeaux -<[hidden email]> +This product includes software developed by Marc Prud'hommeaux +<[hidden email]> ========================================================================= == FamFamFam Notice == ========================================================================= @@ -359,31 +359,42 @@ This product includes software developed This product includes images delevoped by Mark James <[hidden email]> Birmingham, UK. www.famfamfam.com -Creative Commons Attribution 2.5 License. +Creative Commons Attribution 2.5 License Generic. http://creativecommons.org/licenses/by/2.5/ You are free: - * to Share ââ¬â to copy, distribute and transmit the work - * to Remix ââ¬â to adapt the work + * to Share â to copy, distribute and transmit the work + * to Remix â to adapt the work + * to make commercial use of the work Under the following conditions: - * Attribution. You must attribute the work in the manner specified - by the author or licensor (but not in any way that suggests that - they endorse you or your use of the work). - * For any reuse or distribution, you must make clear to - others the license terms of this work. The best way to do - this is with a link to this web page. - * Any of the above conditions can be waived if you get - * For any reuse or distribution, you must make clear to + * Attribution â You must attribute the work in the manner specified + by the author or licensor (but not in any way that suggests that + they endorse you or your use of the work). + * Waiver â Any of the above conditions can be waived if you get permission from the copyright holder. - * Nothing in this license impairs or restricts the - * For any reuse or distribution, you must make clear to - author's moral rights. + * Public Domain â Where the work or any of its elements is in the + public domain under applicable law, that status is in no way + affected by the license. + * Other Rights â In no way are any of the following rights affected + by the license: + * Your fair dealing or fair use rights, or other applicable copyright + exceptions and limitations; + * The author's moral rights; + * Rights other persons may have either in the work itself or in how + the work is used, such as publicity or privacy rights. + * Notice â For any reuse or distribution, you must make clear to others + the license terms of this work. The best way to do this is with a link to + this web page. ========================================================================= This product includes software developed by Steven Levithan (http://blog.stevenlevithan.com/archives/date-time-format). MIT license ========================================================================= - \ No newline at end of file + +This product includes software developed by Matthew Eernisse ([hidden email]) +and Open Source Applications Foundation. Licensed under the ASL2 +https://github.com/mde/timezone-js +========================================================================= \ No newline at end of file Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1432577&r1=1432576&r2=1432577&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Sun Jan 13 10:22:09 2013 @@ -347,13 +347,19 @@ under the License. <field-to-result field="exist"/> </simple-method> + <simple-method method-name="getServerTimestamp" login-required="false"> + <now field="serverTimestamp" type="java.sql.Timestamp"/> + <field-to-result field="serverTimestamp"/> + </simple-method> + + <simple-method method-name="getServerTimeZone" login-required="false"> + <set field="serverTimeZone" value="${util:defaultTimeZone()}" type="String"/> + <field-to-result field="serverTimeZone"/> + </simple-method> + <simple-method method-name="getServerTimestampAsLong" login-required="false"> <now field="serverTimestamp" type="java.lang.Long"/> <field-to-result field="serverTimestamp"/> </simple-method> - <simple-method method-name="getServerTimestamp" login-required="false"> - <now field="serverTimestamp" type="java.sql.Timestamp"/> - <field-to-result field="serverTimestamp"/> - </simple-method> </simple-methods> Modified: ofbiz/trunk/framework/common/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=1432577&r1=1432576&r2=1432577&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services.xml Sun Jan 13 10:22:09 2013 @@ -781,16 +781,21 @@ under the License. <attribute name="geoList" mode="OUT" type="java.util.List"/> </service> - <service name="getServerTimestampAsLong" engine="simple" auth="false" - location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimestampAsLong"> - <attribute name="serverTimestamp" mode="OUT" type="Long"/> - </service> - <service name="getServerTimestamp" engine="simple" auth="false" location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimestamp"> <attribute name="serverTimestamp" mode="OUT" type="TimeStamp"/> </service> + <service name="getServerTimeZone" engine="simple" auth="false" + location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimeZone"> + <attribute name="serverTimeZone" mode="OUT" type="String"/> + </service> + + <service name="getServerTimestampAsLong" engine="simple" auth="false" + location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getServerTimestampAsLong"> + <attribute name="serverTimestamp" mode="OUT" type="Long"/> + </service> + <service name="createJsLanguageFileMapping" engine="java" auth="false" use-transaction="false" location="org.ofbiz.common.JsLanguageFileMappingCreator" invoke="createJsLanguageFileMapping"> <description>Create or update the JsLanguageFilesMapping.java. You still need to compile thereafter</description> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1432577&r1=1432576&r2=1432577&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Sun Jan 13 10:22:09 2013 @@ -253,16 +253,23 @@ under the License. <response name="error" type="request" value="json"/> </request-map> - <request-map uri="getServerTimestampAsLong"> + <request-map uri="getServerTimestamp"> <security https="true" auth="true"/> - <event type="service" invoke="getServerTimestampAsLong"/> + <event type="service" invoke="getServerTimestamp"/> <response name="success" type="request" value="json"/> <response name="error" type="request" value="json"/> </request-map> - <request-map uri="getServerTimestamp"> + <request-map uri="getServerTimeZone"> <security https="true" auth="true"/> - <event type="service" invoke="getServerTimestamp"/> + <event type="service" invoke="getServerTimeZone"/> + <response name="success" type="request" value="json"/> + <response name="error" type="request" value="json"/> + </request-map> + + <request-map uri="getServerTimestampAsLong"> + <security https="true" auth="true"/> + <event type="service" invoke="getServerTimestampAsLong"/> <response name="success" type="request" value="json"/> <response name="error" type="request" value="json"/> </request-map> Modified: ofbiz/trunk/framework/common/webcommon/includes/ServerHour24HourFormatJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/ServerHour24HourFormatJs.ftl?rev=1432577&r1=1432576&r2=1432577&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/ServerHour24HourFormatJs.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/ServerHour24HourFormatJs.ftl Sun Jan 13 10:22:09 2013 @@ -20,15 +20,19 @@ under the License. jQuery(document).ready(function() { window.setInterval(function(){clock()}, 1000); var serverTimestamp = 0; - var date + var date; function clock() { if (jQuery("#${clockField}").text() === "${uiLabelMap.CommonServerHour}:") { - serverTimestamp = getServerTimestamp("getServerTimestampAsLong"); - date = new Date(serverTimestamp); + serverTimestamp = getServiceResult("getServerTimestampAsLong")['serverTimestamp']; + serverTimeZone = getServiceResult("getServerTimeZone")['serverTimeZone'];; + initTimeZone(); + date = new timezoneJS.Date(serverTimestamp, serverTimeZone); } else { date.setSeconds(date.getSeconds() + 1); } - jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " + dateFormat(date, "yyyy-mm-dd HH:MM:ss")); + // dateFormat does not respect the timezone :/ Fortunately toString is what we want :) + //jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " + dateFormat(date, "yyyy-mm-dd HH:MM:ss")); + jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " + date.toString()); } }) </script> \ No newline at end of file Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1432577&r1=1432576&r2=1432577&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Jan 13 10:22:09 2013 @@ -154,9 +154,10 @@ under the License. <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true" /> - <set field="layoutSettings.javaScripts[]" value="/images/date.format-1.2.3-min.js" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/GooglemapMarkers.js" global="true" /> + <set field="layoutSettings.javaScripts[]" value="/images/date/date.format-1.2.3-min.js" global="true" /> + <set field="layoutSettings.javaScripts[]" value="/images/date/timezones/date.timezone-min.js" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/miscAjaxFunctions.js" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/selectMultipleRelatedValues.js" global="true" /> <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" global="true" /> Added: ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js?rev=1432577&view=auto ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js (added) +++ ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js Sun Jan 13 10:22:09 2013 @@ -0,0 +1 @@ +(function(){var root=this;var timezoneJS;if(typeof exports!=="undefined"){timezoneJS=exports}else{timezoneJS=root.timezoneJS={}}timezoneJS.VERSION="1.0.0";var $=root.$||root.jQuery||root.Zepto,fleegix=root.fleegix,DAYS=timezoneJS.Days=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],MONTHS=timezoneJS.Months=["January","February","March","April","May","June","July","August","September","October","November","December"],SHORT_MONTHS={},SHORT_DAYS={},EXACT_DATE_TIME={},TZ_REGEXP=new RegExp("^[a-zA-Z]+/");for(var i=0;i<MONTHS.length;i++){SHORT_MONTHS[MONTHS[i].substr(0,3)]=i}for(i=0;i<DAYS.length;i++){SHORT_DAYS[DAYS[i].substr(0,3)]=i}if(!Array.prototype.indexOf){Array.prototype.indexOf=function(el){for(var i=0;i<this.length;i++){if(el===this[i]){return i}}return -1}}var _fixWidth=function(number,digits){if(typeof number!=="number"){throw"not a number: "+number}var s=number.toString();if(number.length>digits){return number.substr(number.length-digits,numbe r.length)}while(s.length<digits){s="0"+s}return s};var _transport=function(opts){if((!fleegix||typeof fleegix.xhr==="undefined")&&(!$||typeof $.ajax==="undefined")){throw new Error("Please use the Fleegix.js XHR module, jQuery ajax, Zepto ajax, or define your own transport mechanism for downloading zone files.")}if(!opts){return}if(!opts.url){throw new Error("URL must be specified")}if(!("async" in opts)){opts.async=true}if(!opts.async){return fleegix&&fleegix.xhr?fleegix.xhr.doReq({url:opts.url,async:false}):$.ajax({url:opts.url,async:false}).responseText}return fleegix&&fleegix.xhr?fleegix.xhr.send({url:opts.url,method:"get",handleSuccess:opts.success,handleErr:opts.error}):$.ajax({url:opts.url,dataType:"text",method:"GET",error:opts.error,success:opts.success})};timezoneJS.Date=function(){var args=Array.prototype.slice.apply(arguments),dt=null,tz=null,arr=[];if(Object.prototype.toString.call(args[0])==="[object Array]"){args=args[0]}if(typeof args[args.length-1]==="string "&&TZ_REGEXP.test(args[args.length-1])){tz=args.pop()}switch(args.length){case 0:dt=new Date();break;case 1:dt=new Date(args[0]);break;default:for(var i=0;i<7;i++){arr[i]=args[i]||0}dt=new Date(arr[0],arr[1],arr[2],arr[3],arr[4],arr[5],arr[6]);break}this._useCache=false;this._tzInfo={};this._day=0;this.year=0;this.month=0;this.date=0;this.hours=0;this.minutes=0;this.seconds=0;this.milliseconds=0;this.timezone=tz||null;if(arr.length){this.setFromDateObjProxy(dt)}else{this.setFromTimeProxy(dt.getTime(),tz)}};timezoneJS.Date.prototype={getDate:function(){return this.date},getDay:function(){return this._day},getFullYear:function(){return this.year},getMonth:function(){return this.month},getYear:function(){return this.year},getHours:function(){return this.hours},getMilliseconds:function(){return this.milliseconds},getMinutes:function(){return this.minutes},getSeconds:function(){return this.seconds},getUTCDate:function(){return this.getUTCDateProxy().getUTCDate()},getUTCDay:functi on(){return this.getUTCDateProxy().getUTCDay()},getUTCFullYear:function(){return this.getUTCDateProxy().getUTCFullYear()},getUTCHours:function(){return this.getUTCDateProxy().getUTCHours()},getUTCMilliseconds:function(){return this.getUTCDateProxy().getUTCMilliseconds()},getUTCMinutes:function(){return this.getUTCDateProxy().getUTCMinutes()},getUTCMonth:function(){return this.getUTCDateProxy().getUTCMonth()},getUTCSeconds:function(){return this.getUTCDateProxy().getUTCSeconds()},getTime:function(){return this._timeProxy+(this.getTimezoneOffset()*60*1000)},getTimezone:function(){return this.timezone},getTimezoneOffset:function(){return this.getTimezoneInfo().tzOffset},getTimezoneAbbreviation:function(){return this.getTimezoneInfo().tzAbbr},getTimezoneInfo:function(){if(this._useCache){return this._tzInfo}var res;if(this.timezone){res=this.timezone==="Etc/UTC"||this.timezone==="Etc/GMT"?{tzOffset:0,tzAbbr:"UTC"}:timezoneJS.timezone.getTzInfo(this._timeProxy,this.timezone)}else {res={tzOffset:this.getLocalOffset(),tzAbbr:null}}this._tzInfo=res;this._useCache=true;return res},getUTCDateProxy:function(){var dt=new Date(this._timeProxy);dt.setUTCMinutes(dt.getUTCMinutes()+this.getTimezoneOffset());return dt},setDate:function(n){this.setAttribute("date",n)},setFullYear:function(year,month,date){if(date!==undefined){this.setAttribute("date",1)}this.setAttribute("year",year);if(month!==undefined){this.setAttribute("month",month)}if(date!==undefined){this.setAttribute("date",date)}},setMonth:function(n){this.setAttribute("month",n)},setYear:function(n){this.setUTCAttribute("year",n)},setHours:function(hours,minutes,seconds,milliseconds){this.setAttribute("hours",hours);if(minutes){this.setAttribute("minutes",minutes)}if(seconds){this.setAttribute("seconds",seconds)}if(milliseconds){this.setAttribute("milliseconds",milliseconds)}},setMilliseconds:function(n){this.setAttribute("milliseconds",n)},setMinutes:function(n){this.setAttribute("minutes",n)},setSeco nds:function(n){this.setAttribute("seconds",n)},setTime:function(n){if(isNaN(n)){throw new Error("Units must be a number.")}this.setFromTimeProxy(n,this.timezone)},setUTCDate:function(n){this.setUTCAttribute("date",n)},setUTCFullYear:function(year,month,date){if(date!==undefined){this.setUTCAttribute("date",1)}this.setUTCAttribute("year",year);if(month!==undefined){this.setUTCAttribute("month",month)}if(date!==undefined){this.setUTCAttribute("date",date)}},setUTCHours:function(hours,minutes,seconds,milliseconds){this.setUTCAttribute("hours",hours);if(minutes){this.setUTCAttribute("minutes",minutes)}if(seconds){this.setUTCAttribute("seconds",seconds)}if(milliseconds){this.setUTCAttribute("milliseconds",milliseconds)}},setUTCMilliseconds:function(n){this.setUTCAttribute("milliseconds",n)},setUTCMinutes:function(n){this.setUTCAttribute("minutes",n)},setUTCMonth:function(n){this.setUTCAttribute("month",n)},setUTCSeconds:function(n){this.setUTCAttribute("seconds",n)},setFromDateO bjProxy:function(dt){this.year=dt.getFullYear();this.month=dt.getMonth();this.date=dt.getDate();this.hours=dt.getHours();this.minutes=dt.getMinutes();this.seconds=dt.getSeconds();this.milliseconds=dt.getMilliseconds();this._day=dt.getDay();this._dateProxy=dt;this._timeProxy=Date.UTC(this.year,this.month,this.date,this.hours,this.minutes,this.seconds,this.milliseconds);this._useCache=false},setFromTimeProxy:function(utcMillis,tz){var dt=new Date(utcMillis);var tzOffset;tzOffset=tz?timezoneJS.timezone.getTzInfo(dt,tz).tzOffset:dt.getTimezoneOffset();dt.setTime(utcMillis+(dt.getTimezoneOffset()-tzOffset)*60000);this.setFromDateObjProxy(dt)},setAttribute:function(unit,n){if(isNaN(n)){throw new Error("Units must be a number.")}var dt=this._dateProxy;var meth=unit==="year"?"FullYear":unit.substr(0,1).toUpperCase()+unit.substr(1);dt["set"+meth](n);this.setFromDateObjProxy(dt)},setUTCAttribute:function(unit,n){if(isNaN(n)){throw new Error("Units must be a number.")}var meth=unit===" year"?"FullYear":unit.substr(0,1).toUpperCase()+unit.substr(1);var dt=this.getUTCDateProxy();dt["setUTC"+meth](n);dt.setUTCMinutes(dt.getUTCMinutes()-this.getTimezoneOffset());this.setFromTimeProxy(dt.getTime()+this.getTimezoneOffset()*60000,this.timezone)},setTimezone:function(tz){var previousOffset=this.getTimezoneInfo().tzOffset;this.timezone=tz;this._useCache=false;this.setUTCMinutes(this.getUTCMinutes()-this.getTimezoneInfo().tzOffset+previousOffset)},removeTimezone:function(){this.timezone=null;this._useCache=false},valueOf:function(){return this.getTime()},clone:function(){return this.timezone?new timezoneJS.Date(this.getTime(),this.timezone):new timezoneJS.Date(this.getTime())},toGMTString:function(){return this.toString("EEE, dd MMM yyyy HH:mm:ss Z","Etc/GMT")},toLocaleString:function(){},toLocaleDateString:function(){},toLocaleTimeString:function(){},toSource:function(){},toISOString:function(){return this.toString("yyyy-MM-ddTHH:mm:ss.SSS","Etc/UTC")+"Z"},toJSON:f unction(){return this.toISOString()},toString:function(format,tz){if(!format){format="yyyy-MM-dd HH:mm:ss"}var result=format;var tzInfo=tz?timezoneJS.timezone.getTzInfo(this.getTime(),tz):this.getTimezoneInfo();var _this=this;if(tz){_this=this.clone();_this.setTimezone(tz)}var hours=_this.getHours();return result.replace(/a+/g,function(){return"k"}).replace(/y+/g,function(token){return _fixWidth(_this.getFullYear(),token.length)}).replace(/d+/g,function(token){return _fixWidth(_this.getDate(),token.length)}).replace(/m+/g,function(token){return _fixWidth(_this.getMinutes(),token.length)}).replace(/s+/g,function(token){return _fixWidth(_this.getSeconds(),token.length)}).replace(/S+/g,function(token){return _fixWidth(_this.getMilliseconds(),token.length)}).replace(/M+/g,function(token){var _month=_this.getMonth(),_len=token.length;if(_len>3){return timezoneJS.Months[_month]}else{if(_len>2){return timezoneJS.Months[_month].substring(0,_len)}}return _fixWidth(_month+1,_len)}).re place(/k+/g,function(){if(hours>=12){if(hours>12){hours-=12}return"PM"}return"AM"}).replace(/H+/g,function(token){return _fixWidth(hours,token.length)}).replace(/E+/g,function(token){return DAYS[_this.getDay()].substring(0,token.length)}).replace(/Z+/gi,function(){return tzInfo.tzAbbr})},toUTCString:function(){return this.toGMTString()},civilToJulianDayNumber:function(y,m,d){var a;m++;if(m>12){a=parseInt(m/12,10);m=m%12;y+=a}if(m<=2){y-=1;m+=12}a=Math.floor(y/100);var b=2-a+Math.floor(a/4),jDt=Math.floor(365.25*(y+4716))+Math.floor(30.6001*(m+1))+d+b-1524;return jDt},getLocalOffset:function(){return this._dateProxy.getTimezoneOffset()}};timezoneJS.timezone=new function(){var _this=this,regionMap={Etc:"etcetera",EST:"northamerica",MST:"northamerica",HST:"northamerica",EST5EDT:"northamerica",CST6CDT:"northamerica",MST7MDT:"northamerica",PST8PDT:"northamerica",America:"northamerica",Pacific:"australasia",Atlantic:"europe",Africa:"africa",Indian:"africa",Antarctica:"antarctica", Asia:"asia",Australia:"australasia",Europe:"europe",WET:"europe",CET:"europe",MET:"europe",EET:"europe"},regionExceptions={"Pacific/Honolulu":"northamerica","Atlantic/Bermuda":"northamerica","Atlantic/Cape_Verde":"africa","Atlantic/St_Helena":"africa","Indian/Kerguelen":"antarctica","Indian/Chagos":"asia","Indian/Maldives":"asia","Indian/Christmas":"australasia","Indian/Cocos":"australasia","America/Danmarkshavn":"europe","America/Scoresbysund":"europe","America/Godthab":"europe","America/Thule":"europe","Asia/Yekaterinburg":"europe","Asia/Omsk":"europe","Asia/Novosibirsk":"europe","Asia/Krasnoyarsk":"europe","Asia/Irkutsk":"europe","Asia/Yakutsk":"europe","Asia/Vladivostok":"europe","Asia/Sakhalin":"europe","Asia/Magadan":"europe","Asia/Kamchatka":"europe","Asia/Anadyr":"europe","Africa/Ceuta":"europe","America/Argentina/Buenos_Aires":"southamerica","America/Argentina/Cordoba":"southamerica","America/Argentina/Tucuman":"southamerica","America/Argentina/La_Rioja":"southameri ca","America/Argentina/San_Juan":"southamerica","America/Argentina/Jujuy":"southamerica","America/Argentina/Catamarca":"southamerica","America/Argentina/Mendoza":"southamerica","America/Argentina/Rio_Gallegos":"southamerica","America/Argentina/Ushuaia":"southamerica","America/Aruba":"southamerica","America/La_Paz":"southamerica","America/Noronha":"southamerica","America/Belem":"southamerica","America/Fortaleza":"southamerica","America/Recife":"southamerica","America/Araguaina":"southamerica","America/Maceio":"southamerica","America/Bahia":"southamerica","America/Sao_Paulo":"southamerica","America/Campo_Grande":"southamerica","America/Cuiaba":"southamerica","America/Porto_Velho":"southamerica","America/Boa_Vista":"southamerica","America/Manaus":"southamerica","America/Eirunepe":"southamerica","America/Rio_Branco":"southamerica","America/Santiago":"southamerica","Pacific/Easter":"southamerica","America/Bogota":"southamerica","America/Curacao":"southamerica","America/Guayaquil" :"southamerica","Pacific/Galapagos":"southamerica","Atlantic/Stanley":"southamerica","America/Cayenne":"southamerica","America/Guyana":"southamerica","America/Asuncion":"southamerica","America/Lima":"southamerica","Atlantic/South_Georgia":"southamerica","America/Paramaribo":"southamerica","America/Port_of_Spain":"southamerica","America/Montevideo":"southamerica","America/Caracas":"southamerica"};function invalidTZError(t){throw new Error('Timezone "'+t+'" is either incorrect, or not loaded in the timezone registry.')}function builtInLoadZoneFile(fileName,opts){var url=_this.zoneFileBasePath+"/"+fileName;return !opts||!opts.async?_this.parseZones(_this.transport({url:url,async:false})):_this.transport({async:true,url:url,success:function(str){if(_this.parseZones(str)&&typeof opts.callback==="function"){opts.callback()}return true},error:function(){throw new Error('Error retrieving "'+url+'" zoneinfo files')}})}function getRegionForTimezone(tz){var exc=regionExceptions[tz],reg ,ret;if(exc){return exc}reg=tz.split("/")[0];ret=regionMap[reg];if(ret){return ret}var link=_this.zones[tz];if(typeof link==="string"){return getRegionForTimezone(link)}if(!_this.loadedZones.backward){_this.loadZoneFile("backward");return getRegionForTimezone(tz)}invalidTZError(tz)}function parseTimeString(str){var pat=/(\d+)(?::0*(\d*))?(?::0*(\d*))?([wsugz])?$/;var hms=str.match(pat);hms[1]=parseInt(hms[1],10);hms[2]=hms[2]?parseInt(hms[2],10):0;hms[3]=hms[3]?parseInt(hms[3],10):0;return hms}function processZone(z){if(!z[3]){return}var yea=parseInt(z[3],10);var mon=11;var dat=31;if(z[4]){mon=SHORT_MONTHS[z[4].substr(0,3)];dat=parseInt(z[5],10)||1}var string=z[6]?z[6]:"00:00:00",t=parseTimeString(string);return[yea,mon,dat,t[1],t[2],t[3]]}function getZone(dt,tz){var utcMillis=typeof dt==="number"?dt:new Date(dt).getTime();var t=tz;var zoneList=_this.zones[t];while(typeof zoneList==="string"){t=zoneList;zoneList=_this.zones[t]}if(!zoneList){if(!_this.loadedZones.backward){_t his.loadZoneFile("backward");return getZone(dt,tz)}invalidTZError(t)}if(zoneList.length===0){throw new Error('No Zone found for "'+tz+'" on '+dt)}for(var i=zoneList.length-1;i>=0;i--){var z=zoneList[i];if(z[3]&&utcMillis>z[3]){break}}return zoneList[i+1]}function getBasicOffset(time){var off=parseTimeString(time),adj=time.indexOf("-")===0?-1:1;off=adj*(((off[1]*60+off[2])*60+off[3])*1000);return off/60/1000}function getRule(dt,zone,isUTC){var date=typeof dt==="number"?new Date(dt):dt;var ruleset=zone[1];var basicOffset=zone[0];var convertDateToUTC=function(date,type,rule){var offset=0;if(type==="u"||type==="g"||type==="z"){offset=0}else{if(type==="s"){offset=basicOffset}else{if(type==="w"||!type){offset=getAdjustedOffset(basicOffset,rule)}else{throw ("unknown type "+type)}}}offset*=60*1000;return new Date(date.getTime()+offset)};var convertRuleToExactDateAndTime=function(yearAndRule,prevRule){var year=yearAndRule[0],rule=yearAndRule[1];var hms=rule[5];var effectiveDate;if(!E XACT_DATE_TIME[year]){EXACT_DATE_TIME[year]={}}if(EXACT_DATE_TIME[year][rule]){effectiveDate=EXACT_DATE_TIME[year][rule]}else{if(!isNaN(rule[4])){effectiveDate=new Date(Date.UTC(year,SHORT_MONTHS[rule[3]],rule[4],hms[1],hms[2],hms[3],0))}else{var targetDay,operator;if(rule[4].substr(0,4)==="last"){effectiveDate=new Date(Date.UTC(year,SHORT_MONTHS[rule[3]]+1,1,hms[1]-24,hms[2],hms[3],0));targetDay=SHORT_DAYS[rule[4].substr(4,3)];operator="<="}else{effectiveDate=new Date(Date.UTC(year,SHORT_MONTHS[rule[3]],rule[4].substr(5),hms[1],hms[2],hms[3],0));targetDay=SHORT_DAYS[rule[4].substr(0,3)];operator=rule[4].substr(3,2)}var ourDay=effectiveDate.getUTCDay();if(operator===">="){effectiveDate.setUTCDate(effectiveDate.getUTCDate()+(targetDay-ourDay+((targetDay<ourDay)?7:0)))}else{effectiveDate.setUTCDate(effectiveDate.getUTCDate()+(targetDay-ourDay-((targetDay>ourDay)?7:0)))}}EXACT_DATE_TIME[year][rule]=effectiveDate}if(prevRule){effectiveDate=convertDateToUTC(effectiveDate,hms[4],p revRule)}return effectiveDate};var findApplicableRules=function(year,ruleset){var applicableRules=[];for(var i=0;ruleset&&i<ruleset.length;i++){if(ruleset[i][0]<=year&&(ruleset[i][1]>=year||(ruleset[i][0]===year&&ruleset[i][1]==="only")||ruleset[i][1]==="max")){applicableRules.push([year,ruleset[i]])}}return applicableRules};var compareDates=function(a,b,prev){var year,rule;if(a.constructor!==Date){year=a[0];rule=a[1];a=(!prev&&EXACT_DATE_TIME[year]&&EXACT_DATE_TIME[year][rule])?EXACT_DATE_TIME[year][rule]:convertRuleToExactDateAndTime(a,prev)}else{if(prev){a=convertDateToUTC(a,isUTC?"u":"w",prev)}}if(b.constructor!==Date){year=b[0];rule=b[1];b=(!prev&&EXACT_DATE_TIME[year]&&EXACT_DATE_TIME[year][rule])?EXACT_DATE_TIME[year][rule]:convertRuleToExactDateAndTime(b,prev)}else{if(prev){b=convertDateToUTC(b,isUTC?"u":"w",prev)}}a=Number(a);b=Number(b);return a-b};var year=date.getUTCFullYear();var applicableRules;applicableRules=findApplicableRules(year,_this.rules[ruleset]);appl icableRules.push(date);applicableRules.sort(compareDates);if(applicableRules.indexOf(date)<2){applicableRules=applicableRules.concat(findApplicableRules(year-1,_this.rules[ruleset]));applicableRules.sort(compareDates)}var pinpoint=applicableRules.indexOf(date);if(pinpoint>1&&compareDates(date,applicableRules[pinpoint-1],applicableRules[pinpoint-2][1])<0){return applicableRules[pinpoint-2][1]}else{if(pinpoint>0&&pinpoint<applicableRules.length-1&&compareDates(date,applicableRules[pinpoint+1],applicableRules[pinpoint-1][1])>0){return applicableRules[pinpoint+1][1]}else{if(pinpoint===0){return null}}}return applicableRules[pinpoint-1][1]}function getAdjustedOffset(off,rule){return -Math.ceil(rule[6]-off)}function getAbbreviation(zone,rule){var res;var base=zone[2];if(base.indexOf("%s")>-1){var repl;if(rule){repl=rule[7]==="-"?"":rule[7]}else{repl="S"}res=base.replace("%s",repl)}else{if(base.indexOf("/")>-1){res=base.split("/",2)[rule[6]?1:0]}else{res=base}}return res}this.zoneF ileBasePath;this.zoneFiles=["africa","antarctica","asia","australasia","backward","etcetera","europe","northamerica","pacificnew","southamerica"];this.loadingSchemes={PRELOAD_ALL:"preloadAll",LAZY_LOAD:"lazyLoad",MANUAL_LOAD:"manualLoad"};this.loadingScheme=this.loadingSchemes.LAZY_LOAD;this.loadedZones={};this.zones={};this.rules={};this.init=function(o){var opts={async:true},def=this.defaultZoneFile=this.loadingScheme===this.loadingSchemes.PRELOAD_ALL?this.zoneFiles:"northamerica",done=0,callbackFn;for(var p in o){opts[p]=o[p]}if(typeof def==="string"){return this.loadZoneFile(def,opts)}callbackFn=opts.callback;opts.callback=function(){done++;(done===def.length)&&typeof callbackFn==="function"&&callbackFn()};for(var i=0;i<def.length;i++){this.loadZoneFile(def[i],opts)}};this.loadZoneFile=function(fileName,opts){if(typeof this.zoneFileBasePath==="undefined"){throw new Error("Please define a base path to your zone file directory -- timezoneJS.timezone.zoneFileBasePath.")}if( this.loadedZones[fileName]){return}this.loadedZones[fileName]=true;return builtInLoadZoneFile(fileName,opts)};this.loadZoneJSONData=function(url,sync){var processData=function(data){data=eval("("+data+")");for(var z in data.zones){_this.zones[z]=data.zones[z]}for(var r in data.rules){_this.rules[r]=data.rules[r]}};return sync?processData(_this.transport({url:url,async:false})):_this.transport({url:url,success:processData})};this.loadZoneDataFromObject=function(data){if(!data){return}for(var z in data.zones){_this.zones[z]=data.zones[z]}for(var r in data.rules){_this.rules[r]=data.rules[r]}};this.getAllZones=function(){var arr=[];for(var z in this.zones){arr.push(z)}return arr.sort()};this.parseZones=function(str){var lines=str.split("\n"),arr=[],chunk="",l,zone=null,rule=null;for(var i=0;i<lines.length;i++){l=lines[i];if(l.match(/^\s/)){l="Zone "+zone+l}l=l.split("#")[0];if(l.length>3){arr=l.split(/\s+/);chunk=arr.shift();switch(chunk){case"Zone":zone=arr.shift();if(!_this.z ones[zone]){_this.zones[zone]=[]}if(arr.length<3){break}arr.splice(3,arr.length,processZone(arr));if(arr[3]){arr[3]=Date.UTC.apply(null,arr[3])}arr[0]=-getBasicOffset(arr[0]);_this.zones[zone].push(arr);break;case"Rule":rule=arr.shift();if(!_this.rules[rule]){_this.rules[rule]=[]}arr[0]=parseInt(arr[0],10);arr[1]=parseInt(arr[1],10)||arr[1];arr[5]=parseTimeString(arr[5]);arr[6]=getBasicOffset(arr[6]);_this.rules[rule].push(arr);break;case"Link":if(_this.zones[arr[1]]){throw new Error("Error with Link "+arr[1]+". Cannot create link of a preexisted zone.")}_this.zones[arr[1]]=arr[0];break}}}return true};this.transport=_transport;this.getTzInfo=function(dt,tz,isUTC){if(this.loadingScheme===this.loadingSchemes.LAZY_LOAD){var zoneFile=getRegionForTimezone(tz);if(!zoneFile){throw new Error("Not a valid timezone ID.")}if(!this.loadedZones[zoneFile]){this.loadZoneFile(zoneFile)}}var z=getZone(dt,tz);var off=z[0];var rule=getRule(dt,z,isUTC);if(rule){off=getAdjustedOffset(off,rule)}v ar abbr=getAbbreviation(z,rule);return{tzOffset:off,tzAbbr:abbr}}}}).call(this); \ No newline at end of file Propchange: ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/framework/images/webapp/images/date/date.timezone-min.js ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js?rev=1432577&view=auto ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js (added) +++ ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js Sun Jan 13 10:22:09 2013 @@ -0,0 +1,913 @@ +// ----- +// The `timezoneJS.Date` object gives you full-blown timezone support, independent from the timezone set on the end-user's machine running the browser. It uses the Olson zoneinfo files for its timezone data. +// +// The constructor function and setter methods use proxy JavaScript Date objects behind the scenes, so you can use strings like '10/22/2006' with the constructor. You also get the same sensible wraparound behavior with numeric parameters (like setting a value of 14 for the month wraps around to the next March). +// +// The other significant difference from the built-in JavaScript Date is that `timezoneJS.Date` also has named properties that store the values of year, month, date, etc., so it can be directly serialized to JSON and used for data transfer. + +/* + * Copyright 2010 Matthew Eernisse ([hidden email]) + * and Open Source Applications Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Credits: Ideas included from incomplete JS implementation of Olson + * parser, "XMLDAte" by Philippe Goetz ([hidden email]) + * + * Contributions: + * Jan Niehusmann + * Ricky Romero + * Preston Hunt ([hidden email]) + * Dov. B Katz ([hidden email]) + * Peter Bergström ([hidden email]) + * Long Ho + */ +(function () { + // Standard initialization stuff to make sure the library is + // usable on both client and server (node) side. + + var root = this; + + var timezoneJS; + if (typeof exports !== 'undefined') { + timezoneJS = exports; + } else { + timezoneJS = root.timezoneJS = {}; + } + + timezoneJS.VERSION = '1.0.0'; + + // Grab the ajax library from global context. + // This can be jQuery, Zepto or fleegix. + // You can also specify your own transport mechanism by declaring + // `timezoneJS.timezone.transport` to a `function`. More details will follow + var $ = root.$ || root.jQuery || root.Zepto + , fleegix = root.fleegix + // Declare constant list of days and months. Unfortunately this doesn't leave room for i18n due to the Olson data being in English itself + , DAYS = timezoneJS.Days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] + , MONTHS = timezoneJS.Months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] + , SHORT_MONTHS = {} + , SHORT_DAYS = {} + , EXACT_DATE_TIME = {} + , TZ_REGEXP = new RegExp('^[a-zA-Z]+/'); + + //`{ "Jan": 0, "Feb": 1, "Mar": 2, "Apr": 3, "May": 4, "Jun": 5, "Jul": 6, "Aug": 7, "Sep": 8, "Oct": 9, "Nov": 10, "Dec": 11 }` + for (var i = 0; i < MONTHS.length; i++) { + SHORT_MONTHS[MONTHS[i].substr(0, 3)] = i; + } + + //`{ "Sun": 0, "Mon": 1, "Tue": 2, "Wed": 3, "Thu": 4, "Fri": 5, "Sat": 6 }` + for (i = 0; i < DAYS.length; i++) { + SHORT_DAYS[DAYS[i].substr(0, 3)] = i; + } + + + //Handle array indexOf in IE + if (!Array.prototype.indexOf) { + Array.prototype.indexOf = function (el) { + for (var i = 0; i < this.length; i++ ) { + if (el === this[i]) return i; + } + return -1; + } + } + + // Format a number to the length = digits. For ex: + // + // `_fixWidth(2, 2) = '02'` + // + // `_fixWidth(1998, 2) = '98'` + // + // This is used to pad numbers in converting date to string in ISO standard. + var _fixWidth = function (number, digits) { + if (typeof number !== "number") { throw "not a number: " + number; } + var s = number.toString(); + if (number.length > digits) { + return number.substr(number.length - digits, number.length); + } + while (s.length < digits) { + s = '0' + s; + } + return s; + }; + + // Abstraction layer for different transport layers, including fleegix/jQuery/Zepto + // + // Object `opts` include + // + // - `url`: url to ajax query + // + // - `async`: true for asynchronous, false otherwise. If false, return value will be response from URL. This is true by default + // + // - `success`: success callback function + // + // - `error`: error callback function + // Returns response from URL if async is false, otherwise the AJAX request object itself + var _transport = function (opts) { + if ((!fleegix || typeof fleegix.xhr === 'undefined') && (!$ || typeof $.ajax === 'undefined')) { + throw new Error('Please use the Fleegix.js XHR module, jQuery ajax, Zepto ajax, or define your own transport mechanism for downloading zone files.'); + } + if (!opts) return; + if (!opts.url) throw new Error ('URL must be specified'); + if (!('async' in opts)) opts.async = true; + if (!opts.async) { + return fleegix && fleegix.xhr + ? fleegix.xhr.doReq({ url: opts.url, async: false }) + : $.ajax({ url : opts.url, async : false }).responseText; + } + return fleegix && fleegix.xhr + ? fleegix.xhr.send({ + url : opts.url, + method : 'get', + handleSuccess : opts.success, + handleErr : opts.error + }) + : $.ajax({ + url : opts.url, + dataType: 'text', + method : 'GET', + error : opts.error, + success : opts.success + }); + }; + + // Constructor, which is similar to that of the native Date object itself + timezoneJS.Date = function () { + var args = Array.prototype.slice.apply(arguments) + , dt = null + , tz = null + , arr = []; + + + //We support several different constructors, including all the ones from `Date` object + // with a timezone string at the end. + // + //- `[tz]`: Returns object with time in `tz` specified. + // + // - `utcMillis`, `[tz]`: Return object with UTC time = `utcMillis`, in `tz`. + // + // - `Date`, `[tz]`: Returns object with UTC time = `Date.getTime()`, in `tz`. + // + // - `year, month, [date,] [hours,] [minutes,] [seconds,] [millis,] [tz]: Same as `Date` object + // with tz. + // + // - `Array`: Can be any combo of the above. + // + //If 1st argument is an array, we can use it as a list of arguments itself + if (Object.prototype.toString.call(args[0]) === '[object Array]') { + args = args[0]; + } + if (typeof args[args.length - 1] === 'string' && TZ_REGEXP.test(args[args.length - 1])) { + tz = args.pop(); + } + switch (args.length) { + case 0: + dt = new Date(); + break; + case 1: + dt = new Date(args[0]); + break; + default: + for (var i = 0; i < 7; i++) { + arr[i] = args[i] || 0; + } + dt = new Date(arr[0], arr[1], arr[2], arr[3], arr[4], arr[5], arr[6]); + break; + } + + this._useCache = false; + this._tzInfo = {}; + this._day = 0; + this.year = 0; + this.month = 0; + this.date = 0; + this.hours = 0; + this.minutes = 0; + this.seconds = 0; + this.milliseconds = 0; + this.timezone = tz || null; + //Tricky part: + // For the cases where there are 1/2 arguments: `timezoneJS.Date(millis, [tz])` and `timezoneJS.Date(Date, [tz])`. The + // Date `dt` created should be in UTC. Thus the way I detect such cases is to determine if `arr` is not populated & `tz` + // is specified. Because if `tz` is not specified, `dt` can be in local time. + if (arr.length) { + this.setFromDateObjProxy(dt); + } else { + this.setFromTimeProxy(dt.getTime(), tz); + } + }; + + // Implements most of the native Date object + timezoneJS.Date.prototype = { + getDate: function () { return this.date; }, + getDay: function () { return this._day; }, + getFullYear: function () { return this.year; }, + getMonth: function () { return this.month; }, + getYear: function () { return this.year; }, + getHours: function () { return this.hours; }, + getMilliseconds: function () { return this.milliseconds; }, + getMinutes: function () { return this.minutes; }, + getSeconds: function () { return this.seconds; }, + getUTCDate: function () { return this.getUTCDateProxy().getUTCDate(); }, + getUTCDay: function () { return this.getUTCDateProxy().getUTCDay(); }, + getUTCFullYear: function () { return this.getUTCDateProxy().getUTCFullYear(); }, + getUTCHours: function () { return this.getUTCDateProxy().getUTCHours(); }, + getUTCMilliseconds: function () { return this.getUTCDateProxy().getUTCMilliseconds(); }, + getUTCMinutes: function () { return this.getUTCDateProxy().getUTCMinutes(); }, + getUTCMonth: function () { return this.getUTCDateProxy().getUTCMonth(); }, + getUTCSeconds: function () { return this.getUTCDateProxy().getUTCSeconds(); }, + // Time adjusted to user-specified timezone + getTime: function () { + return this._timeProxy + (this.getTimezoneOffset() * 60 * 1000); + }, + getTimezone: function () { return this.timezone; }, + getTimezoneOffset: function () { return this.getTimezoneInfo().tzOffset; }, + getTimezoneAbbreviation: function () { return this.getTimezoneInfo().tzAbbr; }, + getTimezoneInfo: function () { + if (this._useCache) return this._tzInfo; + var res; + // If timezone is specified, get the correct timezone info based on the Date given + if (this.timezone) { + res = this.timezone === 'Etc/UTC' || this.timezone === 'Etc/GMT' + ? { tzOffset: 0, tzAbbr: 'UTC' } + : timezoneJS.timezone.getTzInfo(this._timeProxy, this.timezone); + } + // If no timezone was specified, use the local browser offset + else { + res = { tzOffset: this.getLocalOffset(), tzAbbr: null }; + } + this._tzInfo = res; + this._useCache = true; + return res + }, + getUTCDateProxy: function () { + var dt = new Date(this._timeProxy); + dt.setUTCMinutes(dt.getUTCMinutes() + this.getTimezoneOffset()); + return dt; + }, + setDate: function (n) { this.setAttribute('date', n); }, + setFullYear: function (year, month, date) { + if (date !== undefined) { this.setAttribute('date', 1); } + this.setAttribute('year', year); + if (month !== undefined) { this.setAttribute('month', month); } + if (date !== undefined) { this.setAttribute('date', date); } + }, + setMonth: function (n) { this.setAttribute('month', n); }, + setYear: function (n) { this.setUTCAttribute('year', n); }, + setHours: function (hours, minutes, seconds, milliseconds) { + this.setAttribute('hours', hours); + if (minutes) { this.setAttribute('minutes', minutes); } + if (seconds) { this.setAttribute('seconds', seconds); } + if (milliseconds) { this.setAttribute('milliseconds', milliseconds); } + }, + setMilliseconds: function (n) { this.setAttribute('milliseconds', n); }, + setMinutes: function (n) { this.setAttribute('minutes', n); }, + setSeconds: function (n) { this.setAttribute('seconds', n); }, + setTime: function (n) { + if (isNaN(n)) { throw new Error('Units must be a number.'); } + this.setFromTimeProxy(n, this.timezone); + }, + setUTCDate: function (n) { this.setUTCAttribute('date', n); }, + setUTCFullYear: function (year, month, date) { + if (date !== undefined) { this.setUTCAttribute('date', 1); } + this.setUTCAttribute('year', year); + if (month !== undefined) { this.setUTCAttribute('month', month); } + if (date !== undefined) { this.setUTCAttribute('date', date); } + }, + setUTCHours: function (hours, minutes, seconds, milliseconds) { + this.setUTCAttribute('hours', hours); + if (minutes) { this.setUTCAttribute('minutes', minutes); } + if (seconds) { this.setUTCAttribute('seconds', seconds); } + if (milliseconds) { this.setUTCAttribute('milliseconds', milliseconds); } + }, + setUTCMilliseconds: function (n) { this.setUTCAttribute('milliseconds', n); }, + setUTCMinutes: function (n) { this.setUTCAttribute('minutes', n); }, + setUTCMonth: function (n) { this.setUTCAttribute('month', n); }, + setUTCSeconds: function (n) { this.setUTCAttribute('seconds', n); }, + setFromDateObjProxy: function (dt) { + this.year = dt.getFullYear(); + this.month = dt.getMonth(); + this.date = dt.getDate(); + this.hours = dt.getHours(); + this.minutes = dt.getMinutes(); + this.seconds = dt.getSeconds(); + this.milliseconds = dt.getMilliseconds(); + this._day = dt.getDay(); + this._dateProxy = dt; + this._timeProxy = Date.UTC(this.year, this.month, this.date, this.hours, this.minutes, this.seconds, this.milliseconds); + this._useCache = false; + }, + setFromTimeProxy: function (utcMillis, tz) { + var dt = new Date(utcMillis); + var tzOffset; + tzOffset = tz ? timezoneJS.timezone.getTzInfo(dt, tz).tzOffset : dt.getTimezoneOffset(); + dt.setTime(utcMillis + (dt.getTimezoneOffset() - tzOffset) * 60000); + this.setFromDateObjProxy(dt); + }, + setAttribute: function (unit, n) { + if (isNaN(n)) { throw new Error('Units must be a number.'); } + var dt = this._dateProxy; + var meth = unit === 'year' ? 'FullYear' : unit.substr(0, 1).toUpperCase() + unit.substr(1); + dt['set' + meth](n); + this.setFromDateObjProxy(dt); + }, + setUTCAttribute: function (unit, n) { + if (isNaN(n)) { throw new Error('Units must be a number.'); } + var meth = unit === 'year' ? 'FullYear' : unit.substr(0, 1).toUpperCase() + unit.substr(1); + var dt = this.getUTCDateProxy(); + dt['setUTC' + meth](n); + dt.setUTCMinutes(dt.getUTCMinutes() - this.getTimezoneOffset()); + this.setFromTimeProxy(dt.getTime() + this.getTimezoneOffset() * 60000, this.timezone); + }, + setTimezone: function (tz) { + var previousOffset = this.getTimezoneInfo().tzOffset; + this.timezone = tz; + this._useCache = false; + // Set UTC minutes offsets by the delta of the two timezones + this.setUTCMinutes(this.getUTCMinutes() - this.getTimezoneInfo().tzOffset + previousOffset); + }, + removeTimezone: function () { + this.timezone = null; + this._useCache = false; + }, + valueOf: function () { return this.getTime(); }, + clone: function () { + return this.timezone ? new timezoneJS.Date(this.getTime(), this.timezone) : new timezoneJS.Date(this.getTime()); + }, + toGMTString: function () { return this.toString('EEE, dd MMM yyyy HH:mm:ss Z', 'Etc/GMT'); }, + toLocaleString: function () {}, + toLocaleDateString: function () {}, + toLocaleTimeString: function () {}, + toSource: function () {}, + toISOString: function () { return this.toString('yyyy-MM-ddTHH:mm:ss.SSS', 'Etc/UTC') + 'Z'; }, + toJSON: function () { return this.toISOString(); }, + // Allows different format following ISO8601 format: + toString: function (format, tz) { + // Default format is the same as toISOString + if (!format) format = 'yyyy-MM-dd HH:mm:ss'; + var result = format; + var tzInfo = tz ? timezoneJS.timezone.getTzInfo(this.getTime(), tz) : this.getTimezoneInfo(); + var _this = this; + // If timezone is specified, get a clone of the current Date object and modify it + if (tz) { + _this = this.clone(); + _this.setTimezone(tz); + } + var hours = _this.getHours(); + return result + // fix the same characters in Month names + .replace(/a+/g, function () { return 'k'; }) + // `y`: year + .replace(/y+/g, function (token) { return _fixWidth(_this.getFullYear(), token.length); }) + // `d`: date + .replace(/d+/g, function (token) { return _fixWidth(_this.getDate(), token.length); }) + // `m`: minute + .replace(/m+/g, function (token) { return _fixWidth(_this.getMinutes(), token.length); }) + // `s`: second + .replace(/s+/g, function (token) { return _fixWidth(_this.getSeconds(), token.length); }) + // `S`: millisecond + .replace(/S+/g, function (token) { return _fixWidth(_this.getMilliseconds(), token.length); }) + // `M`: month. Note: `MM` will be the numeric representation (e.g February is 02) but `MMM` will be text representation (e.g February is Feb) + .replace(/M+/g, function (token) { + var _month = _this.getMonth(), + _len = token.length; + if (_len > 3) { + return timezoneJS.Months[_month]; + } else if (_len > 2) { + return timezoneJS.Months[_month].substring(0, _len); + } + return _fixWidth(_month + 1, _len); + }) + // `k`: AM/PM + .replace(/k+/g, function () { + if (hours >= 12) { + if (hours > 12) { + hours -= 12; + } + return 'PM'; + } + return 'AM'; + }) + // `H`: hour + .replace(/H+/g, function (token) { return _fixWidth(hours, token.length); }) + // `E`: day + .replace(/E+/g, function (token) { return DAYS[_this.getDay()].substring(0, token.length); }) + // `Z`: timezone abbreviation + .replace(/Z+/gi, function () { return tzInfo.tzAbbr; }); + }, + toUTCString: function () { return this.toGMTString(); }, + civilToJulianDayNumber: function (y, m, d) { + var a; + // Adjust for zero-based JS-style array + m++; + if (m > 12) { + a = parseInt(m/12, 10); + m = m % 12; + y += a; + } + if (m <= 2) { + y -= 1; + m += 12; + } + a = Math.floor(y / 100); + var b = 2 - a + Math.floor(a / 4) + , jDt = Math.floor(365.25 * (y + 4716)) + Math.floor(30.6001 * (m + 1)) + d + b - 1524; + return jDt; + }, + getLocalOffset: function () { + return this._dateProxy.getTimezoneOffset(); + } + }; + + + timezoneJS.timezone = new function () { + var _this = this + , regionMap = {'Etc':'etcetera','EST':'northamerica','MST':'northamerica','HST':'northamerica','EST5EDT':'northamerica','CST6CDT':'northamerica','MST7MDT':'northamerica','PST8PDT':'northamerica','America':'northamerica','Pacific':'australasia','Atlantic':'europe','Africa':'africa','Indian':'africa','Antarctica':'antarctica','Asia':'asia','Australia':'australasia','Europe':'europe','WET':'europe','CET':'europe','MET':'europe','EET':'europe'} + , regionExceptions = {'Pacific/Honolulu':'northamerica','Atlantic/Bermuda':'northamerica','Atlantic/Cape_Verde':'africa','Atlantic/St_Helena':'africa','Indian/Kerguelen':'antarctica','Indian/Chagos':'asia','Indian/Maldives':'asia','Indian/Christmas':'australasia','Indian/Cocos':'australasia','America/Danmarkshavn':'europe','America/Scoresbysund':'europe','America/Godthab':'europe','America/Thule':'europe','Asia/Yekaterinburg':'europe','Asia/Omsk':'europe','Asia/Novosibirsk':'europe','Asia/Krasnoyarsk':'europe','Asia/Irkutsk':'europe','Asia/Yakutsk':'europe','Asia/Vladivostok':'europe','Asia/Sakhalin':'europe','Asia/Magadan':'europe','Asia/Kamchatka':'europe','Asia/Anadyr':'europe','Africa/Ceuta':'europe','America/Argentina/Buenos_Aires':'southamerica','America/Argentina/Cordoba':'southamerica','America/Argentina/Tucuman':'southamerica','America/Argentina/La_Rioja':'southamerica','America/Argentina/San_Juan':'southamerica','America/Argentina/Jujuy':'southamerica','Ameri ca/Argentina/Catamarca':'southamerica','America/Argentina/Mendoza':'southamerica','America/Argentina/Rio_Gallegos':'southamerica','America/Argentina/Ushuaia':'southamerica','America/Aruba':'southamerica','America/La_Paz':'southamerica','America/Noronha':'southamerica','America/Belem':'southamerica','America/Fortaleza':'southamerica','America/Recife':'southamerica','America/Araguaina':'southamerica','America/Maceio':'southamerica','America/Bahia':'southamerica','America/Sao_Paulo':'southamerica','America/Campo_Grande':'southamerica','America/Cuiaba':'southamerica','America/Porto_Velho':'southamerica','America/Boa_Vista':'southamerica','America/Manaus':'southamerica','America/Eirunepe':'southamerica','America/Rio_Branco':'southamerica','America/Santiago':'southamerica','Pacific/Easter':'southamerica','America/Bogota':'southamerica','America/Curacao':'southamerica','America/Guayaquil':'southamerica','Pacific/Galapagos':'southamerica','Atlantic/Stanley':'southamerica','America/C ayenne':'southamerica','America/Guyana':'southamerica','America/Asuncion':'southamerica','America/Lima':'southamerica','Atlantic/South_Georgia':'southamerica','America/Paramaribo':'southamerica','America/Port_of_Spain':'southamerica','America/Montevideo':'southamerica','America/Caracas':'southamerica'}; + function invalidTZError(t) { throw new Error('Timezone "' + t + '" is either incorrect, or not loaded in the timezone registry.'); } + function builtInLoadZoneFile(fileName, opts) { + var url = _this.zoneFileBasePath + '/' + fileName; + return !opts || !opts.async + ? _this.parseZones(_this.transport({ url : url, async : false })) + : _this.transport({ + async: true, + url : url, + success : function (str) { + if (_this.parseZones(str) && typeof opts.callback === 'function') { + opts.callback(); + } + return true; + }, + error : function () { + throw new Error('Error retrieving "' + url + '" zoneinfo files'); + } + }); + } + function getRegionForTimezone(tz) { + var exc = regionExceptions[tz] + , reg + , ret; + if (exc) return exc; + reg = tz.split('/')[0]; + ret = regionMap[reg]; + // If there's nothing listed in the main regions for this TZ, check the 'backward' links + if (ret) return ret; + var link = _this.zones[tz]; + if (typeof link === 'string') { + return getRegionForTimezone(link); + } + // Backward-compat file hasn't loaded yet, try looking in there + if (!_this.loadedZones.backward) { + // This is for obvious legacy zones (e.g., Iceland) that don't even have a prefix like "America/" that look like normal zones + _this.loadZoneFile('backward'); + return getRegionForTimezone(tz); + } + invalidTZError(tz); + } + function parseTimeString(str) { + var pat = /(\d+)(?::0*(\d*))?(?::0*(\d*))?([wsugz])?$/; + var hms = str.match(pat); + hms[1] = parseInt(hms[1], 10); + hms[2] = hms[2] ? parseInt(hms[2], 10) : 0; + hms[3] = hms[3] ? parseInt(hms[3], 10) : 0; + + return hms; + } + function processZone(z) { + if (!z[3]) { return; } + var yea = parseInt(z[3], 10); + var mon = 11; + var dat = 31; + if (z[4]) { + mon = SHORT_MONTHS[z[4].substr(0, 3)]; + dat = parseInt(z[5], 10) || 1; + } + var string = z[6] ? z[6] : '00:00:00' + , t = parseTimeString(string); + return [yea, mon, dat, t[1], t[2], t[3]]; + } + function getZone(dt, tz) { + var utcMillis = typeof dt === 'number' ? dt : new Date(dt).getTime(); + var t = tz; + var zoneList = _this.zones[t]; + // Follow links to get to an actual zone + while (typeof zoneList === "string") { + t = zoneList; + zoneList = _this.zones[t]; + } + if (!zoneList) { + // Backward-compat file hasn't loaded yet, try looking in there + if (!_this.loadedZones.backward) { + //This is for backward entries like "America/Fort_Wayne" that + // getRegionForTimezone *thinks* it has a region file and zone + // for (e.g., America => 'northamerica'), but in reality it's a + // legacy zone we need the backward file for. + _this.loadZoneFile('backward'); + return getZone(dt, tz); + } + invalidTZError(t); + } + if (zoneList.length === 0) { + throw new Error('No Zone found for "' + tz + '" on ' + dt); + } + //Do backwards lookup since most use cases deal with newer dates. + for (var i = zoneList.length - 1; i >= 0; i--) { + var z = zoneList[i]; + if (z[3] && utcMillis > z[3]) break; + } + return zoneList[i+1]; + } + function getBasicOffset(time) { + var off = parseTimeString(time) + , adj = time.indexOf('-') === 0 ? -1 : 1; + off = adj * (((off[1] * 60 + off[2]) * 60 + off[3]) * 1000); + return off/60/1000; + } + + //if isUTC is true, date is given in UTC, otherwise it's given + // in local time (ie. date.getUTC*() returns local time components) + function getRule(dt, zone, isUTC) { + var date = typeof dt === 'number' ? new Date(dt) : dt; + var ruleset = zone[1]; + var basicOffset = zone[0]; + + //Convert a date to UTC. Depending on the 'type' parameter, the date + // parameter may be: + // + // - `u`, `g`, `z`: already UTC (no adjustment). + // + // - `s`: standard time (adjust for time zone offset but not for DST) + // + // - `w`: wall clock time (adjust for both time zone and DST offset). + // + // DST adjustment is done using the rule given as third argument. + var convertDateToUTC = function (date, type, rule) { + var offset = 0; + + if (type === 'u' || type === 'g' || type === 'z') { // UTC + offset = 0; + } else if (type === 's') { // Standard Time + offset = basicOffset; + } else if (type === 'w' || !type) { // Wall Clock Time + offset = getAdjustedOffset(basicOffset, rule); + } else { + throw("unknown type " + type); + } + offset *= 60 * 1000; // to millis + + return new Date(date.getTime() + offset); + }; + + //Step 1: Find applicable rules for this year. + // + //Step 2: Sort the rules by effective date. + // + //Step 3: Check requested date to see if a rule has yet taken effect this year. If not, + // + //Step 4: Get the rules for the previous year. If there isn't an applicable rule for last year, then + // there probably is no current time offset since they seem to explicitly turn off the offset + // when someone stops observing DST. + // + // FIXME if this is not the case and we'll walk all the way back (ugh). + // + //Step 5: Sort the rules by effective date. + //Step 6: Apply the most recent rule before the current time. + var convertRuleToExactDateAndTime = function (yearAndRule, prevRule) { + var year = yearAndRule[0] + , rule = yearAndRule[1]; + // Assume that the rule applies to the year of the given date. + + var hms = rule[5]; + var effectiveDate; + + if (!EXACT_DATE_TIME[year]) + EXACT_DATE_TIME[year] = {}; + + // Result for given parameters is already stored + if (EXACT_DATE_TIME[year][rule]) + effectiveDate = EXACT_DATE_TIME[year][rule]; + else { + //If we have a specific date, use that! + if (!isNaN(rule[4])) { + effectiveDate = new Date(Date.UTC(year, SHORT_MONTHS[rule[3]], rule[4], hms[1], hms[2], hms[3], 0)); + } + //Let's hunt for the date. + else { + var targetDay + , operator; + //Example: `lastThu` + if (rule[4].substr(0, 4) === "last") { + // Start at the last day of the month and work backward. + effectiveDate = new Date(Date.UTC(year, SHORT_MONTHS[rule[3]] + 1, 1, hms[1] - 24, hms[2], hms[3], 0)); + targetDay = SHORT_DAYS[rule[4].substr(4, 3)]; + operator = "<="; + } + //Example: `Sun>=15` + else { + //Start at the specified date. + effectiveDate = new Date(Date.UTC(year, SHORT_MONTHS[rule[3]], rule[4].substr(5), hms[1], hms[2], hms[3], 0)); + targetDay = SHORT_DAYS[rule[4].substr(0, 3)]; + operator = rule[4].substr(3, 2); + } + var ourDay = effectiveDate.getUTCDay(); + //Go forwards. + if (operator === ">=") { + effectiveDate.setUTCDate(effectiveDate.getUTCDate() + (targetDay - ourDay + ((targetDay < ourDay) ? 7 : 0))); + } + //Go backwards. Looking for the last of a certain day, or operator is "<=" (less likely). + else { + effectiveDate.setUTCDate(effectiveDate.getUTCDate() + (targetDay - ourDay - ((targetDay > ourDay) ? 7 : 0))); + } + } + EXACT_DATE_TIME[year][rule] = effectiveDate; + } + + + //If previous rule is given, correct for the fact that the starting time of the current + // rule may be specified in local time. + if (prevRule) { + effectiveDate = convertDateToUTC(effectiveDate, hms[4], prevRule); + } + return effectiveDate; + }; + + var findApplicableRules = function (year, ruleset) { + var applicableRules = []; + for (var i = 0; ruleset && i < ruleset.length; i++) { + //Exclude future rules. + if (ruleset[i][0] <= year && + ( + // Date is in a set range. + ruleset[i][1] >= year || + // Date is in an "only" year. + (ruleset[i][0] === year && ruleset[i][1] === "only") || + //We're in a range from the start year to infinity. + ruleset[i][1] === "max" + ) + ) { + //It's completely okay to have any number of matches here. + // Normally we should only see two, but that doesn't preclude other numbers of matches. + // These matches are applicable to this year. + applicableRules.push([year, ruleset[i]]); + } + } + return applicableRules; + }; + + var compareDates = function (a, b, prev) { + var year, rule; + if (a.constructor !== Date) { + year = a[0]; + rule = a[1]; + a = (!prev && EXACT_DATE_TIME[year] && EXACT_DATE_TIME[year][rule]) + ? EXACT_DATE_TIME[year][rule] + : convertRuleToExactDateAndTime(a, prev); + } else if (prev) { + a = convertDateToUTC(a, isUTC ? 'u' : 'w', prev); + } + if (b.constructor !== Date) { + year = b[0]; + rule = b[1]; + b = (!prev && EXACT_DATE_TIME[year] && EXACT_DATE_TIME[year][rule]) ? EXACT_DATE_TIME[year][rule] + : convertRuleToExactDateAndTime(b, prev); + } else if (prev) { + b = convertDateToUTC(b, isUTC ? 'u' : 'w', prev); + } + a = Number(a); + b = Number(b); + return a - b; + }; + + var year = date.getUTCFullYear(); + var applicableRules; + + applicableRules = findApplicableRules(year, _this.rules[ruleset]); + applicableRules.push(date); + //While sorting, the time zone in which the rule starting time is specified + // is ignored. This is ok as long as the timespan between two DST changes is + // larger than the DST offset, which is probably always true. + // As the given date may indeed be close to a DST change, it may get sorted + // to a wrong position (off by one), which is corrected below. + applicableRules.sort(compareDates); + + //If there are not enough past DST rules... + if (applicableRules.indexOf(date) < 2) { + applicableRules = applicableRules.concat(findApplicableRules(year-1, _this.rules[ruleset])); + applicableRules.sort(compareDates); + } + var pinpoint = applicableRules.indexOf(date); + if (pinpoint > 1 && compareDates(date, applicableRules[pinpoint-1], applicableRules[pinpoint-2][1]) < 0) { + //The previous rule does not really apply, take the one before that. + return applicableRules[pinpoint - 2][1]; + } else if (pinpoint > 0 && pinpoint < applicableRules.length - 1 && compareDates(date, applicableRules[pinpoint+1], applicableRules[pinpoint-1][1]) > 0) { + + //The next rule does already apply, take that one. + return applicableRules[pinpoint + 1][1]; + } else if (pinpoint === 0) { + //No applicable rule found in this and in previous year. + return null; + } + return applicableRules[pinpoint - 1][1]; + } + function getAdjustedOffset(off, rule) { + return -Math.ceil(rule[6] - off); + } + function getAbbreviation(zone, rule) { + var res; + var base = zone[2]; + if (base.indexOf('%s') > -1) { + var repl; + if (rule) { + repl = rule[7] === '-' ? '' : rule[7]; + } + //FIXME: Right now just falling back to Standard -- + // apparently ought to use the last valid rule, + // although in practice that always ought to be Standard + else { + repl = 'S'; + } + res = base.replace('%s', repl); + } + else if (base.indexOf('/') > -1) { + //Chose one of two alternative strings. + res = base.split("/", 2)[rule[6] ? 1 : 0]; + } else { + res = base; + } + return res; + } + + this.zoneFileBasePath; + this.zoneFiles = ['africa', 'antarctica', 'asia', 'australasia', 'backward', 'etcetera', 'europe', 'northamerica', 'pacificnew', 'southamerica']; + this.loadingSchemes = { + PRELOAD_ALL: 'preloadAll', + LAZY_LOAD: 'lazyLoad', + MANUAL_LOAD: 'manualLoad' + }; + this.loadingScheme = this.loadingSchemes.LAZY_LOAD; + this.loadedZones = {}; + this.zones = {}; + this.rules = {}; + + this.init = function (o) { + var opts = { async: true } + , def = this.defaultZoneFile = this.loadingScheme === this.loadingSchemes.PRELOAD_ALL + ? this.zoneFiles + : 'northamerica' + , done = 0 + , callbackFn; + //Override default with any passed-in opts + for (var p in o) { + opts[p] = o[p]; + } + if (typeof def === 'string') { + return this.loadZoneFile(def, opts); + } + //Wraps callback function in another one that makes + // sure all files have been loaded. + callbackFn = opts.callback; + opts.callback = function () { + done++; + (done === def.length) && typeof callbackFn === 'function' && callbackFn(); + }; + for (var i = 0; i < def.length; i++) { + this.loadZoneFile(def[i], opts); + } + }; + + //Get the zone files via XHR -- if the sync flag + // is set to true, it's being called by the lazy-loading + // mechanism, so the result needs to be returned inline. + this.loadZoneFile = function (fileName, opts) { + if (typeof this.zoneFileBasePath === 'undefined') { + throw new Error('Please define a base path to your zone file directory -- timezoneJS.timezone.zoneFileBasePath.'); + } + //Ignore already loaded zones. + if (this.loadedZones[fileName]) { + return; + } + this.loadedZones[fileName] = true; + return builtInLoadZoneFile(fileName, opts); + }; + this.loadZoneJSONData = function (url, sync) { + var processData = function (data) { + data = eval('('+ data +')'); + for (var z in data.zones) { + _this.zones[z] = data.zones[z]; + } + for (var r in data.rules) { + _this.rules[r] = data.rules[r]; + } + }; + return sync + ? processData(_this.transport({ url : url, async : false })) + : _this.transport({ url : url, success : processData }); + }; + this.loadZoneDataFromObject = function (data) { + if (!data) { return; } + for (var z in data.zones) { + _this.zones[z] = data.zones[z]; + } + for (var r in data.rules) { + _this.rules[r] = data.rules[r]; + } + }; + this.getAllZones = function () { + var arr = []; + for (var z in this.zones) { arr.push(z); } + return arr.sort(); + }; + this.parseZones = function (str) { + var lines = str.split('\n') + , arr = [] + , chunk = '' + , l + , zone = null + , rule = null; + for (var i = 0; i < lines.length; i++) { + l = lines[i]; + if (l.match(/^\s/)) { + l = "Zone " + zone + l; + } + l = l.split("#")[0]; + if (l.length > 3) { + arr = l.split(/\s+/); + chunk = arr.shift(); + //Ignore Leap. + switch (chunk) { + case 'Zone': + zone = arr.shift(); + if (!_this.zones[zone]) { + _this.zones[zone] = []; + } + if (arr.length < 3) break; + //Process zone right here and replace 3rd element with the processed array. + arr.splice(3, arr.length, processZone(arr)); + if (arr[3]) arr[3] = Date.UTC.apply(null, arr[3]); + arr[0] = -getBasicOffset(arr[0]); + _this.zones[zone].push(arr); + break; + case 'Rule': + rule = arr.shift(); + if (!_this.rules[rule]) { + _this.rules[rule] = []; + } + //Parse int FROM year and TO year + arr[0] = parseInt(arr[0], 10); + arr[1] = parseInt(arr[1], 10) || arr[1]; + //Parse time string AT + arr[5] = parseTimeString(arr[5]); + //Parse offset SAVE + arr[6] = getBasicOffset(arr[6]); + _this.rules[rule].push(arr); + break; + case 'Link': + //No zones for these should already exist. + if (_this.zones[arr[1]]) { + throw new Error('Error with Link ' + arr[1] + '. Cannot create link of a preexisted zone.'); + } + //Create the link. + _this.zones[arr[1]] = arr[0]; + break; + } + } + } + return true; + }; + //Expose transport mechanism and allow overwrite. + this.transport = _transport; + this.getTzInfo = function (dt, tz, isUTC) { + //Lazy-load any zones not yet loaded. + if (this.loadingScheme === this.loadingSchemes.LAZY_LOAD) { + //Get the correct region for the zone. + var zoneFile = getRegionForTimezone(tz); + if (!zoneFile) { + throw new Error('Not a valid timezone ID.'); + } + if (!this.loadedZones[zoneFile]) { + //Get the file and parse it -- use synchronous XHR. + this.loadZoneFile(zoneFile); + } + } + var z = getZone(dt, tz); + var off = z[0]; + //See if the offset needs adjustment. + var rule = getRule(dt, z, isUTC); + if (rule) { + off = getAdjustedOffset(off, rule); + } + var abbr = getAbbreviation(z, rule); + return { tzOffset: off, tzAbbr: abbr }; + }; + }; +}).call(this); Propchange: ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/framework/images/webapp/images/date/date.timezone.js ------------------------------------------------------------------------------ svn:mime-type = text/plain |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |