Commit 55ebf247 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fix broken merge

parent 9ce7daf0
Pipeline #6966 passed with stage
in 1 minute and 39 seconds
......@@ -6,7 +6,7 @@ Function.prototype.bind = Function.prototype.bind || function (thisp) {
var fn = this;
return function () {
return fn.apply(thisp, arguments);
return fn.apply(thisp, arguments);
};
};
......@@ -16,15 +16,15 @@ $(document).ready( function () {
(function (n) {
try {
var tablesorterController = new n.TablesorterController();
$('.tablesorter').each(function(i) {
tablesorterController.setup($(this), i);
}); // end .each()
var tablesorterController = new n.TablesorterController();
$('.tablesorter').each(function (i) {
tablesorterController.setup($(this), i);
}); // end .each()
$('.tablesorter-filter').addClass('qfq-skip-dirty');
} catch (e) {
console.log(e);
}
$('.tablesorter-filter').addClass('qfq-skip-dirty');
} catch (e) {
console.log(e);
}
$('.qfq-auto-grow').each(function() {
var minHeight = $(this).attr("rows") * 14 + 18;
......@@ -80,7 +80,7 @@ $(document).ready( function () {
html: "×"
});
if (myInput.val() == '' || myInput.is('[disabled=disabled]')) {
closeButton.addClass("hidden");
closeButton.addClass("hidden");
}
closeButton.on("click", function(e) {
myInput.val('');
......@@ -94,7 +94,7 @@ $(document).ready( function () {
closeButton.addClass("hidden");
}
});
});
......@@ -137,22 +137,23 @@ $(document).ready( function () {
}
dates[datesToFormat[i]] = date;
}
var options = {
locale: $(this).data("locale") || "en",
daysOfWeekDisabled: $(this).data("days-of-week-disabled") || [0,6],
daysOfWeekDisabled: $(this).data("days-of-week-disabled") || [],
minDate: dates.minDate,
maxDate: dates.maxDate,
format: $(this).data("format") || "DD.MM.YYYY HH:mm",
viewMode: $(this).data("view-mode-default") || "days",
showClear: ($(this).data("show-clear-button") !== undefined) ? $(this).data("show-clear-button") : true,
calendarWeeks: ($(this).data("show-calendar-weeks") !== undefined) ? $(this).data("show-calendar-weeks") : false,
useCurrent: ($(this).data("use-current-datetime") !== undefined) ? $(this).data("use-current-datetime") : false,
sideBySide: ($(this).data("datetime-side-by-side") !== undefined) ? $(this).data("datetime-side-by-side") : false,
minDate: dates.minDate,
maxDate: dates.maxDate
};
var currentDatePicker = $(this).datetimepicker(options);
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment