From a797f3ff2ba556d95ef059b374c1aaaf65bfed98 Mon Sep 17 00:00:00 2001 From: Volker Kubitz Date: Sat, 1 Feb 2020 00:59:55 +0100 Subject: [PATCH 1/3] TimePicker now defaults in hour24 mode to value as in am mode. You can setStartTime(date) or stStartTime(string) as start time if value isn't set. --- .../client/timepicker/MaterialTimePicker.java | 12 ++++++++++ .../timepicker/js/JsTimePickerOptions.java | 3 +++ .../timepicker/resources/js/timepicker.js | 23 ++++++++++--------- .../timepicker/resources/js/timepicker.min.js | 2 +- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/main/java/gwt/material/design/addins/client/timepicker/MaterialTimePicker.java b/src/main/java/gwt/material/design/addins/client/timepicker/MaterialTimePicker.java index f72dd6341..5975bed8d 100644 --- a/src/main/java/gwt/material/design/addins/client/timepicker/MaterialTimePicker.java +++ b/src/main/java/gwt/material/design/addins/client/timepicker/MaterialTimePicker.java @@ -339,6 +339,18 @@ public void setOkText(String okText) { reload(); } } + + /** + * Set the "Default" on TimePicker + */ + + public void setStartTime(Date startTime) { + options.startTime = DateTimeFormat.getFormat(options.hour24 ? "HH:mm" : "hh:mm aa").format(startTime); + } + + public void setStartTime(String startTimeStr) { + options.startTime = startTimeStr; + } @Override public MaterialIcon getIcon() { diff --git a/src/main/java/gwt/material/design/addins/client/timepicker/js/JsTimePickerOptions.java b/src/main/java/gwt/material/design/addins/client/timepicker/js/JsTimePickerOptions.java index 13f1ac819..154c1f4bf 100644 --- a/src/main/java/gwt/material/design/addins/client/timepicker/js/JsTimePickerOptions.java +++ b/src/main/java/gwt/material/design/addins/client/timepicker/js/JsTimePickerOptions.java @@ -58,4 +58,7 @@ public class JsTimePickerOptions { @JsProperty public String okText; + + @JsProperty + public String startTime; } diff --git a/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.js b/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.js index 38796497d..cc9efee59 100644 --- a/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.js +++ b/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.js @@ -1,6 +1,7 @@ /*! * Lolliclock v0.1.0 * Matthew Krick 2015 + * Volker Kubitz 2020 added startTime for hour24 mode * Inspired by Google's material design & ClockPicker v0.0.7 (http://weareoutman.github.io/clockpicker/) */ @@ -444,22 +445,22 @@ }); //Get the time - function timeToDate(time) { + function timeToDate(time,hour24) { var parts = time.split(':'); if (parts.length === 2){ var hours = +parts[0]; var minAM = parts[1].split(' '); - if (minAM.length === 2) { + if (minAM.length === 2||(hour24&&minAM.length === 1)) { var mins = minAM[0]; - if (minAM[1] === 'PM') hours += 12; + if (!hour24&&minAM[1] === 'PM') hours += 12; return new Date(1970, 1, 1, hours, mins); } } return new Date('x'); } - function isValidTime(time) { - return !isNaN(timeToDate(time).getTime()); + function isValidTime(time,hour24) { + return !isNaN(timeToDate(time,hour24).getTime()); } var value; @@ -467,14 +468,14 @@ var defaultValue = this.options.startTime; var placeholderValue = this.input.prop('placeholder'); - if (inputValue && isValidTime(inputValue)) { - value = timeToDate(inputValue); + if (inputValue && isValidTime(inputValue,this.options.hour24)) { + value = timeToDate(inputValue,this.options.hour24); } else if (defaultValue === 'now') { value = new Date(); - } else if (defaultValue && isValidTime(defaultValue)) { - value = timeToDate(defaultValue); - } else if (placeholderValue && isValidTime(placeholderValue)) { - value = timeToDate(placeholderValue); + } else if (defaultValue && isValidTime(defaultValue,this.options.hour24)) { + value = timeToDate(defaultValue,this.options.hour24); + } else if (placeholderValue && isValidTime(placeholderValue,this.options.hour24)) { + value = timeToDate(placeholderValue,this.options.hour24); } else { value = new Date(); } diff --git a/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.min.js b/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.min.js index 336a1e759..986d6a56e 100644 --- a/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.min.js +++ b/src/main/resources/gwt/material/design/addins/client/timepicker/resources/js/timepicker.min.js @@ -1 +1 @@ -!function(){var t=window.jQuery;k.DEFAULTS={startTime:"",autoclose:!1,vibrate:!0,hour24:!1,orientation:"portrait",cancelText:"CANCEL",okText:"OK"};var i="ontouchstart"in window,o="mousedown"+(i?" touchstart":""),e="mousemove.lolliclock"+(i?" touchmove.lolliclock":""),s="mouseup.lolliclock"+(i?" touchend.lolliclock":""),l=navigator.vibravarte?"vibrate":navigator.webkitVibrate?"webkitVibrate":null,n="http://www.w3.org/2000/svg";function a(t){return document.createElementNS(n,t)}function c(t){return(t<10?"0":"")+t}var h=0;var d=84,r=50,u=70,p=12,m=2*d,v=350,f=['
','
','
','
','
','
','
',"
",':','
','
','
',"
","
",'',"
",'
','
','
','
','
',"
",'
','
','
','
AM
',"
",'
','
','
','
PM
',"
","
","
","
","
"].join("");function k(i,l){var n,k,w=t(f),b=w.find(".lolliclock-popover"),A=w.find(".lolliclock-plate"),C=w.find(".lolliclock-dial-hours"),M=w.find(".lolliclock-dial-minutes"),y="INPUT"===i.prop("tagName"),P=y?i:i.find("input"),T=this;if(this.id=(k=++h+"",(n="lolli")?n+k:k),this.element=i,this.options=l,this.isAppended=!1,this.isShown=!1,this.currentView="hours",this.isInput=y,this.input=P,this.popover=w,this.plate=A,this.hoursView=C,this.minutesView=M,this.header=w.find(".lolliclock-header"),this.spanHours=w.find(".lolliclock-hours"),this.spanMinutes=w.find(".lolliclock-minutes"),this.spanNewTime=w.find(".lolliclock-time-new"),this.spanOldTime=w.find(".lolliclock-time-old"),this.spanAmPm=w.find(".lolliclock-am-pm"),this.amOrPm="PM",this.AmPmButtons=w.find(".lolliclock-ampm-btn"),this.amButton=w.find("#lolliclock-btn-am"),this.pmButton=w.find("#lolliclock-btn-pm"),this.options.hour24&&(this.AmPmButtons.hide(),this.spanAmPm.hide()),w.addClass(this.options.orientation),!l.autoclose){this.popover.css("height","380px");var x=t('
').appendTo(b);t('
'+l.cancelText+"
").click(t.proxy(this.hide,this)).appendTo(x),t('
'+l.okText+"
").click(t.proxy(this.done,this)).appendTo(x),this.closeButtons=w.find(".lolliclock-button")}P.on("focus.lolliclock click.lolliclock",t.proxy(this.show,this));var V,E,B,S=t('
');if(l.hour24){for(V=1;V<13;V++)E=S.clone(),B=V/6*Math.PI,E.css({left:d+Math.sin(B)*r-p,top:d-Math.cos(B)*r-p}),E.html(V),C.append(E);for(V=13;V<=24;V++)E=S.clone(),B=V/6*Math.PI,E.css({left:d+Math.sin(B)*u-p,top:d-Math.cos(B)*u-p}),24===V?E.html("00"):E.html(V),C.append(E)}else for(V=1;V<13;V++)E=S.clone(),B=V/6*Math.PI,E.css({left:d+Math.sin(B)*u-p,top:d-Math.cos(B)*u-p}),E.html(V),C.append(E);for(V=0;V<60;V+=5)E=S.clone(),B=V/30*Math.PI,E.css({left:d+Math.sin(B)*u-p,top:d-Math.cos(B)*u-p}),E.html(c(V)),M.append(E);A.on(o,function(i){var o=A.offset(),n=/^touch/.test(i.type),a=o.left+d,c=o.top+d,h=(n?i.originalEvent.touches[0]:i).pageX-a,m=(n?i.originalEvent.touches[0]:i).pageY-c,f=Math.sqrt(h*h+m*m),k=!1;if(outsideMode=!0,fu-p)outsideMode=!0;else{if(!(f>r-p&&fl?l:a,c.left=e<8?8:e>s?s:e,o.css(c),o.show()},k.prototype.show=function(){if(!this.isShown){g(this.options.beforeShow);var i,o=this;this.popover.addClass(this.options.orientation),this.isAppended||(t(document.body).append(this.popover),this.isAppended=!0,t(window).on("resize.lolliclock"+this.id,function(){o.isShown&&o.locate()}),t(window).on("scroll.lolliclock",function(){o.isShown&&o.locate()}),this.AmPmButtons.on("click",function(t){o.changeAmPm(t.currentTarget.children[1].innerHTML)}),this.spanMinutes.on("click",function(){o.toggleView("minutes")}),this.spanHours.on("click",function(){o.toggleView("hours")}),this.spanAmPm.on("click",function(){o.changeAmPm()})),o.locate(),this.plate.addClass("animate"),this.header.addClass("animate"),this.popover.addClass("animate"),this.AmPmButtons.addClass("animate"),this.spanNewTime.addClass("animate"),this.spanOldTime.addClass("animate"),!this.options.autoclose&&this.closeButtons.addClass("animate"),this.plate.on("webkitAnimationEnd animationend MSAnimationEnd oanimationend",function(){o.plate.removeClass("animate"),o.header.removeClass("animate"),o.popover.removeClass("animate"),o.AmPmButtons.removeClass("animate"),o.spanNewTime.removeClass("animate"),o.spanOldTime.removeClass("animate"),!o.options.autoclose&&o.closeButtons.removeClass("animate"),o.plate.off("webkitAnimationEnd animationend MSAnimationEnd oanimationend")});var e=this.input.prop("value"),s=this.options.startTime,l=this.input.prop("placeholder");i=e&&a(e)?n(e):"now"===s?new Date:s&&a(s)?n(s):l&&a(l)?n(l):new Date,this.options.hour24?this.hours=i.getHours():(this.hours=i.getHours()%12,this.amOrPm=i.getHours()>11?"AM":"PM"),this.minutes=i.getMinutes(),this.changeAmPm(),o.toggleView("minutes"),o.toggleView("hours"),o.isShown=!0,t(document).on("click.lolliclock."+this.id+" focusin.lolliclock."+this.id,function(i){var e=t(i.target);0===e.closest(o.popover).length&&0===e.closest(o.input).length&&o.done()}),t(document).on("keyup.lolliclock."+this.id,function(t){27===t.keyCode&&o.hide()}),g(this.options.afterShow)}function n(t){var i=t.split(":");if(2===i.length){var o=+i[0],e=i[1].split(" ");if(2===e.length){var s=e[0];return"PM"===e[1]&&(o+=12),new Date(1970,1,1,o,s)}}return new Date("x")}function a(t){return!isNaN(n(t).getTime())}},k.prototype.hide=function(){g(this.options.beforeHide);var i=this;i.popover.addClass("animate-out"),i.plate.addClass("animate-out"),i.header.addClass("animate-out"),i.AmPmButtons.addClass("animate-out"),!i.options.autoclose&&i.closeButtons.addClass("animate-out"),this.popover.on("webkitAnimationEnd animationend MSAnimationEnd oanimationend",function(){t(i.spanHours[0].childNodes[0]).html(""),t(i.spanMinutes[0].childNodes[0]).html(""),i.popover.removeClass("animate-out"),i.plate.removeClass("animate-out"),i.header.removeClass("animate-out"),i.AmPmButtons.removeClass("animate-out"),!i.options.autoclose&&i.closeButtons.removeClass("animate-out"),i.popover.off("webkitAnimationEnd animationend MSAnimationEnd oanimationend"),t(document).off("click.lolliclock."+i.id+" focusin.lolliclock."+i.id),t(document).off("keyup.lolliclock."+i.id),i.popover.hide(),g(i.options.afterHide)}),i.isShown=!1},k.prototype.toggleView=function(i,o){var s="hours"===i,l=s?this.hoursView:this.minutesView,n=s?this.minutesView:this.hoursView;if(this.currentView=i,this.spanHours.toggleClass("lolliclock-primary-text",s),this.spanMinutes.toggleClass("lolliclock-primary-text",!s),n.addClass("lolliclock-dial-out"),l.css("visibility","visible").removeClass("lolliclock-dial-out"),this.resetClock(o),clearTimeout(this.toggleViewTimer),this.toggleViewTimer=setTimeout(function(){n.css("visibility","hidden")},v),s)this.plate.off(e);else{var a=this;this.plate.on(e,function(i){var o=a.plate.offset(),e=o.left+d,s=o.top+d,l=i.pageX-e,n=i.pageY-s,c=Math.sqrt(l*l+n*n);c>u-p&&c+n.html()||!n.html())&&(a.html(s),n.addClass("old-up"),a.addClass("new-up")),this.g.insertBefore(this.hand,this.bearing),this.g.insertBefore(this.bg,this.fg),this.bg.setAttribute("class","lolliclock-canvas-bg");var f=r;e&&(f=u);var k=Math.sin(h)*f,g=-Math.cos(h)*f;this.hand.setAttribute("x2",Math.sin(h)*(f-p)),this.hand.setAttribute("y2",-Math.cos(h)*(f-p)),this.bg.setAttribute("cx",k),this.bg.setAttribute("cy",g),this.fg.setAttribute("cx",k),this.fg.setAttribute("cy",g)},k.prototype.done=function(){g(this.options.beforeDone);var t=this.input.prop("value"),i="";(i=this.options.hour24?c(this.hours)+":"+c(this.minutes):this.hours+":"+c(this.minutes)+" "+this.amOrPm)!==t&&(this.input.prop("value",i),this.input.trigger("input"),this.input.trigger("change")),this.hide()},k.prototype.remove=function(){this.element.removeData("lolliclock"),this.input.off("focus.lolliclock click.lolliclock"),this.isShown&&this.hide(),this.isAppended&&(t(window).off("resize.lolliclock"+this.id),t(window).off("scroll.lolliclock"+this.id),this.popover.remove())},t.fn.lolliclock=function(i){var o=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=t(this),s=e.data("lolliclock");if(s)"function"==typeof s[i]&&s[i].apply(s,o);else{var l=t.extend({},k.DEFAULTS,e.data(),"object"==typeof i&&i);e.data("lolliclock",new k(e,l))}})}}(); \ No newline at end of file +!function(){var y=window.jQuery;l.DEFAULTS={startTime:"",autoclose:!1,vibrate:!0,hour24:!1,orientation:"portrait",cancelText:"CANCEL",okText:"OK"};var t="ontouchstart"in window,P="mousedown"+(t?" touchstart":""),T="mousemove.lolliclock"+(t?" touchmove.lolliclock":""),x="mouseup.lolliclock"+(t?" touchend.lolliclock":""),p=navigator.vibravarte?"vibrate":navigator.webkitVibrate?"webkitVibrate":null,i="http://www.w3.org/2000/svg";function V(t){return document.createElementNS(i,t)}function E(t){return(t<10?"0":"")+t}var B=0;var S=84,N=50,H=70,O=12,D=2*S,I=350,L=['
','
','
','
','
','
','
',"
",':','
','
','
',"
","
",'',"
",'
','
','
','
','
',"
",'
','
','
','
AM
',"
",'
','
','
','
PM
',"
","
","
","
","
"].join("");function l(t,h){var i,o,s=y(L),e=s.find(".lolliclock-popover"),r=s.find(".lolliclock-plate"),l=s.find(".lolliclock-dial-hours"),n=s.find(".lolliclock-dial-minutes"),a="INPUT"===t.prop("tagName"),c=a?t:t.find("input"),d=this;if(this.id=(o=++B+"",(i="lolli")?i+o:o),this.element=t,this.options=h,this.isAppended=!1,this.isShown=!1,this.currentView="hours",this.isInput=a,this.input=c,this.popover=s,this.plate=r,this.hoursView=l,this.minutesView=n,this.header=s.find(".lolliclock-header"),this.spanHours=s.find(".lolliclock-hours"),this.spanMinutes=s.find(".lolliclock-minutes"),this.spanNewTime=s.find(".lolliclock-time-new"),this.spanOldTime=s.find(".lolliclock-time-old"),this.spanAmPm=s.find(".lolliclock-am-pm"),this.amOrPm="PM",this.AmPmButtons=s.find(".lolliclock-ampm-btn"),this.amButton=s.find("#lolliclock-btn-am"),this.pmButton=s.find("#lolliclock-btn-pm"),this.options.hour24&&(this.AmPmButtons.hide(),this.spanAmPm.hide()),s.addClass(this.options.orientation),!h.autoclose){this.popover.css("height","380px");var u=y('
').appendTo(e);y('
'+h.cancelText+"
").click(y.proxy(this.hide,this)).appendTo(u),y('
'+h.okText+"
").click(y.proxy(this.done,this)).appendTo(u),this.closeButtons=s.find(".lolliclock-button")}c.on("focus.lolliclock click.lolliclock",y.proxy(this.show,this));var p,m,v,f=y('
');if(h.hour24){for(p=1;p<13;p++)m=f.clone(),v=p/6*Math.PI,m.css({left:S+Math.sin(v)*N-O,top:S-Math.cos(v)*N-O}),m.html(p),l.append(m);for(p=13;p<=24;p++)m=f.clone(),v=p/6*Math.PI,m.css({left:S+Math.sin(v)*H-O,top:S-Math.cos(v)*H-O}),24===p?m.html("00"):m.html(p),l.append(m)}else for(p=1;p<13;p++)m=f.clone(),v=p/6*Math.PI,m.css({left:S+Math.sin(v)*H-O,top:S-Math.cos(v)*H-O}),m.html(p),l.append(m);for(p=0;p<60;p+=5)m=f.clone(),v=p/30*Math.PI,m.css({left:S+Math.sin(v)*H-O,top:S-Math.cos(v)*H-O}),m.html(E(p)),n.append(m);r.on(P,function(t){var i=r.offset(),o=/^touch/.test(t.type),e=i.left+S,l=i.top+S,n=(o?t.originalEvent.touches[0]:t).pageX-e,a=(o?t.originalEvent.touches[0]:t).pageY-l,s=Math.sqrt(n*n+a*a),c=!1;if(outsideMode=!0,s+e.html()||!e.html())&&(l.html(s),e.addClass("old-up"),l.addClass("new-up")),this.g.insertBefore(this.hand,this.bearing),this.g.insertBefore(this.bg,this.fg),this.bg.setAttribute("class","lolliclock-canvas-bg");var r=N;o&&(r=H);var d=Math.sin(n)*r,u=-Math.cos(n)*r;this.hand.setAttribute("x2",Math.sin(n)*(r-O)),this.hand.setAttribute("y2",-Math.cos(n)*(r-O)),this.bg.setAttribute("cx",d),this.bg.setAttribute("cy",u),this.fg.setAttribute("cx",d),this.fg.setAttribute("cy",u)},l.prototype.done=function(){X(this.options.beforeDone);var t=this.input.prop("value"),i="";(i=this.options.hour24?E(this.hours)+":"+E(this.minutes):this.hours+":"+E(this.minutes)+" "+this.amOrPm)!==t&&(this.input.prop("value",i),this.input.trigger("input"),this.input.trigger("change")),this.hide()},l.prototype.remove=function(){this.element.removeData("lolliclock"),this.input.off("focus.lolliclock click.lolliclock"),this.isShown&&this.hide(),this.isAppended&&(y(window).off("resize.lolliclock"+this.id),y(window).off("scroll.lolliclock"+this.id),this.popover.remove())},y.fn.lolliclock=function(s){var e=Array.prototype.slice.call(arguments,1);return this.each(function(){var t=y(this),i=t.data("lolliclock");if(i)"function"==typeof i[s]&&i[s].apply(i,e);else{var o=y.extend({},l.DEFAULTS,t.data(),"object"==typeof s&&s);t.data("lolliclock",new l(t,o))}})}}(); \ No newline at end of file From 7d7d768e5f8486cf9e04c3130624bee775a16c9e Mon Sep 17 00:00:00 2001 From: Volker Kubitz Date: Sun, 2 Feb 2020 19:53:23 +0100 Subject: [PATCH 2/3] Fehler in Eclipse (xml) abgestellt --- .../gwt/material/design/addins/GwtMaterialAddins.gwt.xml | 3 ++- .../gwt/material/design/addins/GwtMaterialAddinsBase.gwt.xml | 3 ++- .../gwt/material/design/addins/GwtMaterialAddinsBasic.gwt.xml | 2 +- .../material/design/addins/GwtMaterialAddinsBasicDebug.gwt.xml | 3 ++- .../gwt/material/design/addins/GwtMaterialAddinsDebug.gwt.xml | 3 ++- .../gwt/material/design/incubator/AddinsIncubator.gwt.xml | 3 ++- .../gwt/material/design/incubator/AddinsIncubatorDebug.gwt.xml | 3 ++- .../design/incubator/FontAwesomeDebugResources.gwt.xml | 3 ++- .../gwt/material/design/incubator/FontAwesomeResources.gwt.xml | 3 ++- 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/resources/gwt/material/design/addins/GwtMaterialAddins.gwt.xml b/src/main/resources/gwt/material/design/addins/GwtMaterialAddins.gwt.xml index e34065d9e..45eda6ba6 100644 --- a/src/main/resources/gwt/material/design/addins/GwtMaterialAddins.gwt.xml +++ b/src/main/resources/gwt/material/design/addins/GwtMaterialAddins.gwt.xml @@ -17,10 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. #L% - --> + +--> diff --git a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBase.gwt.xml b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBase.gwt.xml index b4f1d03b6..1651ce6a5 100644 --- a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBase.gwt.xml +++ b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBase.gwt.xml @@ -17,10 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. #L% - --> + +--> diff --git a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasic.gwt.xml b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasic.gwt.xml index e34065d9e..ad48457ee 100644 --- a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasic.gwt.xml +++ b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasic.gwt.xml @@ -17,10 +17,10 @@ See the License for the specific language governing permissions and limitations under the License. #L% - --> +--> diff --git a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasicDebug.gwt.xml b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasicDebug.gwt.xml index 77e3e79ea..3fcf475c0 100644 --- a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasicDebug.gwt.xml +++ b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasicDebug.gwt.xml @@ -17,10 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. #L% - --> + +--> diff --git a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsDebug.gwt.xml b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsDebug.gwt.xml index 77e3e79ea..3fcf475c0 100644 --- a/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsDebug.gwt.xml +++ b/src/main/resources/gwt/material/design/addins/GwtMaterialAddinsDebug.gwt.xml @@ -17,10 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. #L% - --> + +--> diff --git a/src/main/resources/gwt/material/design/incubator/AddinsIncubator.gwt.xml b/src/main/resources/gwt/material/design/incubator/AddinsIncubator.gwt.xml index aad38f7da..a8ba8b6a5 100644 --- a/src/main/resources/gwt/material/design/incubator/AddinsIncubator.gwt.xml +++ b/src/main/resources/gwt/material/design/incubator/AddinsIncubator.gwt.xml @@ -17,10 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. #L% - --> + +--> diff --git a/src/main/resources/gwt/material/design/incubator/AddinsIncubatorDebug.gwt.xml b/src/main/resources/gwt/material/design/incubator/AddinsIncubatorDebug.gwt.xml index 7db6880dc..f0973ecec 100644 --- a/src/main/resources/gwt/material/design/incubator/AddinsIncubatorDebug.gwt.xml +++ b/src/main/resources/gwt/material/design/incubator/AddinsIncubatorDebug.gwt.xml @@ -17,10 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. #L% - --> + +--> diff --git a/src/main/resources/gwt/material/design/incubator/FontAwesomeDebugResources.gwt.xml b/src/main/resources/gwt/material/design/incubator/FontAwesomeDebugResources.gwt.xml index f4525af96..53297ab71 100644 --- a/src/main/resources/gwt/material/design/incubator/FontAwesomeDebugResources.gwt.xml +++ b/src/main/resources/gwt/material/design/incubator/FontAwesomeDebugResources.gwt.xml @@ -22,9 +22,10 @@ + +--> diff --git a/src/main/resources/gwt/material/design/incubator/FontAwesomeResources.gwt.xml b/src/main/resources/gwt/material/design/incubator/FontAwesomeResources.gwt.xml index 327d9ad5d..a3fa59b1a 100644 --- a/src/main/resources/gwt/material/design/incubator/FontAwesomeResources.gwt.xml +++ b/src/main/resources/gwt/material/design/incubator/FontAwesomeResources.gwt.xml @@ -22,9 +22,10 @@ + +--> From 9125f1ba54311110e2617ca96187d7dd4234c608 Mon Sep 17 00:00:00 2001 From: Volker Kubitz Date: Sun, 5 Apr 2020 02:09:17 +0200 Subject: [PATCH 3/3] DateRangeLocal changed setFirstDay from String to int --- .../incubator/client/daterange/js/DateRangeLocale.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/gwt/material/design/incubator/client/daterange/js/DateRangeLocale.java b/src/main/java/gwt/material/design/incubator/client/daterange/js/DateRangeLocale.java index 7a6aadeb0..36fe0ac03 100644 --- a/src/main/java/gwt/material/design/incubator/client/daterange/js/DateRangeLocale.java +++ b/src/main/java/gwt/material/design/incubator/client/daterange/js/DateRangeLocale.java @@ -20,15 +20,12 @@ package gwt.material.design.incubator.client.daterange.js; import com.google.gwt.core.client.GWT; -import com.google.gwt.core.client.JavaScriptObject; -import com.google.gwt.json.client.JSONString; + import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import java.util.List; - /** * @author kevzlou7979 * @see {@link gwt.material.design.incubator.client.daterange.DateRangePicker#setLocale(DateRangeLocale)} @@ -67,7 +64,7 @@ public class DateRangeLocale { private LocaleString[] monthNames; @JsProperty - private String firstDay; + private int firstDay; @JsOverlay public final void setFormat(String format) { @@ -123,7 +120,7 @@ public final void setMonthNames(LocaleString[] monthNames) { } } @JsOverlay - public final void setFirstDay(String firstDay) { + public final void setFirstDay(int firstDay) { this.firstDay = firstDay; } }