Skip to content

Commit

Permalink
Merge pull request #42 from ifpen/fix/typos-in-widget-names
Browse files Browse the repository at this point in the history
fix: rename calender & calenddar to calendar
  • Loading branch information
bengaid authored Apr 23, 2024
2 parents 41538fe + da4b76c commit 442799b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion documentation/Templates/Projects/date-picker.xprjson
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"id": "datepickerSimple8",
"instanceId": "datepickerSimple8",
"modelJsonId": "datepickerSimple",
"widgetTypeName": "Simple calender(datepickerSimple8)"
"widgetTypeName": "Simple calendar(datepickerSimple8)"
},
"modelParameters": {
"label": "selected",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"id": "calendarD3c",
"instanceId": "calendarD3c",
"modelJsonId": "calendarD3",
"widgetTypeName": "Year Calenddar(calendarD3c)"
"widgetTypeName": "Year Calendar(calendarD3c)"
},
"modelParameters": {
"AllYearsVisible": true,
Expand Down
2 changes: 1 addition & 1 deletion documentation/docs/wdg/date-time/date-picker.xprjson
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"id": "datepickerSimple8",
"instanceId": "datepickerSimple8",
"modelJsonId": "datepickerSimple",
"widgetTypeName": "Simple calender(datepickerSimple8)"
"widgetTypeName": "Simple calendar(datepickerSimple8)"
},
"modelParameters": {
"label": "selected",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ function calendarD3WidgetPluginClass() {
widgetsDefinitionList: {
calendarD3: {
factory: 'calendarD3Widget',
title: 'Year Calenddar',
title: 'Year Calendar',
icn: 'year-calendar',
help: 'wdg/wdg-geo-time/#simple-clock',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function datePickerWidgetsPluginClass() {
);
widgetHtml.setAttribute('id', 'div-for-ng-datepicker' + idWidget);
$('#' + idDivContainer).html(widgetHtml);
var heightCalender = $('#div-for-ng-datepicker' + idWidget).height();
var heightcalendar = $('#div-for-ng-datepicker' + idWidget).height();

var modelObj = 'datepickerValues.val' + idInstance;

Expand Down Expand Up @@ -194,7 +194,7 @@ function datePickerWidgetsPluginClass() {

var border = this.border();

var idCalender = 'calender-input' + idWidget;
var idcalendar = 'calendar-input' + idWidget;
var divDatapicker =
'<datepicker id="ng-datepicker' +
idWidget +
Expand All @@ -203,12 +203,12 @@ function datePickerWidgetsPluginClass() {
'" selector="form-control">' +
'<div style="cursor: inherit">' +
'<input id="' +
idCalender +
idcalendar +
'" class="value-input form-control " ' +
'style="' +
cursorIcon +
' height: ' +
heightCalender +
heightcalendar +
'px; border-radius: 6px; ' +
display +
border +
Expand All @@ -235,7 +235,7 @@ function datePickerWidgetsPluginClass() {
'padding-right: ' +
valueFontSize +
'; height: ' +
heightCalender +
heightcalendar +
'px;' +
'"><i class="fa fa-lg fa-calendar" style="display: table-cell; vertical-align: middle;' +
' font-size:' +
Expand Down Expand Up @@ -398,7 +398,7 @@ function datePickerWidgetsPluginClass() {
widgetsDefinitionList: {
datepickerSimple: {
factory: 'datePickerWidgetSemi',
title: 'Simple calender',
title: 'Simple calendar',
icn: 'calendar',
help: 'wdg/wdg-geo-time/#simple-calendar',
},
Expand Down
26 changes: 13 additions & 13 deletions front-end/thirdparty/jquery-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -9184,7 +9184,7 @@ $.extend(Datepicker.prototype, {
controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
cornerClass, calendar, thead, day, daysInMonth, leadDays, curRows, numRows,
printDate, dRow, tbody, daySettings, otherMonth, unselectable,
tempDate = new Date(),
today = this._daylightSavingAdjust(
Expand Down Expand Up @@ -9275,21 +9275,21 @@ $.extend(Datepicker.prototype, {
for (col = 0; col < numMonths[1]; col++) {
selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
cornerClass = " ui-corner-all";
calender = "";
calendar = "";
if (isMultiMonth) {
calender += "<div class='ui-datepicker-group";
calendar += "<div class='ui-datepicker-group";
if (numMonths[1] > 1) {
switch (col) {
case 0: calender += " ui-datepicker-group-first";
case 0: calendar += " ui-datepicker-group-first";
cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
case numMonths[1]-1: calender += " ui-datepicker-group-last";
case numMonths[1]-1: calendar += " ui-datepicker-group-last";
cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
default: calendar += " ui-datepicker-group-middle"; cornerClass = ""; break;
}
}
calender += "'>";
calendar += "'>";
}
calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
calendar += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
Expand All @@ -9302,7 +9302,7 @@ $.extend(Datepicker.prototype, {
thead += "<th" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
}
calender += thead + "</tr></thead><tbody>";
calendar += thead + "</tr></thead><tbody>";
daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
Expand All @@ -9313,7 +9313,7 @@ $.extend(Datepicker.prototype, {
this.maxRows = numRows;
printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
calender += "<tr>";
calendar += "<tr>";
tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
this._get(inst, "calculateWeek")(printDate) + "</td>");
for (dow = 0; dow < 7; dow++) { // create date picker days
Expand Down Expand Up @@ -9344,16 +9344,16 @@ $.extend(Datepicker.prototype, {
printDate.setDate(printDate.getDate() + 1);
printDate = this._daylightSavingAdjust(printDate);
}
calender += tbody + "</tr>";
calendar += tbody + "</tr>";
}
drawMonth++;
if (drawMonth > 11) {
drawMonth = 0;
drawYear++;
}
calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
calendar += "</tbody></table>" + (isMultiMonth ? "</div>" +
((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
group += calender;
group += calendar;
}
html += group;
}
Expand Down

0 comments on commit 442799b

Please sign in to comment.