gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop JQuery-UI. Fixes Issue #353 partly

Browse source
This commit is contained in:
Henne Vogelsang 2014-08-18 09:32:14 +02:00
parent 63366d43a4
commit 45b8c5dd68
9 changed files with 65 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/application.js
View file

@ -11,10 +11,8 @@
// GO AFTER THE REQUIRES BELOW.
//
//= require jquery
//= require jquery.ui.all
//= require jquery_ujs
//= require jquery-fileupload
//= require jquery-ui-timepicker-addon
//= require jquery.dataTables
//= require cocoon
//= require bootstrap
@ -27,6 +25,10 @@
//= require bootstrap-markdown
//= require to-markdown
//= require markdown
//= require moment
//= require bootstrap-datetimepicker
//= require osem-datepickers
$(document).ready(function() {
$('a[disabled=disabled]').click(function(event){
return false;

34
app/assets/javascripts/osem-datepickers.js Normal file
View file

@ -0,0 +1,34 @@
$(function () {
$("#conference-start-datepicker").datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
$("#conference-end-datepicker").datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
$("#conference-reg-start-datepicker").datetimepicker({
format: "YYYY-MM-DD",
pickTime: false,
pickSeconds: false
});
$("#conference-reg-end-datepicker").datetimepicker({
format: "YYYY-MM-DD",
pickTime: false,
pickSeconds: false
});
$(".target-due-date-datepicker").datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
/* Appends the datetimepicker to new injected nested target fields. */
$('a:contains("Add target")').click(function () {
setTimeout(function () {
$('.target-due-date-datepicker').not('.hasDatepicker').datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
},
5)
});
} );

79
app/assets/javascripts/osem.js
View file

@ -9,7 +9,11 @@ $(function () {
$("#" + id).toggle();
});
});
$("#commercial_commercial_type").change(function () {
$(".media-type").hide();
$('#' + $(this).val().toLowerCase() + '-help').show();
});
$('.dropdown-toggle').dropdown();
/**
* Adds the default template as value to the regarding email textarea field.
*/
@ -69,78 +73,7 @@ $(function () {
$('#' + $(this).data('name')).toggle();
});
/**
* Appends the datetimepicker to new injected nested target fields.
*/
$('a:contains("Add target")').click(function () {
setTimeout(function () {
$('.target-due-date-datepicker').not('.hasDatepicker').datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 1
});
},
5)
});
$("#commercial_commercial_type").change(function () {
$(".media-type").hide();
$('#' + $(this).val().toLowerCase() + '-help').show();
});
$('.dropdown-toggle').dropdown();
$("#conference-start-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-end-datepicker").datepicker("option","minDate", selected)
}
});
$("#conference-end-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-start-datepicker").datepicker("option","maxDate", selected)
$("#cfp-hard-datepicker").datepicker("option","minDate", selected)
}
});
$(".target-due-date-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 1
});
$("#cfp-hard-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-end-datepicker").datepicker("option","maxDate", selected)
$("#conference-start-datepicker").datepicker("option","maxDate", selected)
}
});
$("#conference-reg-start-datepicker").datetimepicker({
dateFormat: "yy-mm-dd",
timeFormat: "HH:mm",
showSecond: false,
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-reg-end-datepicker").datepicker("option","minDate", selected)
}
});
$("#conference-reg-end-datepicker").datetimepicker({
dateFormat: "yy-mm-dd",
timeFormat: "HH:mm",
showSecond: false,
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-reg-start-datepicker").datepicker("option","maxDate", selected)
}
});
$(".comment-reply-link").click(function(){
$(".comment-reply", $(this).parent()).toggle();
return false;