This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0987c11 Improved: Remove date.format-1.2.3-min.js (OFBIZ-12040)
0987c11 is described below
commit 0987c11ca7955314d870820e9b79f6bd1a7d1450
Author: James Yong <[email protected]>
AuthorDate: Sat Oct 10 19:36:24 2020 +0800
Improved: Remove date.format-1.2.3-min.js (OFBIZ-12040)
This Javascript library is not use in the project.
---
.../template/includes/ServerHour24HourFormatJs.ftl | 2 -
.../common/js/plugins/date/date.format-1.2.3 | 126 ---------------------
.../js/plugins/date/date.format-1.2.3-min.js | 1 -
themes/common-theme/widget/Theme.xml | 1 -
themes/docs/themes.adoc | 1 -
5 files changed, 131 deletions(-)
diff --git a/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
b/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
index f187561..51e80bf 100644
--- a/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
+++ b/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
@@ -36,8 +36,6 @@ under the License.
} else {
date.setSeconds(date.getSeconds() + 1);
}
- // 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());
}
})
diff --git
a/themes/common-theme/webapp/common/js/plugins/date/date.format-1.2.3
b/themes/common-theme/webapp/common/js/plugins/date/date.format-1.2.3
deleted file mode 100644
index a6f6c24..0000000
--- a/themes/common-theme/webapp/common/js/plugins/date/date.format-1.2.3
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Date Format 1.2.3
- * (c) 2007-2009 Steven Levithan <stevenlevithan.com>
- * MIT license
- *
- * Includes enhancements by Scott Trenda <scott.trenda.net>
- * and Kris Kowal <cixar.com/~kris.kowal/>
- *
- * Accepts a date, a mask, or a date and a mask.
- * Returns a formatted version of the given date.
- * The date defaults to the current date/time.
- * The mask defaults to dateFormat.masks.default.
- */
-
-var dateFormat = function () {
- var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
- timezone =
/\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic)
(?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
- timezoneClip = /[^-+\dA-Z]/g,
- pad = function (val, len) {
- val = String(val);
- len = len || 2;
- while (val.length < len) val = "0" + val;
- return val;
- };
-
- // Regexes and supporting functions are cached through closure
- return function (date, mask, utc) {
- var dF = dateFormat;
-
- // You can't provide utc if you skip other args (use the "UTC:" mask
prefix)
- if (arguments.length == 1 && Object.prototype.toString.call(date) ==
"[object String]" && !/\d/.test(date)) {
- mask = date;
- date = undefined;
- }
-
- // Passing date through Date applies Date.parse, if necessary
- date = date ? new Date(date) : new Date;
- if (isNaN(date)) throw SyntaxError("invalid date");
-
- mask = String(dF.masks[mask] || mask || dF.masks["default"]);
-
- // Allow setting the utc argument via the mask
- if (mask.slice(0, 4) == "UTC:") {
- mask = mask.slice(4);
- utc = true;
- }
-
- var _ = utc ? "getUTC" : "get",
- d = date[_ + "Date"](),
- D = date[_ + "Day"](),
- m = date[_ + "Month"](),
- y = date[_ + "FullYear"](),
- H = date[_ + "Hours"](),
- M = date[_ + "Minutes"](),
- s = date[_ + "Seconds"](),
- L = date[_ + "Milliseconds"](),
- o = utc ? 0 : date.getTimezoneOffset(),
- flags = {
- d: d,
- dd: pad(d),
- ddd: dF.i18n.dayNames[D],
- dddd: dF.i18n.dayNames[D + 7],
- m: m + 1,
- mm: pad(m + 1),
- mmm: dF.i18n.monthNames[m],
- mmmm: dF.i18n.monthNames[m + 12],
- yy: String(y).slice(2),
- yyyy: y,
- h: H % 12 || 12,
- hh: pad(H % 12 || 12),
- H: H,
- HH: pad(H),
- M: M,
- MM: pad(M),
- s: s,
- ss: pad(s),
- l: pad(L, 3),
- L: pad(L > 99 ? Math.round(L / 10) : L),
- t: H < 12 ? "a" : "p",
- tt: H < 12 ? "am" : "pm",
- T: H < 12 ? "A" : "P",
- TT: H < 12 ? "AM" : "PM",
- Z: utc ? "UTC" : (String(date).match(timezone) ||
[""]).pop().replace(timezoneClip, ""),
- o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 +
Math.abs(o) % 60, 4),
- S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 !=
10) * d % 10]
- };
-
- return mask.replace(token, function ($0) {
- return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
- });
- };
-}();
-
-// Some common format strings
-dateFormat.masks = {
- "default": "ddd mmm dd yyyy HH:MM:ss",
- shortDate: "m/d/yy",
- mediumDate: "mmm d, yyyy",
- longDate: "mmmm d, yyyy",
- fullDate: "dddd, mmmm d, yyyy",
- shortTime: "h:MM TT",
- mediumTime: "h:MM:ss TT",
- longTime: "h:MM:ss TT Z",
- isoDate: "yyyy-mm-dd",
- isoTime: "HH:MM:ss",
- isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
- isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
-};
-
-// Internationalization strings
-dateFormat.i18n = {
- dayNames: [
- "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
- "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
"Saturday"
- ],
- monthNames: [
- "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
"Nov", "Dec",
- "January", "February", "March", "April", "May", "June", "July", "August",
"September", "October", "November", "December"
- ]
-};
-
-// For convenience...
-Date.prototype.format = function (mask, utc) {
- return dateFormat(this, mask, utc);
-};
-
diff --git
a/themes/common-theme/webapp/common/js/plugins/date/date.format-1.2.3-min.js
b/themes/common-theme/webapp/common/js/plugins/date/date.format-1.2.3-min.js
deleted file mode 100644
index f65314b..0000000
--- a/themes/common-theme/webapp/common/js/plugins/date/date.format-1.2.3-min.js
+++ /dev/null
@@ -1 +0,0 @@
-var dateFormat=function(){var
a=/d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,b=/\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic)
(?:Standard|Daylight|Prevailing)
Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,d=/[^-+\dA-Z]/g,c=function(f,e){f=String(f);e=e||2;while(f.length<e){f="0"+f}return
f};return function(i,v,q){var
g=dateFormat;if(arguments.length==1&&Object.prototype.toString.call(i)=="[object
String]"&&!/\d/.test(i)){v=i;i=undefined}i=i?new Date(i):new Da [...]
\ No newline at end of file
diff --git a/themes/common-theme/widget/Theme.xml
b/themes/common-theme/widget/Theme.xml
index 400729c..b9b4958 100644
--- a/themes/common-theme/widget/Theme.xml
+++ b/themes/common-theme/widget/Theme.xml
@@ -65,7 +65,6 @@ under the License.
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/jquery/plugins/validate/jquery.validate.min.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/util/OfbizUtil.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/util/fieldlookup.js"/>
- <property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/plugins/date/date.format-1.2.3-min.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/plugins/date/date.timezone-min.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/util/miscAjaxFunctions.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/util/selectMultipleRelatedValues.js"/>
diff --git a/themes/docs/themes.adoc b/themes/docs/themes.adoc
index 6f08147..1964b02 100644
--- a/themes/docs/themes.adoc
+++ b/themes/docs/themes.adoc
@@ -290,7 +290,6 @@ The blue light theme has been these properties in
VisualThemeRessource :
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/jquery/plugins/validate/jquery.validate.min.js"
sequenceId="12"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/util/OfbizUtil.js" sequenceId="15"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/util/fieldlookup.js" sequenceId="16"/>
- <VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/plugins/date/date.format-1.2.3-min.js"
sequenceId="17"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/plugins/date/date.timezone-min.js" sequenceId="18"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/util/miscAjaxFunctions.js" sequenceId="19"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/util/selectMultipleRelatedValues.js" sequenceId="20"/>
